Make this package install its configuration files under the examples tree

and let bsd.pkg.install.mk copy them to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.

Reviewed by wiz.

7 files changed, 88 insertions, 6 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 3bc5db7021f..929773071e1 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/12/19 13:14:37 grant Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/22 18:06:21 jmmv Exp $
 #
 
 DISTNAME=		pango-1.0.5
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
@@ -24,6 +25,13 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangox.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangowin32.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pangoxft.pc.in
 
+PKG_SYSCONFSUBDIR=	pango
+EGDIR=			${PREFIX}/share/examples/pango
+CONF_FILES=		${EGDIR}/pango.modules ${PKG_SYSCONFDIR}/pango.modules
+CONF_FILES+=		${EGDIR}/pangox.aliases ${PKG_SYSCONFDIR}/pangox.aliases
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 # directory appeared in XFree86 4.*
@@ -43,4 +51,5 @@ test: build
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 81a37e0d4bf..c7218fd3171 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2002/12/09 16:01:19 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/12/22 18:06:21 jmmv Exp $
 bin/pango-querymodules
-etc/pango/pango.modules
-etc/pango/pangox.aliases
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
@@ -83,6 +81,8 @@ lib/pango/1.0.0/modules/pango-thai-x.so
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
+share/examples/pango/pango.modules
+share/examples/pango/pangox.aliases
 share/gtk-doc/html/pango/index.html
 share/gtk-doc/html/pango/index.sgml
 share/gtk-doc/html/pango/layout.gif
@@ -109,9 +109,9 @@ share/gtk-doc/html/pango/rendering.html
 @dirrm share/gtk-doc/html/pango
 @unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}
+@dirrm share/examples/pango
 @dirrm lib/pango/1.0.0/modules
 @dirrm lib/pango/1.0.0
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
-@dirrm etc/pango
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 022c83d860a..84fb7c6dd57 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.9 2002/10/30 03:09:31 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/12/22 18:06:21 jmmv Exp $
 
 SHA1 (pango-1.0.5.tar.gz) = cf33b4a956d0de77956aa09b9004b530e4d6df54
 Size (pango-1.0.5.tar.gz) = 1203673 bytes
+SHA1 (patch-aa) = e2bb58559359e785ea7113b4883617a7ac020f9f
+SHA1 (patch-ab) = d8e8e4161b06c431bd9f93b449e375ee5e89e56e
+SHA1 (patch-ac) = d6043c232e34d13a0bb5be42a6936da0088273fb
+SHA1 (patch-ad) = bdfcb429ecb194bcd8595ce09b051c73a9202e40
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
new file mode 100644
index 00000000000..59555ce4c51
--- /dev/null
+++ b/devel/pango/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2002/12/22 18:06:21 jmmv Exp $
+
+--- examples/Makefile.in.orig	Sun Oct 13 18:50:53 2002
++++ examples/Makefile.in
+@@ -116,7 +116,7 @@ XFT_LIBS = @XFT_LIBS@
+ YACC = @YACC@
+ ms_librarian = @ms_librarian@
+ 
+-aliasdir = $(sysconfdir)/pango
++aliasdir = $(datadir)/examples/@PACKAGE@
+ 
+ INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FREETYPE_CFLAGS)
+ 
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
new file mode 100644
index 00000000000..f033052406e
--- /dev/null
+++ b/devel/pango/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.6 2002/12/22 18:06:22 jmmv Exp $
+
+--- modules/Makefile.in.orig	Sun Dec 22 11:55:17 2002
++++ modules/Makefile.in
+@@ -23,7 +23,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/@PACKAGE@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -337,12 +337,12 @@ maintainer-clean-generic clean mostlycle
+ 
+ install-data-local:
+ 	@if $(RUN_QUERY_IMMODULES_TEST) ; then 				\
+-	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& 	\
++	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\&	 	\
+ 	  $(top_builddir)/pango/pango-querymodules 			\
+-		\> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;	\
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && 		\
++		\> $(DESTDIR)$(sysconfdir)/pango.modules ;		\
++	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir) &&	 		\
+ 	  $(top_builddir)/pango/pango-querymodules 			\
+-		> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;		\
++		> $(DESTDIR)$(sysconfdir)/pango.modules ;		\
+ 	else								\
+ 	  echo "***" ; 							\
+ 	  echo "*** Warning: pango.modules not created" ; 		\
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
new file mode 100644
index 00000000000..5cae9ebeb63
--- /dev/null
+++ b/devel/pango/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2002/12/22 18:06:22 jmmv Exp $
+
+--- pango/pango-utils.c.orig	Wed Oct  2 01:47:51 2002
++++ pango/pango-utils.c
+@@ -666,7 +666,7 @@ pango_get_sysconf_subdirectory (void)
+ 
+   return result;
+ #else
+-  return SYSCONFDIR "/pango";
++  return SYSCONFDIR;
+ #endif
+ }
+ 
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
new file mode 100644
index 00000000000..4aa4f9ce673
--- /dev/null
+++ b/devel/pango/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2002/12/22 18:06:22 jmmv Exp $
+
+--- pango/pangox-fontmap.c.orig	Mon Mar 25 21:22:52 2002
++++ pango/pangox-fontmap.c
+@@ -874,7 +874,7 @@ pango_x_font_map_read_aliases (PangoXFon
+   int n;
+ 
+   if (!files_str)
+-    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
++    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases");
+ 
+   files = pango_split_file_list (files_str);
+