Make this package install its configuration files under the examples tree

and use bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR.
Bump PKGREVISION to 2.

5 files changed, 77 insertions, 10 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 7a79bc30edf..be512907179 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2002/12/24 21:00:10 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/04 17:29:04 jmmv Exp $
 #
 
 DISTNAME=		gtk+-2.2.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
@@ -22,6 +22,7 @@ USE_GMAKE=		yes
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFBASE}"
 CONFIGURE_ENV+=		ac_cv_header_X11_extensions_Xinerama_h=no
 CONFIGURE_ENV+=		ac_cv_lib_Xinerama_XineramaQueryExtension=no
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
@@ -36,6 +37,12 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/demos/gtk-demo
 
+PKG_SYSCONFSUBDIR=	gtk-2.0
+EGDIR=			${PREFIX}/share/examples/gtk2
+CONF_FILES=		${EGDIR}/gdk-pixbuf.loaders \
+			${PKG_SYSCONFDIR}/gdk-pixbuf.loaders
+CONF_FILES+=		${EGDIR}/gtk.immodules ${PKG_SYSCONFDIR}/gtk.immodules
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
 
@@ -49,4 +56,5 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 5012d9d3110..84db443338b 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.13 2002/12/24 04:07:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2003/01/04 17:29:04 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
-etc/gtk-2.0/gdk-pixbuf.loaders
-etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -287,6 +285,8 @@ lib/pkgconfig/gtk+-2.0.pc
 lib/pkgconfig/gtk+-x11-2.0.pc
 man/man1/gdk-pixbuf-csource.1
 share/aclocal/gtk-2.0.m4
+share/examples/gtk2/gdk-pixbuf.loaders
+share/examples/gtk2/gtk.immodules
 share/gtk-2.0/demo/alphatest.png
 share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
@@ -772,6 +772,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm share/gtk-2.0
 @unexec ${RMDIR} %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
 @exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || ${TRUE}
+@dirrm share/examples/gtk2
 @dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0/include
 @dirrm lib/gtk-2.0/2.2.0/loaders
@@ -783,4 +784,3 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
-@dirrm etc/gtk-2.0
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index a1863a889a6..6e79cd5abfe 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/12/24 04:07:32 wiz Exp $
+$NetBSD: distinfo,v 1.14 2003/01/04 17:29:04 jmmv Exp $
 
 SHA1 (gtk+-2.2.0.tar.bz2) = b89f54142ef97a4f6fbd85ae19824b41574788f3
 Size (gtk+-2.2.0.tar.bz2) = 6448407 bytes
@@ -7,6 +7,7 @@ SHA1 (patch-ab) = 1734c8ff78460891a2c0bda4ddf0d798c99a31d3
 SHA1 (patch-ac) = 68b0d7da55de5209bed53f3daea1881a634a216f
 SHA1 (patch-ad) = f514ec4f261a148bde25a9618694df71d7586f6a
 SHA1 (patch-ae) = a678a466ccf60adb284f017b08bd1d59388c9669
+SHA1 (patch-af) = e1773a59cf269bf14e4d35759033f27faa6060aa
 SHA1 (patch-ag) = d01d38f2920730e0516edcb447be37960c122aca
-SHA1 (patch-ah) = 47ca3efbf8d2541dd87bfb9845a35f2c5cbf1061
+SHA1 (patch-ah) = 7be5f8c19031f894907d6fe0ec48f36816730af8
 SHA1 (patch-aq) = 815a362bdc60f2b645b7b5e9381a1925d1a6df8e
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
new file mode 100644
index 00000000000..00012e91a6d
--- /dev/null
+++ b/x11/gtk2/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.8 2003/01/04 17:29:05 jmmv Exp $
+
+--- modules/input/Makefile.in.orig	Sat Dec 21 02:35:03 2002
++++ modules/input/Makefile.in
+@@ -23,7 +23,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/gtk2
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -801,10 +801,10 @@ maintainer-clean-generic clean mostlycle
+ # not work at all, so skip it.
+ install-data-local:
+ 	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
+-	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
+-	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
++	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
++	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules" ; \
++	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules ; \
+ 	else \
+ 	  echo "***" ; \
+ 	  echo "*** Warning: gtk.immodules not built" ; \
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index 6619bc00a50..436b96fbab4 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,8 +1,27 @@
-$NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz Exp $
+$NetBSD: patch-ah,v 1.5 2003/01/04 17:29:05 jmmv Exp $
 
 --- gdk-pixbuf/Makefile.in.orig	Sat Dec 21 02:34:56 2002
 +++ gdk-pixbuf/Makefile.in
-@@ -383,7 +383,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
+@@ -23,7 +23,8 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/gtk2
++realsysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -370,7 +371,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
+ 	-I$(top_srcdir) -I$(top_builddir) 	\
+ 	-I$(top_srcdir)/gdk-pixbuf 		\
+ 	-I$(top_builddir)/gdk-pixbuf 		\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
++	-DGTK_SYSCONFDIR=\"$(realsysconfdir)\"	\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"		\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
+ 	-DG_DISABLE_DEPRECATED			\
+@@ -383,7 +384,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
  
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
@@ -11,3 +30,14 @@ $NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz Exp $
  
  noinst_PROGRAMS = test-gdk-pixbuf
  test_gdk_pixbuf_LDADD = $(LDADDS)
+@@ -1338,8 +1339,8 @@ $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD
+ # not work at all, so skip it
+ install-data-local: install-ms-lib install-libtool-import-lib
+ 	@if $(RUN_QUERY_LOADER_TEST) ; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
++	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders ; \
+ 	else \
+ 	  echo "***" ; \
+ 	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \