Index: head/textproc/bsdgrep/Makefile
===================================================================
--- head/textproc/bsdgrep/Makefile	(revision 397951)
+++ head/textproc/bsdgrep/Makefile	(revision 397952)
@@ -1,45 +1,37 @@
 # Created by: Gabor Kovesdan <gabor@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	grep
 PORTVERSION=	20111002
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/gabor
 PKGNAMEPREFIX=	bsd-
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	BSD-licensed version of grep
 
 USES=	uidfix
 
 MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
 		MANDIR="${MANPREFIX}/man/man" \
 		CATDIR="${MANPREFIX}/man/man" \
 		NLSDIR="${PREFIX}/share/nls"
 
 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>
Index: head/textproc/bsdgrep/pkg-plist
===================================================================
--- head/textproc/bsdgrep/pkg-plist	(revision 397951)
+++ head/textproc/bsdgrep/pkg-plist	(revision 397952)
@@ -1,44 +1,41 @@
-@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
 bin/egrep
 bin/fgrep
 bin/grep
 bin/lzegrep
 bin/lzfgrep
 bin/lzgrep
 bin/xzegrep
 bin/xzfgrep
 bin/xzgrep
 bin/zgrep
 bin/zegrep
 bin/zfgrep
 man/man1/bzegrep.1.gz
 man/man1/bzfgrep.1.gz
 man/man1/bzgrep.1.gz
 man/man1/egrep.1.gz
 man/man1/fgrep.1.gz
 man/man1/grep.1.gz
 man/man1/lzegrep.1.gz
 man/man1/lzfgrep.1.gz
 man/man1/lzgrep.1.gz
 man/man1/xzegrep.1.gz
 man/man1/xzfgrep.1.gz
 man/man1/xzgrep.1.gz
 man/man1/zegrep.1.gz
 man/man1/zfgrep.1.gz
 man/man1/zgrep.1.gz
 %%NLS%%share/nls/es_ES.ISO8859-1/grep.cat
 %%NLS%%share/nls/gl_ES.ISO8859-1/grep.cat
 %%NLS%%share/nls/hu_HU.ISO8859-2/grep.cat
 %%NLS%%share/nls/ja_JP.eucJP/grep.cat
 %%NLS%%share/nls/ja_JP.SJIS/grep.cat
 %%NLS%%share/nls/ja_JP.UTF-8/grep.cat
 %%NLS%%share/nls/pt_BR.ISO8859-1/grep.cat
 %%NLS%%share/nls/ru_RU.KOI8-R/grep.cat
 %%NLS%%share/nls/uk_UA.UTF-8/grep.cat
 %%NLS%%share/nls/zh_CN.UTF-8/grep.cat