Build the loader modules with `-avoid-version', and update the PLIST

accordingly.

5 files changed, 116 insertions, 39 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index ee34ca4f0a8..4008927ac32 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/10/17 23:59:59 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/11/26 19:55:39 mycroft Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.9.0
@@ -8,11 +8,12 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		automake:../../devel/automake
 DEPENDS+=		gnome-libs>=1.0.53:../../x11/gnome-libs
 
-USE_X11BASE=		# defined
 USE_GMAKE=		# defined
-
+USE_X11BASE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -22,13 +23,12 @@ CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 .include "../../mk/bsd.prefs.mk"
-.if (${OBJECT_FMT} == "ELF")
-PLIST_SRC=		${PKGDIR}/PLIST.elf
-.endif
-PLIST_SRC+=		${PKGDIR}/PLIST.mi
 
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} automake
+
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
diff --git a/graphics/gdk-pixbuf/files/patch-sum b/graphics/gdk-pixbuf/files/patch-sum
index ecd89ab4ddc..e37008da578 100644
--- a/graphics/gdk-pixbuf/files/patch-sum
+++ b/graphics/gdk-pixbuf/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/10/17 23:59:59 jlam Exp $
+$NetBSD: patch-sum,v 1.6 2000/11/26 19:55:40 mycroft Exp $
 
 MD5 (patch-ac) = 45c4ab8ac8aa72de4971b689e38017c5
+MD5 (patch-ad) = 8fea0d2fa7eb54517b42ddaab8248c8a
diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad
new file mode 100644
index 00000000000..bba43d51099
--- /dev/null
+++ b/graphics/gdk-pixbuf/patches/patch-ad
@@ -0,0 +1,77 @@
+$NetBSD: patch-ad,v 1.1 2000/11/26 19:55:40 mycroft Exp $
+
+--- gdk-pixbuf/Makefile.am.orig	Sat Aug 26 04:54:42 2000
++++ gdk-pixbuf/Makefile.am	Sun Nov 26 19:24:09 2000
+@@ -24,63 +24,63 @@
+ # The PNG plugin.
+ #
+ libpixbufloader_png_la_SOURCES = io-png.c
+-libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_png_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_png_la_LIBADD = $(LIBPNG)
+ 
+ #
+ # The JPEG loader
+ #
+ libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
+-libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
+ 
+ #
+ # The XPM loader
+ #
+ libpixbufloader_xpm_la_SOURCES = io-xpm.c
+-libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_xpm_la_LIBADD =
+ 
+ #
+ # The GIF loader
+ #
+ libpixbufloader_gif_la_SOURCES = io-gif.c
+-libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_gif_la_LIBADD =
+ 
+ #
+ # The ICO loader
+ #
+ libpixbufloader_ico_la_SOURCES = io-ico.c
+-libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_ico_la_LIBADD =
+ 
+ #
+ # The RAS loader
+ #
+ libpixbufloader_ras_la_SOURCES = io-ras.c
+-libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_ras_la_LIBADD =
+ 
+ #
+ # The TIFF loader
+ #
+ libpixbufloader_tiff_la_SOURCES = io-tiff.c
+-libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
+ 
+ #
+ # The PNM loader
+ #
+ libpixbufloader_pnm_la_SOURCES = io-pnm.c
+-libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_pnm_la_LIBADD =
+ 
+ #
+ # The BMP loader
+ #
+ libpixbufloader_bmp_la_SOURCES = io-bmp.c
+-libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_bmp_la_LIBADD =
+ 
+ if HAVE_PNG
diff --git a/graphics/gdk-pixbuf/pkg/PLIST.mi b/graphics/gdk-pixbuf/pkg/PLIST
index 3417f5de9ec..ccf5f630083 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST.mi
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.mi,v 1.2 2000/10/18 00:00:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/11/26 19:55:40 mycroft Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -6,6 +6,33 @@ include/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf/gdk-pixbuf.h
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.a
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.la
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.a
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.a
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.la
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
+lib/gdk-pixbuf/loaders/libpixbufloader-png.a
+lib/gdk-pixbuf/loaders/libpixbufloader-png.la
+lib/gdk-pixbuf/loaders/libpixbufloader-png.so
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.a
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.a
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.a
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.la
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
 lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
 lib/gnomecanvaspixbufConf.sh
@@ -62,6 +89,8 @@ share/gnome/html/gdk-pixbuf/x3735.html
 share/gnome/html/gdk-pixbuf/x3765.html
 share/gnome/html/gdk-pixbuf/x3787.html
 @dirrm share/gnome/html/gdk-pixbuf
+@dirrm lib/gdk-pixbuf/loaders
+@dirrm lib/gdk-pixbuf
 @dirrm include/gdk-pixbuf
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gdk-pixbuf.m4 ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
 @unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
diff --git a/graphics/gdk-pixbuf/pkg/PLIST.elf b/graphics/gdk-pixbuf/pkg/PLIST.elf
deleted file mode 100644
index 0050301fa30..00000000000
--- a/graphics/gdk-pixbuf/pkg/PLIST.elf
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST.elf,v 1.2 2000/10/18 00:00:00 jlam Exp $
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.a
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.la
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.a
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.la
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.a
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.la
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-png.a
-lib/gdk-pixbuf/loaders/libpixbufloader-png.la
-lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.a
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.la
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.a
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.la
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.a
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.la
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1.0
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1.0
-@dirrm lib/gdk-pixbuf/loaders
-@dirrm lib/gdk-pixbuf