USE_LIBTOOL instead of PKGLIBTOOL. While here, rearrange stuff a bit to

make editing easier.

5 files changed, 27 insertions, 56 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 77d8250ed99..a5f02fa791e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2000/06/01 11:23:44 rh Exp $
+# $NetBSD: Makefile,v 1.45 2000/06/20 23:20:11 jlam Exp $
 
 DISTNAME=		gnome-libs-1.2.1
 CATEGORIES=		x11 gnome
@@ -13,17 +13,21 @@ DEPENDS+=		gtk+>=1.2.7:../gtk
 DEPENDS+=		imlib-*:../../graphics/imlib
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
-LDFLAGS+=       	"-L${LOCALBASE}/lib"
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
 
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=       	-L${LOCALBASE}/lib
+
 LOCALSTATEDIR=		/var/gnome
 PLIST_SRC=		${WRKDIR}/PLIST
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
@@ -33,8 +37,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
 
 .if ${OPSYS} == "SunOS"
 DEPENDS+=		db-*:../../databases/db
-
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db2"
+CPPFLAGS+=		-I${LOCALBASE}/include/db2
 
 pre-configure:
 	${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \
@@ -48,15 +51,15 @@ post-patch:
 		${WRKSRC}/gnome-config.in-pre-lpath >${WRKSRC}/gnome-config.in
 
 pre-build:
-	(cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h)
+	cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h
 
 post-install:
 	${MKDIR} ${LOCALSTATEDIR}
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	cd ${PREFIX}; ${FIND} lib -name 'libgnome.so.*' >>${PLIST_SRC}
+	cd ${PREFIX}; ${FIND} lib -name 'libgnome.so.*.*' >>${PLIST_SRC}
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
-	  ${LOCALBASE}/share/aclocal/libart.m4
+		${LOCALBASE}/share/aclocal/libart.m4
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 29c1efe7fc6..8f43f33e196 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,13 +1,12 @@
-$NetBSD: patch-sum,v 1.14 2000/06/02 12:10:07 drochner Exp $
+$NetBSD: patch-sum,v 1.15 2000/06/20 23:20:12 jlam Exp $
 
-MD5 (patch-aa) = 3fe8121a6a1a494658e5eb7466266a4e
+MD5 (patch-aa) = 6977c0ce021e60d9e314bb5b596f45af
 MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
 MD5 (patch-ac) = 2234ccfc4f168c91bb2fc8686ed0590c
 MD5 (patch-ad) = c39cc321a208c5bf22aa8d07af9dd1a4
 MD5 (patch-ae) = 1c36b5b59dd826c0d015d7d5d110ae44
 MD5 (patch-af) = f14189c93bd7152e87cd5520823fc0d5
 MD5 (patch-ag) = 44c356ffb86853b201740f377091e89b
-MD5 (patch-ah) = cc281f4fffa1c5e7e3565a86c256f08b
 MD5 (patch-ai) = baca2d5270e60252cf5e9406bd52064d
 MD5 (patch-aj) = 24907d9f09e4eb1694006418a7e6164f
 MD5 (patch-ak) = aef962961191617c236950a2e60a289b
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 5e462f8b28c..27083739a50 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,25 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2000/05/30 19:23:48 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2000/06/20 23:20:12 jlam Exp $
 
 --- configure.orig	Sat May 20 20:55:16 2000
 +++ configure	Fri May 26 23:39:02 2000
-@@ -2000,7 +2000,7 @@
- fi
- rm -f confcache
- 
--
-+if false; then
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-@@ -2029,7 +2029,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
--
-+fi
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
- echo "configure:2036: checking whether to enable maintainer-specific portions of Makefiles" >&5
 @@ -5304,7 +5304,7 @@
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
diff --git a/x11/gnome-libs/patches/patch-ah b/x11/gnome-libs/patches/patch-ah
deleted file mode 100644
index 5a757c8b93c..00000000000
--- a/x11/gnome-libs/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2000/05/30 19:23:48 drochner Exp $
-
---- libart_lgpl/configure.orig	Sat May 20 20:55:17 2000
-+++ libart_lgpl/configure	Sat May 27 10:57:15 2000
-@@ -1437,6 +1437,8 @@
- test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
- test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
- 
-+if false; then
-+
- # Some flags need to be propagated to the compiler or linker for good
- # libtool support.
- case "$lt_target" in
-@@ -1577,6 +1579,7 @@
- # clobbered by the next message.
- exec 5>>./config.log
- 
-+fi
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
- echo "configure:1583: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 9a35dad5889..4ed5cb7ab7e 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2000/05/31 21:31:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.25 2000/06/20 23:20:13 jlam Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -176,19 +176,27 @@ lib/gnome-libs/include/gnomesupport.h
 lib/gnomeConf.sh
 lib/libartConf.sh
 lib/libart_lgpl.a
+lib/libart_lgpl.la
 lib/libart_lgpl.so.4.0
 lib/libgnome.a
+lib/libgnome.la
 lib/libgnomesupport.a
+lib/libgnomesupport.la
 lib/libgnomesupport.so.0.0
 lib/libgnomeui.a
+lib/libgnomeui.la
 lib/libgnomeui.so.43.2
 lib/libgnorba.a
+lib/libgnorba.la
 lib/libgnorba.so.28.8
 lib/libgnorbagtk.a
+lib/libgnorbagtk.la
 lib/libgnorbagtk.so.0.0
 lib/libgtkxmhtml.a
+lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so.1.1
 lib/libzvt.a
+lib/libzvt.la
 lib/libzvt.so.4.7
 man/man1/gnome-config.1
 man/man1/gnome.1