Insert the pkgsrc-specific component of the INFOPATH in a more

maintainable way.

4 files changed, 22 insertions, 13 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index d5723397a51..ceaca2d474d 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/02/14 13:55:19 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/04/02 02:01:34 jlam Exp $
 
 DISTNAME=		texinfo-4.6
 PKGNAME=		g${DISTNAME}
@@ -17,17 +17,12 @@ USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
+PKGSRC_INFOPATH=	${PREFIX}/info:${X11BASE}/info:${LOCALBASE}/info
+MAKE_ENV+=		PKGSRC_INFOPATH="${PKGSRC_INFOPATH}"
+
 INFO_FILES=		info-stnd.info info.info texinfo
 TEST_TARGET=		check
 
-post-patch:
-	${MV} -f ${WRKSRC}/info/filesys.h ${WRKSRC}/info/filesys.h.orig
-	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		-e 's|@X11BASE@|${X11BASE}|g'		\
-		-e 's|@LOCALBASE@|${LOCALBASE}|g'	\
-		< ${WRKSRC}/info/filesys.h.orig		\
-		> ${WRKSRC}/info/filesys.h
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index ec08f7d7096..54b9e7e8b34 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.15 2003/07/09 13:11:01 grant Exp $
+$NetBSD: distinfo,v 1.16 2004/04/02 02:01:34 jlam Exp $
 
 SHA1 (texinfo-4.6.tar.bz2) = 52103579a90d49229fb30968bbe4e55a502857d3
 Size (texinfo-4.6.tar.bz2) = 1348113 bytes
-SHA1 (patch-ac) = bf22fe2b8920c88a357ce9c1202690ed291c5b92
+SHA1 (patch-ab) = d48b65a04dd6b93143e49ce49d93338463f4301d
+SHA1 (patch-ac) = f4e45e38fe42f38db52b4fe33d918f104ba1de05
 SHA1 (patch-ad) = 1c998cdb8b0831e15eef7df6c4f8ef108455619e
 SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
 SHA1 (patch-aj) = ccd515134e442e2ed5354c8151ed3dc8a3efaecd
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
new file mode 100644
index 00000000000..0a571104185
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2004/04/02 02:01:34 jlam Exp $
+
+--- info/Makefile.in.orig	Tue Jun 10 16:51:39 2003
++++ info/Makefile.in
+@@ -66,7 +66,7 @@ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+-DEFS = @DEFS@ -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\"
++DEFS = @DEFS@ -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac
index b87527bf121..17ae7c95504 100644
--- a/devel/gtexinfo/patches/patch-ac
+++ b/devel/gtexinfo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/10/03 02:06:32 seb Exp $
+$NetBSD: patch-ac,v 1.8 2004/04/02 02:01:34 jlam Exp $
 
 --- info/filesys.h.orig	Wed Jul 22 00:25:44 1998
 +++ info/filesys.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.7 2002/10/03 02:06:32 seb Exp $
  /* The default value of INFOPATH. */
  #if !defined (DEFAULT_INFOPATH)
 -#  define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
-+#  define DEFAULT_INFOPATH "@PREFIX@/info:@X11BASE@/info:@LOCALBASE@/info:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
++#  define DEFAULT_INFOPATH PKGSRC_INFOPATH ":" "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:."
  #endif /* !DEFAULT_INFOPATH */
  
  #if !defined (S_ISREG) && defined (S_IFREG)