* Honor PKGINFODIR.

* List the info files directly in the PLIST.

5 files changed, 33 insertions, 24 deletions

diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 90187f0d7e0..10e54070aac 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	guile-lib-0.1.2
 PKGREVISION=	1
@@ -12,23 +12,27 @@ COMMENT=	Library functions for Guile, implemented in Scheme
 # This package may not be built from the src directory (arch configure
 # rules).  The build directory must be created by hand; see the
 # pre-configure target.
-HAS_CONFIGURE=	yes
-CONFIGURE_DIRS=	${WRKSRC}/build
-BUILD_DIRS=	${WRKSRC}/build
+#
+HAS_CONFIGURE=		yes
+CONFIGURE_DIRS=		${WRKSRC}/build
+BUILD_DIRS=		${WRKSRC}/build
 CONFIGURE_SCRIPT=	../src/configure
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--with-pkginfodir=${PKGINFODIR:Q}
 
 USE_TOOLS+=	gmake makeinfo
 TEXINFO_REQD=	4.2
-INFO_FILES=	guile-library.info
+INFO_FILES=	# PLIST
 TEST_TARGET=	test
 
+.include "../../lang/guile/buildlink3.mk"
+
 pre-configure:
 	${MKDIR} ${WRKSRC}/build
-	${RM} ${WRKSRC}/src/build-tools/gnu/config.guess
-	${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/src/build-tools/gnu/config.guess
-	${RM} ${WRKSRC}/src/build-tools/gnu/config.sub
-	${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/src/build-tools/gnu/config.sub
+.for FILE in config.guess config.sub
+	${RM} ${WRKSRC}/src/build-tools/gnu/${FILE}
+	${LN} -s ${PKGSRCDIR}/mk/gnu-config/${FILE}			\
+		${WRKSRC}/src/build-tools/gnu/${FILE}
+.endfor
 
-.include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-lib/PLIST b/devel/guile-lib/PLIST
index 2aa46f55683..e2892f0786b 100644
--- a/devel/guile-lib/PLIST
+++ b/devel/guile-lib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:43 jlam Exp $
+info/guile-library.info
 share/guile/site/config/load.scm
 share/guile/site/container/delay-tree.scm
 share/guile/site/container/nodal-tree.scm
diff --git a/devel/guile-lib/distinfo b/devel/guile-lib/distinfo
index f73753d9057..fe12cb53fbd 100644
--- a/devel/guile-lib/distinfo
+++ b/devel/guile-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:16 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/03/30 03:44:43 jlam Exp $
 
 SHA1 (guile-lib-0.1.2.tar.gz) = 79551b4b78c3deb5ae82d60f1b3ed1f9e32a25ea
 RMD160 (guile-lib-0.1.2.tar.gz) = f4514ca6075fc0bfdaddf34596432bd8acdb8ad9
 Size (guile-lib-0.1.2.tar.gz) = 404372 bytes
-SHA1 (patch-aa) = 0a7d3eaf4c28e48d338fc9979cf5f3e45b109778
+SHA1 (patch-aa) = 1ffda820e008c156fe8cdbe72c137443c6764915
+SHA1 (patch-ab) = 466bef5a334693d1b851e2e1d8c600325d8e3ab0
diff --git a/devel/guile-lib/patches/patch-aa b/devel/guile-lib/patches/patch-aa
index 66ac925e205..5abf80a0070 100644
--- a/devel/guile-lib/patches/patch-aa
+++ b/devel/guile-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/30 03:44:43 jlam Exp $
 
 --- src/guile-lib/doc/Makefile.in.orig	2004-08-04 10:38:19.000000000 -0400
 +++ src/guile-lib/doc/Makefile.in
@@ -7,16 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
  
  theinfo := guile-library.info
 -info-install-dir := $(destdir)$(prefix)/share/info
-+info-install-dir := $(destdir)$(prefix)/info
++info-install-dir := $(destdir)$(prefix)/$(cfg__pkginfodir)
  
  all: $(theinfo)
  
-@@ -19,7 +19,7 @@ clean-doc-info:
- 	rm -rf $(theinfo)
- 
- %.info: %.texi
--	makeinfo --force -I $(srcdir) -o $@ $<
-+	makeinfo --no-split --force -I $(srcdir) -o $@ $<
- 
- # arch-tag: 385d1967-44cf-41eb-b991-cea96c3f3971
- 
diff --git a/devel/guile-lib/patches/patch-ab b/devel/guile-lib/patches/patch-ab
new file mode 100644
index 00000000000..242979600ef
--- /dev/null
+++ b/devel/guile-lib/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/03/30 03:44:43 jlam Exp $
+
+--- src/PLUGIN/options.orig	2004-08-04 10:38:15.000000000 -0400
++++ src/PLUGIN/options
+@@ -25,4 +25,7 @@ string		package-framework-bug-mail	lord@
+ 	To what email address should package-framework bug reports be
+ 	sent?
+ 
++string		pkginfodir	info
++	In what subdirectory should info files be stored?
++
+