From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  9 20:19:11 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F3F7CBD1;
 Fri,  9 Nov 2012 20:19:10 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150])
 by mx1.freebsd.org (Postfix) with ESMTP id 4B4098FC0A;
 Fri,  9 Nov 2012 20:19:07 +0000 (UTC)
Received: from [192.168.192.5] (d24-156-192-11.home4.cgocable.net
 [24.156.192.11]) (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (No client certificate requested)
 by apnoea.adamw.org (Postfix) with ESMTPSA id 3B08145497;
 Fri,  9 Nov 2012 15:18:24 -0500 (EST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\))
Subject: Re: svn commit: r307242 - branches/RELENG_9_1_0/textproc/bsdgrep
From: Adam Weinberger <adamw@adamw.org>
In-Reply-To: <509D60B8.3060704@FreeBSD.org>
Date: Fri, 9 Nov 2012 15:19:03 -0500
Content-Transfer-Encoding: quoted-printable
Message-Id: <E582D34E-A681-434B-9F36-A1F62F6CE2F6@adamw.org>
References: <201211091635.qA9GZHOP011800@svn.freebsd.org>
 <509D60B8.3060704@FreeBSD.org>
To: Bryan Drewery <bdrewery@FreeBSD.org>
X-Mailer: Apple Mail (2.1499)
Cc: svn-ports-all@FreeBSD.org, Adam Weinberger <adamw@FreeBSD.org>,
 svn-ports-branches@FreeBSD.org, ports-committers@FreeBSD.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 20:19:11 -0000

Yep, you're right. beat has been busy helping me fix it.

# Adam


--=20
Adam Weinberger
adamw@adamw.org
http://www.adamw.org

On 2012-11-09, at 14:59, Bryan Drewery <bdrewery@FreeBSD.org> wrote:

> I think the mergeinfo was missed on your 3 commits.
>=20
> 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
>>=20
>> Log:
>>  MFH r307206
>>=20
>>  - 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
>>=20
>>  Feature safe:	yes
>>  Approved by:	portmgr
>>=20
>> Modified:
>>  branches/RELENG_9_1_0/textproc/bsdgrep/Makefile
>>=20
>> Modified: branches/RELENG_9_1_0/textproc/bsdgrep/Makefile
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- 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 @@
>>=20
>> PORTNAME=3D	grep
>> PORTVERSION=3D	20111002
>> +PORTREVISION=3D	1
>> CATEGORIES=3D	textproc
>> MASTER_SITES=3D	${MASTER_SITE_LOCAL}
>> MASTER_SITE_SUBDIR=3D	gabor
>> @@ -37,7 +38,7 @@ MAKE_ENV+=3D	BINDIR=3D"${PREFIX}/bin" \
>> 		CATDIR=3D"${MANPREFIX}/man/man" \
>> 		NLSDIR=3D"${PREFIX}/share/nls"
>>=20
>> -OPTIONS_DEFINE=3D	GNU_COMPAT
>> +OPTIONS_DEFINE=3D	GNU_COMPAT NLS
>> OPTIONS_DEFAULT=3D	GNU_COMPAT
>> GNU_COMPAT_DESC=3D	Use GNU regex library (recommended)
>>=20
>> @@ -47,16 +48,16 @@ CONFLICTS=3D	gnugrep-*
>>=20
>> .if !(${OSVERSION} >=3D 900012 || (${OSVERSION} < 900000 && =
${OSVERSION} >=3D 800505))
>> LIB_DEPENDS+=3D	lzma.5:${PORTSDIR}/archivers/xz
>> -CFLAGS+=3D	-I${LOCALBASE}/include
>> -LDFLAGS+=3D	-L${LOCALBASE}/lib
>> +CFLAGS+=3D	-I${PREFIX}/include
>> +LDFLAGS+=3D	-L${PREFIX}/lib
>> BROKEN=3D		overwrites files installed by dependency
>> .endif
>>=20
>> .if ${PORT_OPTIONS:MNLS}
>> +PLIST_SUB+=3D	NLS=3D""
>> +.else
>> MAKE_ENV+=3D	WITHOUT_NLS=3Dyes
>> PLIST_SUB+=3D	NLS=3D"@comment "
>> -.else
>> -PLIST_SUB+=3D	NLS=3D""
>> .endif
>>=20
>> .if !${PORT_OPTIONS:MGNU_COMPAT}
>> @@ -65,7 +66,7 @@ MAKE_ENV+=3D	WITHOUT_GNU_COMPAT=3Dyes
>>=20
>> pre-install:
>> .if ${PORT_OPTIONS:MNLS}
>> -	${MKDIR} ${LOCALBASE}/share/nls/gl_ES.ISO8859-1
>> +	${MKDIR} ${PREFIX}/share/nls/gl_ES.ISO8859-1
>> .endif
>>=20
>> post-install:
>>=20
>=20
>=20
> --=20
> Regards,
> Bryan Drewery
> bdrewery@freenode/EFNet
>=20