* Honor PKGINFODIR.

* List the info files directly in the PLIST.

7 files changed, 19 insertions, 17 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 572895c4633..4aab75d285b 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=	gawk-3.1.5
@@ -18,8 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 TEST_TARGET=		check
-
-INFO_FILES=	gawk.info gawkinet.info
+INFO_FILES=		# PLIST
 
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 49dec369d82..9fd49bd0c5f 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/09/05 16:58:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:43 jlam Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
 bin/pgawk
 bin/p${PKGNAME}
+info/gawk.info
+info/gawkinet.info
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 4cc7b0b9baf..8afc51bfdf0 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/30 03:44:43 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
 PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - C compiler
 
-INFO_FILES=	cpp.info gcc.info gccint.info cppinternals.info
+INFO_FILES=	# PLIST
 
 .include "../../lang/gcc3/Makefile.common"
 
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 2da536ce187..6f36a02161c 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.71 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=		guile-1.6.7
 PKGREVISION=		3
@@ -16,10 +16,11 @@ USE_TOOLS+=		gmake makeinfo
 USE_LIBTOOL=		YES
 USE_GNU_READLINE=	YES
 PTHREAD_AUTO_VARS=	YES
-INFO_FILES=		guile.info guile-tut.info goops.info r5rs.info
+INFO_FILES=		# PLIST
 
 TEST_DIRS=		${WRKSRC}
 TEST_TARGET=		check
+OWN_DIRS=		${PREFIX}/share/guile/site
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,9 +32,6 @@ post-patch:
 	    ${WRKSRC}/guile-config/guile-config.in
 .endif
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site
-
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index 8f4b29ede9e..d5c8bba99d6 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/12/01 14:59:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/03/30 03:44:43 jlam Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -100,6 +100,10 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
+info/guile.info
+info/guile-tut.info
+info/goops.info
+info/r5rs.info
 lib/libguile-ltdl.la
 lib/libguile-srfi-srfi-13-14-v-1.la
 lib/libguile-srfi-srfi-4-v-1.la
@@ -195,8 +199,6 @@ share/guile/1.6/srfi/srfi-4.scm
 share/guile/1.6/srfi/srfi-6.scm
 share/guile/1.6/srfi/srfi-8.scm
 share/guile/1.6/srfi/srfi-9.scm
-@exec ${MKDIR} %D/share/guile/site
-@dirrm share/guile/site
 @dirrm share/guile/1.6/srfi
 @dirrm share/guile/1.6/scripts
 @dirrm share/guile/1.6/oop/goops
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 47f088623d9..87dd30e89f8 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=		librep-0.17
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--enable-static
 
 CONFIG_STATUS_OVERRIDE=	# empty
 
-INFO_FILES=	librep.info
+INFO_FILES=	# PLIST
 
 post-install:
 	${RM} -f ${REP_LIBTOOL}
diff --git a/lang/librep/PLIST b/lang/librep/PLIST
index 7d922c380fa..0fdfb62e231 100644
--- a/lang/librep/PLIST
+++ b/lang/librep/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:43 jlam Exp $
 bin/rep
 bin/rep-config
 bin/rep-remote
@@ -9,6 +9,7 @@ include/rep_gh.h
 include/rep_lisp.h
 include/rep_regexp.h
 include/rep_subrs.h
+info/librep.info
 lib/librep.la
 libexec/rep/${MACHINE_GNU_PLATFORM}/install-aliases
 libexec/rep/${MACHINE_GNU_PLATFORM}/libtool