From owner-svn-ports-head@FreeBSD.ORG Wed Jan 21 19:54:32 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B69D73E7; Wed, 21 Jan 2015 19:54:32 +0000 (UTC) Received: from mail-yk0-x22f.google.com (mail-yk0-x22f.google.com [IPv6:2607:f8b0:4002:c07::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7122764D; Wed, 21 Jan 2015 19:54:32 +0000 (UTC) Received: by mail-yk0-f175.google.com with SMTP id 9so1400633ykp.6; Wed, 21 Jan 2015 11:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=hwUuSrVPchykqCrGlJisg+2knv6Nm5x4Leivp/BC3gs=; b=nmm4HJTOpmYrU6/5WUm9L8keA+nu2gRQoTkwfP2KRsuJUJlRi03kxhRpZACJJMSC4v /SSnkRTnDDSttIqZBh98uMGdOp0MtO42BH9zkDfzeYLGZvozQIBcerhAz/oWf/9JBc8u hBWfF981ue1p4TM+7z2P4hUp5G7XbI9C6NGkdu9T5pKyQFR0kIdu64WdjnCC5bB/U0zd lu4SYEuE213nhBMsyJ0eqPyY6m/H6feU54AYgeDDCrlF7evhd1mSN9S/haOFtR50nX2/ kriz5T7Sr6CeholNrYIZfDU6WZMQjealq085zaNR4C3OwH3iwGOs3i2QGnre/s6gj6+u 1c3Q== MIME-Version: 1.0 X-Received: by 10.236.30.168 with SMTP id k28mr13867486yha.163.1421870071448; Wed, 21 Jan 2015 11:54:31 -0800 (PST) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.170.142.198 with HTTP; Wed, 21 Jan 2015 11:54:31 -0800 (PST) In-Reply-To: <201501211740.t0LHew5d028993@svn.freebsd.org> References: <201501211740.t0LHew5d028993@svn.freebsd.org> Date: Wed, 21 Jan 2015 20:54:31 +0100 X-Google-Sender-Auth: ZMg2AwNoAF9Ll3-T-iBOpT7KpxQ Message-ID: Subject: Re: svn commit: r377620 - in head/editors/openoffice-devel: . files From: Antoine Brodin To: Don Lewis Content-Type: text/plain; charset=UTF-8 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:54:32 -0000 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 - the defined(LANG_PKGNAME)/defined(LANG_SUFFIX) are before files/Makefile.localized inclusion so they don't work Cheers, Antoine