Date: Sat, 26 Sep 2015 09:26:12 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397952 - head/textproc/bsdgrep Message-ID: <201509260926.t8Q9QCqU067351@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Sep 26 09:26:11 2015 New Revision: 397952 URL: https://svnweb.freebsd.org/changeset/ports/397952 Log: Stop installing potentially wrong gnugrep Do not create symlinks in scripts Use options helpers Modified: head/textproc/bsdgrep/Makefile head/textproc/bsdgrep/pkg-plist Modified: head/textproc/bsdgrep/Makefile ============================================================================== --- head/textproc/bsdgrep/Makefile Sat Sep 26 09:21:18 2015 (r397951) +++ head/textproc/bsdgrep/Makefile Sat Sep 26 09:26:11 2015 (r397952) @@ -3,7 +3,7 @@ PORTNAME= grep PORTVERSION= 20111002 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= LOCAL/gabor PKGNAMEPREFIX= bsd- @@ -20,26 +20,18 @@ MAKE_ENV+= BINDIR="${PREFIX}/bin" \ OPTIONS_DEFINE= GNU_COMPAT NLS OPTIONS_DEFAULT= GNU_COMPAT +OPTIONS_SUB= yes GNU_COMPAT_DESC= Use GNU regex library (recommended) CONFLICTS= gnugrep-* -.include <bsd.port.options.mk> +NLS_MAKE_ENV_OFF= WITHOUT_NLS=yes +GNU_COMPAT_MAKE_ENV_OFF= WITHOUT_GNU_COMPAT=yes -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -MAKE_ENV+= WITHOUT_NLS=yes -PLIST_SUB+= NLS="@comment " -.endif - -.if !${PORT_OPTIONS:MGNU_COMPAT} -MAKE_ENV+= WITHOUT_GNU_COMPAT=yes -.endif - -pre-install: -.if ${PORT_OPTIONS:MNLS} +pre-install-NLS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/gl_ES.ISO8859-1 -.endif + +post-install: + ${LN} -sf ${PREFIX}/bin/grep ${STAGEDIR}${PREFIX}/bin/bsdgrep .include <bsd.port.mk> Modified: head/textproc/bsdgrep/pkg-plist ============================================================================== --- head/textproc/bsdgrep/pkg-plist Sat Sep 26 09:21:18 2015 (r397951) +++ head/textproc/bsdgrep/pkg-plist Sat Sep 26 09:26:11 2015 (r397952) @@ -1,7 +1,4 @@ -@unexec rm -f %D/bin/bsdgrep -@exec /bin/ln -s %D/bin/grep %D/bin/bsdgrep -@unexec rm -f %D/bin/gnugrep -@exec /bin/ln -s /usr/bin/grep %D/bin/gnugrep +bin/bsdgrep bin/bzegrep bin/bzfgrep bin/bzgrep
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509260926.t8Q9QCqU067351>