From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  9 16:35:17 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 AE017D5A;
 Fri,  9 Nov 2012 16:35:17 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 797F68FC12;
 Fri,  9 Nov 2012 16:35:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9GZHwi011801;
 Fri, 9 Nov 2012 16:35:17 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA9GZHOP011800;
 Fri, 9 Nov 2012 16:35:17 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201211091635.qA9GZHOP011800@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Fri, 9 Nov 2012 16:35:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r307242 - branches/RELENG_9_1_0/textproc/bsdgrep
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 16:35:17 -0000

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: