From f873b8d456deeb91fc4c90d580352d25c048bf98 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 25 Jan 2003 12:34:41 +0000
Subject: Make sure that the correct guile program (guile14) is being invoked,
 and install the data files under the guile14 hierarchy.  Bump PKGREVISION of
 devel/guile-gtk to 1.

---
 devel/guile-gtk/Makefile | 12 +++++++++++-
 devel/guile-gtk/PLIST    | 28 ++++++++++++++--------------
 doc/CHANGES              |  3 ++-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 9f25fcff52f..a77253735bf 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/01/07 11:43:12 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/25 12:34:41 jlam Exp $
 #
 
 DISTNAME=		guile-gtk-0.19
+PKGREVISION=		1
 CATEGORIES=		devel x11
 MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
 			http://erin.netpedia.net/download/ \
@@ -18,6 +19,15 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--datadir=${GUILE14_PREFIX}/share
+PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR}
+
+pre-build:
+	cd ${WRKSRC}; for file in build-guile-gtk; do			\
+		${SED}	-e "s,^exec guile,exec ${GUILE14},"		\
+			$$file > $$file.new;				\
+		${MV} -f $$file.new $$file;				\
+	done
 
 .include "../../lang/guile14/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/devel/guile-gtk/PLIST b/devel/guile-gtk/PLIST
index 36c7b21e9e8..f73f82e13f0 100644
--- a/devel/guile-gtk/PLIST
+++ b/devel/guile-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/25 12:34:41 jlam Exp $
 bin/build-guile-gtk
 bin/guile-gtk
 bin/guile-gtk-1.2
@@ -8,16 +8,16 @@ lib/libguilegtk-1.2.la
 lib/libguilegtk-1.2.so
 lib/libguilegtk-1.2.so.0
 lib/libguilegtk-1.2.so.0.0
-share/guile-gtk/gdk-1.2.defs
-share/guile-gtk/gtk-1.2.defs
-share/guile/gtk-1.2/gdk.scm
-share/guile/gtk-1.2/gtk.scm
-share/guile/gtk/config.scm
-share/guile/gtk/dynlink-old.scm
-share/guile/gtk/dynlink.scm
-share/guile/gtk/event-repl.scm
-share/guile/gtk/gdk.scm
-share/guile/gtk/gtk.scm
-@dirrm share/guile/gtk
-@dirrm share/guile/gtk-1.2
-@dirrm share/guile-gtk
+${GUILE14_SUBDIR}/share/guile-gtk/gdk-1.2.defs
+${GUILE14_SUBDIR}/share/guile-gtk/gtk-1.2.defs
+${GUILE14_SUBDIR}/share/guile/gtk-1.2/gdk.scm
+${GUILE14_SUBDIR}/share/guile/gtk-1.2/gtk.scm
+${GUILE14_SUBDIR}/share/guile/gtk/config.scm
+${GUILE14_SUBDIR}/share/guile/gtk/dynlink-old.scm
+${GUILE14_SUBDIR}/share/guile/gtk/dynlink.scm
+${GUILE14_SUBDIR}/share/guile/gtk/event-repl.scm
+${GUILE14_SUBDIR}/share/guile/gtk/gdk.scm
+${GUILE14_SUBDIR}/share/guile/gtk/gtk.scm
+@dirrm ${GUILE14_SUBDIR}/share/guile/gtk
+@dirrm ${GUILE14_SUBDIR}/share/guile/gtk-1.2
+@dirrm ${GUILE14_SUBDIR}/share/guile-gtk
diff --git a/doc/CHANGES b/doc/CHANGES
index 0bb07038f37..7691dd1ed2c 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1229 2003/01/25 12:10:08 rh Exp $
+$NetBSD: CHANGES,v 1.1230 2003/01/25 12:35:46 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -408,3 +408,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated hpijs to 1.3 [toshii 2003-01-25]
 	Updated Gorm to 0.2.5 [rh 2003-01-25]
 	Updated lbreakout to 010315nb1 [rh 2003-01-25]
+	Updated guile-gtk to 0.19nb1 [jlam 2003-01-25]
-- 
cgit v1.2.3