USE_LIBTOOL instead of PKG_LIBTOOL. Fix some warts in the patches.

7 files changed, 34 insertions, 45 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index bfdc0179ba0..63ab987c1c0 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2000/06/02 13:18:43 tron Exp $
+# $NetBSD: Makefile,v 1.45 2000/06/21 00:47:44 jlam Exp $
 
 DISTNAME=		gnome-core-1.2.0
 CATEGORIES=		x11 gnome
@@ -12,10 +12,11 @@ DEPENDS+=		gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
 DEPENDS+=		libghttp>=1.0.4:../../www/libghttp
 DEPENDS+=		libxml-*:../../textproc/libxml
 
-GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
+GNU_CONFIGURE=		# defined
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
@@ -42,7 +43,7 @@ post-install:
 	  ${CP} ${PKGDIR}/PLIST.${OPSYS} ${PLIST_SRC}; \
 	else \
 	  ${EGREP} -v '/((cpumem|disk)usage|(cpu|mem|multi|swap)load)_applet' \
-	  <${PKGDIR}/PLIST.${OPSYS} >${PLIST_SRC}; \
+		< ${PKGDIR}/PLIST.${OPSYS} > ${PLIST_SRC}; \
 	fi
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/files/patch-sum b/x11/gnome-core/files/patch-sum
index e18bd22ab07..af6962bb7fe 100644
--- a/x11/gnome-core/files/patch-sum
+++ b/x11/gnome-core/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.15 2000/05/30 19:39:22 drochner Exp $
+$NetBSD: patch-sum,v 1.16 2000/06/21 00:47:45 jlam Exp $
 
-MD5 (patch-aa) = 90927862eeed8d313cd6765052869da0
-MD5 (patch-af) = a18ee68f6e295f5b4607f7b3fb6f3032
-MD5 (patch-ag) = 19a1033927a3a24176c5c1813f6409b8
+MD5 (patch-aa) = ff1a7cf7dfccd5cb1bb09dc4cce0b9ed
+MD5 (patch-af) = 330b90aecd9329b974d6db8f1b6c2aed
+MD5 (patch-ag) = 3310214d715de1ca1366a0272ad64ae6
diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa
index ff4994e6d29..1eaf6cc270a 100644
--- a/x11/gnome-core/patches/patch-aa
+++ b/x11/gnome-core/patches/patch-aa
@@ -1,26 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2000/05/30 19:39:22 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2000/06/21 00:47:45 jlam Exp $
 
---- configure.orig	Tue May 23 07:35:01 2000
-+++ configure	Sat May 27 15:36:54 2000
-@@ -2148,6 +2148,8 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
-+
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -2321,6 +2323,8 @@
- # clobbered by the next message.
- exec 5>>./config.log
- 
-+fi
-+
- missing_dir=`cd $ac_aux_dir && pwd`
- for ac_prog in flex lex
- do
-@@ -6586,6 +6590,9 @@
+--- configure.orig	Tue May 23 01:35:01 2000
++++ configure	Tue Jun 20 20:06:14 2000
+@@ -6586,6 +6586,9 @@
  s%@CATALOGS@%$CATALOGS%g
  s%@CATOBJEXT@%$CATOBJEXT%g
  s%@DATADIRNAME@%$DATADIRNAME%g
diff --git a/x11/gnome-core/patches/patch-af b/x11/gnome-core/patches/patch-af
index be8fd65abda..d3ee8d67264 100644
--- a/x11/gnome-core/patches/patch-af
+++ b/x11/gnome-core/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 1999/07/08 00:24:44 tron Exp $
+$NetBSD: patch-af,v 1.2 2000/06/21 00:47:45 jlam Exp $
 
---- po/Makefile.in.in.orig	Fri Apr  9 18:02:58 1999
-+++ po/Makefile.in.in	Thu Jul  8 02:10:55 1999
+--- po/Makefile.in.in.orig	Tue May 23 01:34:39 2000
++++ po/Makefile.in.in	Tue Jun 20 20:06:53 2000
 @@ -19,7 +19,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  datadir = $(prefix)/@DATADIRNAME@
 -localedir = $(datadir)/locale
