Avoid this package modifying a personal configuration file in PKG_SYSCONFDIR

(which is wrong anyway if you don't use the default).  For now, request the
admin to do the change manually.  Bump PKGREVISION to 1.

5 files changed, 40 insertions, 5 deletions

diff --git a/graphics/swfdec/MESSAGE b/graphics/swfdec/MESSAGE
new file mode 100644
index 00000000000..f4deea90441
--- /dev/null
+++ b/graphics/swfdec/MESSAGE
@@ -0,0 +1,12 @@
+==========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/05/01 12:36:14 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.
+
+==========================================================================
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index f2c1a28723c..defe5602791 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/01 12:36:15 jmmv Exp $
 #
 
 DISTNAME=		swfdec-0.2.1
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
 
@@ -11,11 +12,18 @@ COMMENT=		library for rendering Flash(R) animations and games
 
 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
+PKGCONFIG_OVERRIDE=	${WRKSRC}/swfdec.pc.in
+
+.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
+MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASE}/gtk-2.0"
+.else
+MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
+.endif
 
 pre-install:
 	echo "install:" >${WRKSRC}/plugin/Makefile
diff --git a/graphics/swfdec/PLIST b/graphics/swfdec/PLIST
index 818f1698c81..19564c7c1a3 100644
--- a/graphics/swfdec/PLIST
+++ b/graphics/swfdec/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/01 12:36:15 jmmv Exp $
 bin/swf_play
-etc/gtk-2.0/gdk-pixbuf.loaders
 include/swfdec/swf.h
 include/swfdec/swfdec.h
 lib/gtk-2.0/2.2.0/loaders/swf_loader.a
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
index fa7e54d9840..a411c84b3db 100644
--- a/graphics/swfdec/distinfo
+++ b/graphics/swfdec/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/05/01 12:36:15 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) = 0df07eb8e0de223d783705f5f596c5a28cd2d680
+SHA1 (patch-ac) = 13d5317380add698baa4e14a0187622325cd3a6a
diff --git a/graphics/swfdec/patches/patch-ac b/graphics/swfdec/patches/patch-ac
new file mode 100644
index 00000000000..a2e4b2741ab
--- /dev/null
+++ b/graphics/swfdec/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2003/05/01 12:36:15 jmmv Exp $
+
+--- pixbuf-loader/Makefile.in.orig	2003-05-01 14:18:55.000000000 +0200
++++ pixbuf-loader/Makefile.in
+@@ -391,10 +391,6 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ 
+ install-data-local: 
+-	if [ -z "$(DESTDIR)" ] ; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+-	fi
+ # 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.
+ .NOEXPORT: