Honor GNU_PROGRAM_PREFIX, patch by Jeremy C. Reed.

While here: Fix build on NetBSD-current.

5 files changed, 65 insertions, 32 deletions

diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index 3ccf1cf44ba..ae476b0d884 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2002/12/06 15:29:20 cjep Exp $
-# FreeBSD Id: Makefile,v 1.10 1999/01/27 07:41:16 fenner Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/25 19:50:34 wiz Exp $
+#
 
 DISTNAME=	grep-2.5
 CATEGORIES=	textproc
@@ -13,11 +13,16 @@ USE_BUILDLINK2=         YES
 BUILD_USES_MSGFMT=	YES
 TEXINFO_REQD=		4.0
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=        --program-prefix=g
+GNU_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(GNU_PROGRAM_PREFIX)
+CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
+.endif
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+BUILD_DEFS+=		GNU_PROGRAM_PREFIX
+
 .if (${OPSYS} == SunOS)
 CONFIGURE_SCRIPT=	${SH} ./configure
 .endif
diff --git a/textproc/grep/PLIST b/textproc/grep/PLIST
index c5e18bd6b6c..5cb071a25b0 100644
--- a/textproc/grep/PLIST
+++ b/textproc/grep/PLIST
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/14 16:43:14 bouyer Exp $
-bin/ggrep
-bin/gegrep
-bin/gfgrep
-man/man1/ggrep.1
-man/man1/gfgrep.1
-man/man1/gegrep.1
+@comment $NetBSD: PLIST,v 1.2 2002/12/25 19:50:34 wiz Exp $
+bin/${GNU_PROGRAM_PREFIX}grep
+bin/${GNU_PROGRAM_PREFIX}egrep
+bin/${GNU_PROGRAM_PREFIX}fgrep
+man/man1/${GNU_PROGRAM_PREFIX}grep.1
+man/man1/${GNU_PROGRAM_PREFIX}fgrep.1
+man/man1/${GNU_PROGRAM_PREFIX}egrep.1
 @unexec ${INSTALL_INFO} --delete %D/info/grep.info %D/info/dir
 info/grep.info
 info/grep.info-1
 info/grep.info-2
 info/grep.info-3
 @exec ${INSTALL_INFO} %D/info/grep.info %D/info/dir
-share/locale/cs/LC_MESSAGES/grep.mo
-share/locale/de/LC_MESSAGES/grep.mo
-share/locale/el/LC_MESSAGES/grep.mo
-share/locale/eo/LC_MESSAGES/grep.mo
-share/locale/es/LC_MESSAGES/grep.mo
-share/locale/et/LC_MESSAGES/grep.mo
-share/locale/fr/LC_MESSAGES/grep.mo
-share/locale/gl/LC_MESSAGES/grep.mo
-share/locale/hr/LC_MESSAGES/grep.mo
-share/locale/id/LC_MESSAGES/grep.mo
-share/locale/it/LC_MESSAGES/grep.mo
-share/locale/ja/LC_MESSAGES/grep.mo
-share/locale/ko/LC_MESSAGES/grep.mo
-share/locale/nl/LC_MESSAGES/grep.mo
-share/locale/no/LC_MESSAGES/grep.mo
-share/locale/pl/LC_MESSAGES/grep.mo
-share/locale/pt_BR/LC_MESSAGES/grep.mo
-share/locale/ru/LC_MESSAGES/grep.mo
-share/locale/sl/LC_MESSAGES/grep.mo
-share/locale/sv/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/grep.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/grep.mo
diff --git a/textproc/grep/distinfo b/textproc/grep/distinfo
index 038c9fac892..664c9ce7e12 100644
--- a/textproc/grep/distinfo
+++ b/textproc/grep/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/14 16:43:14 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2002/12/25 19:50:34 wiz Exp $
 
 SHA1 (grep-2.5.tar.gz) = 551a4d4708ce9280ccf3054edb048fadca089cc6
 Size (grep-2.5.tar.gz) = 683116 bytes
 SHA1 (patch-aa) = 18f1398881d686840f257048eda431f9ded866be
+SHA1 (patch-ab) = 353f079d4b6c6853a16eb00c79462e32e8e1cf19
+SHA1 (patch-ac) = f0e672a0f29bc9a41e9918114e527f0ce1947f51
diff --git a/textproc/grep/patches/patch-ab b/textproc/grep/patches/patch-ab
new file mode 100644
index 00000000000..75c18f73a4a
--- /dev/null
+++ b/textproc/grep/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/12/25 19:50:35 wiz Exp $
+
+--- src/dfa.c.orig	Wed Sep 26 18:57:55 2001
++++ src/dfa.c
+@@ -44,7 +44,7 @@ extern void free();
+ # include <locale.h>
+ #endif
+ 
+-#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
++#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && defined HAVE_WCTYPE
+ /* We can handle multibyte string.  */
+ # define MBS_SUPPORT
+ #endif
diff --git a/textproc/grep/patches/patch-ac b/textproc/grep/patches/patch-ac
new file mode 100644
index 00000000000..6556ede4fda
--- /dev/null
+++ b/textproc/grep/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/12/25 19:50:36 wiz Exp $
+
+--- src/search.c.orig	Thu Apr 19 05:42:14 2001
++++ src/search.c
+@@ -22,7 +22,7 @@
+ # include <config.h>
+ #endif
+ #include <sys/types.h>
+-#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
++#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && defined HAVE_WCTYPE
+ /* We can handle multibyte string.  */
+ # define MBS_SUPPORT
+ # include <wchar.h>