- Adapt to use pkg version of libtool instead of its own private copy.

- Use INSTALL_{PROGRAM,DATA,SCRIPT} from the pkg system in the makefiles
  instead of hacking around the INSTALL= breakage in configure.
- Change @dirrm share/aclocal to a "try to delete aclocal directory" via
  @unexec rmdir || true - more than one pkg uses the aclocal dir.

4 files changed, 45 insertions, 25 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 47e652ae9dc..e7b78bfa1a4 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/06/20 23:17:31 tron Exp $
+# $NetBSD: Makefile,v 1.12 1998/07/18 23:14:27 tv Exp $
 
 DISTNAME=	gtk+-1.0.4
 CATEGORIES=	x11
@@ -8,11 +8,17 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
 
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
 CONFLICTS=	gtk+-1.0.0
 
-GNU_CONFIGURE=  yes
 USE_X11=	yes
 
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=	LIBTOOL=${PREFIX}/bin/libtool \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}"
+
 CFLAGS=		-pipe -O2
 INFO_FILES=	gdk.info glib.info gtk.info
 
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index ee02c02f98b..e6369c3f054 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,10 +1,19 @@
---- glib/configure.orig	Sat Jun  6 07:40:29 1998
-+++ glib/configure	Sat Jun  6 07:39:57 1998
-@@ -574,6 +574,7 @@
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:577: checking for a BSD compatible install" >&5
-+INSTALL=""
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- configure.orig	Tue Jun  2 01:31:51 1998
++++ configure	Sat Jul 18 10:44:53 1998
+@@ -1231,6 +1231,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1276,7 +1277,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1283: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 32e08c37636..6fd5fd8dd9c 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,11 +1,19 @@
---- configure.orig	Sat Jun  6 20:45:12 1998
-+++ configure	Sat Jun  6 20:45:37 1998
-@@ -638,7 +638,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+--- glib/configure.orig	Tue Jun  2 01:31:43 1998
++++ glib/configure	Sat Jul 18 10:48:59 1998
+@@ -1208,6 +1208,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
  
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+@@ -1253,7 +1254,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
  
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
- echo "configure:645: checking whether build environment is sane" >&5
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1260: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 15ee01f7c4c..08265cc0b97 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1998/07/15 21:31:21 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 1998/07/18 23:14:28 tv Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -104,13 +104,10 @@ include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
 lib/libgdk.a
-lib/libgdk.la
 lib/libgdk.so.1.4
 lib/libglib.a
-lib/libglib.la
 lib/libglib.so.1.4
 lib/libgtk.a
-lib/libgtk.la
 lib/libgtk.so.1.4
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -128,6 +125,6 @@ info/gtk.info-3
 info/gtk.info-4
 info/gtk.info-5
 share/aclocal/gtk.m4
-@dirrm share/aclocal
+@unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm include/gtk
 @dirrm include/gdk