svn commit: r377620 - in head/editors/openoffice-devel: . files

[Antoine Brodin]

On Wed, Jan 21, 2015 at 6:40 PM, Don Lewis <truckman at freebsd.org> wrote:
> Author: truckman
> Date: Wed Jan 21 17:40:57 2015
> New Revision: 377620
> URL: https://svnweb.freebsd.org/changeset/ports/377620
> QAT: https://qat.redports.org/buildarchive/r377620/
>
> Log:
>   Update to SVN revision 1652526.
...
> Modified: head/editors/openoffice-devel/Makefile
> ==============================================================================
> --- head/editors/openoffice-devel/Makefile      Wed Jan 21 17:27:54 2015        (r377619)
> +++ head/editors/openoffice-devel/Makefile      Wed Jan 21 17:40:57 2015        (r377620)
> @@ -2,31 +2,105 @@
>  # $FreeBSD$
>
>  PORTNAME=      apache-openoffice
> -PORTVERSION=   4.1.${SVNREVISION}
> -PORTREVISION=  5
> +PORTVERSION=   ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
>  PORTEPOCH=     2
>  CATEGORIES=    editors java
> -MASTER_SITES=  ${MASTER_SITE_LOCAL}
> -MASTER_SITE_SUBDIR=    maho/openoffice
> -DISTFILES+=    ${OOOSRC} ${EXTSRC} unowinreg.dll
> -EXTRACT_ONLY=  ${OOOSRC} ${EXTSRC}
> +MASTER_SITES=  http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
> +               http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
> +               LOCAL/truckman/openoffice:snap,extsrc
> +.if defined(LANG_PKGNAME)
> +PKGNAMEPREFIX=         ${LANG_PKGNAME}-
> +.endif
> +.if defined(LANG_SUFFIX)
> +PKGNAMESUFFIX=         -${LANG_SUFFIX}
> +.endif

Hi,

This PKGNAMEPREFIX/PKGNAMESUFFIX stuff doesn't work:
- -devel should be used to not have pkgbase collison with editors/openoffice-4
- the defined(LANG_PKGNAME)/defined(LANG_SUFFIX) are before
files/Makefile.localized inclusion so they don't work

Cheers,

Antoine