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 3.

4 files changed, 28 insertions, 11 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 916c26bfb2c..11dbdde8dfe 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/01/04 20:43:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/04 22:07:22 jmmv Exp $
 #
 
 DISTNAME=		bonobo-activation-2.1.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-activation/2.1/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,10 +24,17 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/bonobo-activation-2.0.pc.in
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFBASE}"
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
+PKG_SYSCONFSUBDIR=	bonobo-activation
+EGDIR=			${PREFIX}/share/examples/bonobo-activation
+CONF_FILES=		${EGDIR}/bonobo-activation-config.xml \
+			${PKG_SYSCONFDIR}/bonobo-activation-config.xml
+
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST
index 1bd534ae755..466bdf677f8 100644
--- a/devel/bonobo-activation/PLIST
+++ b/devel/bonobo-activation/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/04 20:43:36 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/04 22:07:23 jmmv Exp $
 bin/activation-client
 bin/bonobo-slay
-etc/bonobo-activation/bonobo-activation-config.xml
 include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
 include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
 include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
@@ -57,6 +56,7 @@ share/doc/html/bonobo-activation/query-syntax.html
 share/doc/html/bonobo-activation/server-arch.html
 share/doc/html/bonobo-activation/server-xml-reference.html
 share/doc/html/bonobo-activation/tutorial.html
+share/examples/bonobo-activation/bonobo-activation-config.xml
 share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
 share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
 share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
@@ -101,9 +101,9 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/bonobo-activation.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
 @dirrm share/idl/bonobo-activation-2.0
+@dirrm share/examples/bonobo-activation
 @dirrm share/doc/html/bonobo-activation
 @dirrm lib/bonobo/servers
 @unexec ${RMDIR} %D/lib/bonobo 2>/dev/null || ${TRUE}
 @dirrm include/bonobo-activation-2.0/bonobo-activation
 @dirrm include/bonobo-activation-2.0
-@dirrm etc/bonobo-activation
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index b49e454db7f..cc351b21694 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/01/04 20:43:36 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2003/01/04 22:07:23 jmmv Exp $
 
 SHA1 (bonobo-activation-2.1.0.tar.bz2) = c4a645573ce234c30c7b1d7d25befe7f94d3c8bc
 Size (bonobo-activation-2.1.0.tar.bz2) = 452883 bytes
-SHA1 (patch-ac) = e13034cc28f8fcf3b27a39db2a6002c8444de0bf
+SHA1 (patch-ac) = a7a29227124a7277625ca3fb7080d9a52acda3c0
 SHA1 (patch-ad) = 25a374f25860e3c857b663db95d32a383d40eae4
diff --git a/devel/bonobo-activation/patches/patch-ac b/devel/bonobo-activation/patches/patch-ac
index ffed7c7f9da..3159790eed2 100644
--- a/devel/bonobo-activation/patches/patch-ac
+++ b/devel/bonobo-activation/patches/patch-ac
@@ -1,11 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2002/10/27 09:31:00 rh Exp $
+$NetBSD: patch-ac,v 1.2 2003/01/04 22:07:23 jmmv Exp $
 
---- Makefile.in.orig	Sat Oct 19 13:06:19 2002
-+++ Makefile.in	Sat Oct 19 13:06:34 2002
-@@ -152,7 +152,6 @@
+--- Makefile.in.orig	Fri Oct 18 13:00:47 2002
++++ Makefile.in
+@@ -152,7 +152,6 @@ SUBDIRS = \
  	bonobo-activation			\
  	server					\
  	utils					\
 -	test					\
  	$(NULL)
  
+ 
+@@ -173,7 +172,7 @@ EXTRA_DIST = \
+ 	$(NULL)
+ 
+ 
+-sysconfigdir = $(sysconfdir)/bonobo-activation
++sysconfigdir = @datadir@/examples/bonobo-activation
+ sysconfig_DATA = \
+ 	bonobo-activation-config.xml		\
+ 	$(NULL)