-+localedir = $(prefix)/share//locale
++localedir = $(prefix)/share/locale
  gnulocaledir = $(prefix)/share/locale
  gettextsrcdir = $(prefix)/share/gettext/po
  subdir = po
diff --git a/x11/gnome-core/patches/patch-ag b/x11/gnome-core/patches/patch-ag
index 7c0446a0bcb..ee66257225b 100644
--- a/x11/gnome-core/patches/patch-ag
+++ b/x11/gnome-core/patches/patch-ag
@@ -1,14 +1,13 @@
---- help-browser/Makefile.in.orig	Tue May 23 11:25:07 2000
-+++ help-browser/Makefile.in	Tue May 30 21:05:46 2000
-@@ -558,8 +558,9 @@
+$NetBSD: patch-ag,v 1.6 2000/06/21 00:47:45 jlam Exp $
+
+--- help-browser/Makefile.in.orig	Tue May 23 05:25:07 2000
++++ help-browser/Makefile.in	Tue Jun 20 20:07:41 2000
+@@ -558,7 +558,7 @@
  help-caller.o gnome-help-browser.o: help-browser.h
  
  install-exec-local:
 -	$(INSTALL_PROGRAM) $(top_srcdir)/help-browser/gnome-download \
--		$(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/
 +	$(INSTALL_SCRIPT) $(top_srcdir)/help-browser/gnome-download \
-+		$(top_srcdir)/help-browser/gnome-convert \
-+		$(DESTDIR)$(bindir)/
+ 		$(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/gnome-core/pkg/PLIST.NetBSD b/x11/gnome-core/pkg/PLIST.NetBSD
index 1aea38ef46c..f19bbc1571e 100644
--- a/x11/gnome-core/pkg/PLIST.NetBSD
+++ b/x11/gnome-core/pkg/PLIST.NetBSD
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.4 2000/05/31 21:32:18 tron Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.5 2000/06/21 00:47:46 jlam Exp $
 bin/cpumemusage_applet
 bin/deskguide_applet
 bin/diskusage_applet
@@ -42,12 +42,16 @@ include/status-docklet.h
 lib/appletsConf.sh
 lib/dockletsConf.sh
 lib/libfish_applet.a
+lib/libfish_applet.la
 lib/libfish_applet.so.0.0
 lib/libgen_util_applet.a
+lib/libgen_util_applet.la
 lib/libgen_util_applet.so.0.0
 lib/libpanel_applet.a
+lib/libpanel_applet.la
 lib/libpanel_applet.so.0.1
 lib/libpanel_status.a
+lib/libpanel_status.la
 lib/libpanel_status.so.0.0
 man/man1/gnome-session.1
 man/man1/gnome-wm.1
diff --git a/x11/gnome-core/pkg/PLIST.SunOS b/x11/gnome-core/pkg/PLIST.SunOS
index 90cbadbc9f7..d38216706c3 100644
--- a/x11/gnome-core/pkg/PLIST.SunOS
+++ b/x11/gnome-core/pkg/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2000/02/15 10:29:36 agc Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2000/06/21 00:47:46 jlam Exp $
 bin/another_clock_applet
 bin/asclock_applet
 bin/battery_applet
@@ -61,10 +61,13 @@ include/applet-widget.h
 include/gnome-panel.h
 lib/appletsConf.sh
 lib/libfish_applet.a
+lib/libfish_applet.la
 lib/libfish_applet.so.0.0
 lib/libgkb_applet.a
+lib/libgkb_applet.la
 lib/libgkb_applet.so.0.0
 lib/libpanel_applet.a
+lib/libpanel_applet.la
 lib/libpanel_applet.so.0.0
 share/applets/Amusements/.directory
 share/applets/Amusements/fifteen_applet.desktop