Do not install the GTK2 pixbuf loader from this package. This makes this

package pkgviews friendly WRT module handling.  While here, split common
parts of Makefile into Makefile.common, in preparation for the shortcoming
swfdec-gtk2 package.  Bump PKGREVISION to 7.

8 files changed, 51 insertions, 48 deletions

diff --git a/graphics/swfdec/DESCR b/graphics/swfdec/DESCR
index 025a9970f7e..4de8cfb4674 100644
--- a/graphics/swfdec/DESCR
+++ b/graphics/swfdec/DESCR
@@ -1,7 +1,7 @@
-  Swfdec is a library for rendering Flash(R) animations and games.  It was
+Swfdec is a library for rendering Flash(R) animations and games.  It was
 originally designed as a basis library for creating Flash plugins for
 GStreamer, but it is a fully standalone library which only use the libart
 library for drawing.  Swfdec is released under the LGPL.
 
-  Included with swfdec is Gtk+-based application called swf_play to display
-SWF animations.
+This package provides the swfdec library, as well as an standalonw SWF
+player.
diff --git a/graphics/swfdec/MESSAGE b/graphics/swfdec/MESSAGE
index ae65b6dfa63..914486ba438 100644
--- a/graphics/swfdec/MESSAGE
+++ b/graphics/swfdec/MESSAGE
@@ -1,13 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/06/24 12:26:17 cjep Exp $
+$NetBSD: MESSAGE,v 1.3 2004/01/22 12:48:32 jmmv Exp $
 
-This package has installed new gdk-pixbuf loaders.  In order to get them
-working, you should update gdk-pixbuf's configuration file.  This can be
-usually done issuing the following command:
-
-    ${PREFIX}/bin/gdk-pixbuf-query-loaders > \
-	${PKG_SYSCONFDIR.gtk2}/gdk-pixbuf.loaders
-
-Note that this will discard your personal changes to that file.
+You should install the swfdec-gtk2 package, which provides an SWF
+gdk-pixbuf loader for the GTK2 toolkit.
 
 ===========================================================================
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 6bb99709171..a35d64d3bc8 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,32 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 12:48:32 jmmv Exp $
 #
 
-DISTNAME=		swfdec-0.2.1
-PKGREVISION=		6
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
+.include "Makefile.common"
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://swfdec.sourceforge.net/
-COMMENT=		Library for rendering Flash(R) animations and games
+PKGREVISION=		7
 
-GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE=	${WRKSRC}/swfdec.pc.in
-
-.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
-MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASEDIR}/gtk-2.0"
-.else
-MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
-.endif
-
-pre-install:
-	echo "install:" >${WRKSRC}/plugin/Makefile
+CONFIGURE_ARGS+=	--disable-pixbuf-loader
 
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
diff --git a/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common
new file mode 100644
index 00000000000..463a99d65a2
--- /dev/null
+++ b/graphics/swfdec/Makefile.common
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.common,v 1.1 2004/01/22 12:48:32 jmmv Exp $
+#
+
+DISTNAME=		swfdec-0.2.1
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
+
+MAINTAINER=		jmmv@NetBSD.org
+HOMEPAGE=		http://swfdec.sourceforge.net/
+COMMENT=		Library for rendering Flash(R) animations and games
+
+DISTINFO_FILE=		${.CURDIR}/../../graphics/swfdec/distinfo
+PATCHDIR=		${.CURDIR}/../../graphics/swfdec/patches
+
+GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/swfdec.pc.in
+
+pre-install:
+	echo "install:" >${WRKSRC}/plugin/Makefile
diff --git a/graphics/swfdec/PLIST b/graphics/swfdec/PLIST
index 19564c7c1a3..a9fd44cd801 100644
--- a/graphics/swfdec/PLIST
+++ b/graphics/swfdec/PLIST
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/01 12:36:15 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/22 12:48:32 jmmv Exp $
 bin/swf_play
 include/swfdec/swf.h
 include/swfdec/swfdec.h
-lib/gtk-2.0/2.2.0/loaders/swf_loader.a
-lib/gtk-2.0/2.2.0/loaders/swf_loader.la
-lib/gtk-2.0/2.2.0/loaders/swf_loader.so
 lib/libswfdec.a
 lib/libswfdec.la
 lib/libswfdec.so
diff --git a/graphics/swfdec/buildlink2.mk b/graphics/swfdec/buildlink2.mk
index 107fb85ec01..6aad657da97 100644
--- a/graphics/swfdec/buildlink2.mk
+++ b/graphics/swfdec/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/01/22 12:48:32 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use swfdec.
 #
@@ -9,13 +9,12 @@
 SWFDEC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			swfdec
-BUILDLINK_DEPENDS.swfdec?=		swfdec>=0.2.1nb6
+BUILDLINK_DEPENDS.swfdec?=		swfdec>=0.2.1nb7
 BUILDLINK_PKGSRCDIR.swfdec?=		../../graphics/swfdec
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.swfdec=swfdec
 BUILDLINK_PREFIX.swfdec_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.swfdec+=	include/swfdec/*.h
-BUILDLINK_FILES.swfdec+=	lib/gtk-2.0/2.2.0/loaders/swf_loader.*
 BUILDLINK_FILES.swfdec+=	lib/libswfdec.*
 BUILDLINK_FILES.swfdec+=	lib/pkgconfig/swfdec.pc
 
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
index 481bec218c9..7893c09f9b8 100644
--- a/graphics/swfdec/distinfo
+++ b/graphics/swfdec/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/05/12 20:17:47 jmc Exp $
+$NetBSD: distinfo,v 1.5 2004/01/22 12:48:32 jmmv Exp $
 
 SHA1 (swfdec-0.2.1.tar.gz) = e2c3b2257fefab0d4c45be24f351340735cc0674
 Size (swfdec-0.2.1.tar.gz) = 325500 bytes
 SHA1 (patch-aa) = ae2cd8ffb34d09c709378cc3b45510cb5d738305
 SHA1 (patch-ab) = 2a2a6b335ddb0ebce2aee38eb004d4b6e26f19b7
-SHA1 (patch-ac) = 13d5317380add698baa4e14a0187622325cd3a6a
+SHA1 (patch-ac) = 96a9a5275e297088f326b729fde3feef79b323aa
diff --git a/graphics/swfdec/patches/patch-ac b/graphics/swfdec/patches/patch-ac
index a2e4b2741ab..5925c37c250 100644
--- a/graphics/swfdec/patches/patch-ac
+++ b/graphics/swfdec/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2003/05/01 12:36:15 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2004/01/22 12:48:32 jmmv Exp $
 
---- pixbuf-loader/Makefile.in.orig	2003-05-01 14:18:55.000000000 +0200
+--- pixbuf-loader/Makefile.in.orig	2003-02-05 21:37:46.000000000 +0100
 +++ pixbuf-loader/Makefile.in
+@@ -102,7 +102,7 @@ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_LIBS = @SDL_LIBS@
+ STRIP = @STRIP@
+ SWF_CFLAGS = @SWF_CFLAGS@
+-SWF_LIBS = @SWF_LIBS@
++SWF_LIBS = `pkg-config --libs swfdec glib-2.0` -lz
+ VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 @@ -391,10 +391,6 @@ uninstall-am: uninstall-info-am uninstal