From owner-svn-ports-head@FreeBSD.ORG Wed Jan 21 19:57:39 2015 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5DDE527; Wed, 21 Jan 2015 19:57:39 +0000 (UTC) Received: from gw.catspoiler.org (cl-1657.chi-02.us.sixxs.net [IPv6:2001:4978:f:678::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 55B44674; Wed, 21 Jan 2015 19:57:39 +0000 (UTC) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id t0LJvSL1059353; Wed, 21 Jan 2015 11:57:32 -0800 (PST) (envelope-from truckman@FreeBSD.org) Message-Id: <201501211957.t0LJvSL1059353@gw.catspoiler.org> Date: Wed, 21 Jan 2015 11:57:28 -0800 (PST) From: Don Lewis Subject: Re: svn commit: r377620 - in head/editors/openoffice-devel: . files To: antoine@FreeBSD.org In-Reply-To: MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2015 19:57:39 -0000 On 21 Jan, Antoine Brodin wrote: > On Wed, Jan 21, 2015 at 6:40 PM, Don Lewis 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 ...