Date: Wed, 21 Jan 2015 11:57:28 -0800 (PST) From: Don Lewis <truckman@FreeBSD.org> To: antoine@FreeBSD.org Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: svn commit: r377620 - in head/editors/openoffice-devel: . files Message-ID: <201501211957.t0LJvSL1059353@gw.catspoiler.org> In-Reply-To: <CAALwa8kR6Cp8LrfjqYUT3ogf4S9C0sOqJ7rPxPO=%2Bj%2BFbJYKLQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21 Jan, Antoine Brodin wrote: > On Wed, Jan 21, 2015 at 6:40 PM, Don Lewis <truckman@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 Yeah, got that. > - the defined(LANG_PKGNAME)/defined(LANG_SUFFIX) are before > files/Makefile.localized inclusion so they don't work Ok, something else to fix ...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501211957.t0LJvSL1059353>