diff options
| author | bapt <bapt@FreeBSD.org> | 2015-09-26 09:26:11 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-09-26 09:26:11 +0000 |
| commit | 794340d7bdea8553a4d07340ccabc23d061d1077 (patch) | |
| tree | e2e3c0322152e6da57a3ac8733b807b72a898eb8 | |
| parent | 8df37368dc4e0e33411c4e54b325f103ecc2d5fd (diff) | |
| download | FreeBSD-ports-794340d7bdea8553a4d07340ccabc23d061d1077.zip FreeBSD-ports-794340d7bdea8553a4d07340ccabc23d061d1077.tar.gz | |
Stop installing potentially wrong gnugrep
Do not create symlinks in scripts
Use options helpers
| -rw-r--r-- | textproc/bsdgrep/Makefile | 24 | ||||
| -rw-r--r-- | textproc/bsdgrep/pkg-plist | 5 |
2 files changed, 9 insertions, 20 deletions
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile index 8b19d4b..350a914 100644 --- a/textproc/bsdgrep/Makefile +++ b/textproc/bsdgrep/Makefile @@ -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> diff --git a/textproc/bsdgrep/pkg-plist b/textproc/bsdgrep/pkg-plist index b9d2e31..3a322bf 100644 --- a/textproc/bsdgrep/pkg-plist +++ b/textproc/bsdgrep/pkg-plist @@ -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 |
