From owner-svn-ports-branches@FreeBSD.ORG Fri Nov 9 19:59:38 2012 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68757411 for ; Fri, 9 Nov 2012 19:59:38 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 4242A8FC14 for ; Fri, 9 Nov 2012 19:59:38 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9JxcMA077733 for ; Fri, 9 Nov 2012 19:59:38 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA9JxcGW077727 for svn-ports-branches@freebsd.org; Fri, 9 Nov 2012 19:59:38 GMT (envelope-from bdrewery) Received: (qmail 92589 invoked from network); 9 Nov 2012 13:59:36 -0600 Received: from unknown (HELO ?192.168.0.74?) (freebsd@shatow.net@74.94.87.209) by sweb.xzibition.com with ESMTPA; 9 Nov 2012 13:59:36 -0600 Message-ID: <509D60B8.3060704@FreeBSD.org> Date: Fri, 09 Nov 2012 13:59:52 -0600 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Adam Weinberger Subject: Re: svn commit: r307242 - branches/RELENG_9_1_0/textproc/bsdgrep References: <201211091635.qA9GZHOP011800@svn.freebsd.org> In-Reply-To: <201211091635.qA9GZHOP011800@svn.freebsd.org> X-Enigmail-Version: 1.4.5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2012 19:59:38 -0000 I think the mergeinfo was missed on your 3 commits. On 11/9/2012 10:35 AM, Adam Weinberger wrote: > Author: adamw > Date: Fri Nov 9 16:35:17 2012 > New Revision: 307242 > URL: http://svnweb.freebsd.org/changeset/ports/307242 > > Log: > MFH r307206 > > - fix NLS support, which was wired backwards > - actually enable NLS in OPTIONS > - change LOCALBASE to PREFIX, as it was attempting to create a directory in > one, and then install a file into another > - this fixes package building > > Feature safe: yes > Approved by: portmgr > > Modified: > branches/RELENG_9_1_0/textproc/bsdgrep/Makefile > > Modified: branches/RELENG_9_1_0/textproc/bsdgrep/Makefile > ============================================================================== > --- branches/RELENG_9_1_0/textproc/bsdgrep/Makefile Fri Nov 9 16:20:15 2012 (r307241) > +++ branches/RELENG_9_1_0/textproc/bsdgrep/Makefile Fri Nov 9 16:35:17 2012 (r307242) > @@ -7,6 +7,7 @@ > > PORTNAME= grep > PORTVERSION= 20111002 > +PORTREVISION= 1 > CATEGORIES= textproc > MASTER_SITES= ${MASTER_SITE_LOCAL} > MASTER_SITE_SUBDIR= gabor > @@ -37,7 +38,7 @@ MAKE_ENV+= BINDIR="${PREFIX}/bin" \ > CATDIR="${MANPREFIX}/man/man" \ > NLSDIR="${PREFIX}/share/nls" > > -OPTIONS_DEFINE= GNU_COMPAT > +OPTIONS_DEFINE= GNU_COMPAT NLS > OPTIONS_DEFAULT= GNU_COMPAT > GNU_COMPAT_DESC= Use GNU regex library (recommended) > > @@ -47,16 +48,16 @@ CONFLICTS= gnugrep-* > > .if !(${OSVERSION} >= 900012 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800505)) > LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz > -CFLAGS+= -I${LOCALBASE}/include > -LDFLAGS+= -L${LOCALBASE}/lib > +CFLAGS+= -I${PREFIX}/include > +LDFLAGS+= -L${PREFIX}/lib > BROKEN= overwrites files installed by dependency > .endif > > .if ${PORT_OPTIONS:MNLS} > +PLIST_SUB+= NLS="" > +.else > MAKE_ENV+= WITHOUT_NLS=yes > PLIST_SUB+= NLS="@comment " > -.else > -PLIST_SUB+= NLS="" > .endif > > .if !${PORT_OPTIONS:MGNU_COMPAT} > @@ -65,7 +66,7 @@ MAKE_ENV+= WITHOUT_GNU_COMPAT=yes > > pre-install: > .if ${PORT_OPTIONS:MNLS} > - ${MKDIR} ${LOCALBASE}/share/nls/gl_ES.ISO8859-1 > + ${MKDIR} ${PREFIX}/share/nls/gl_ES.ISO8859-1 > .endif > > post-install: > -- Regards, Bryan Drewery bdrewery@freenode/EFNet