From 6c0b21a3113aa07d8a37be6426a7a12f105f54bd Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 25 Dec 2002 15:58:20 +0000
Subject: Make this package install its configuration file inside the examples
 tree and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR. Bump
 PKGREVISION to 1.

---
 databases/libgda/Makefile.common  | 10 +++++++++-
 databases/libgda/PLIST            |  6 +++---
 databases/libgda/distinfo         |  4 +++-
 databases/libgda/patches/patch-ab | 13 +++++++++++++
 databases/libgda/patches/patch-ac | 13 +++++++++++++
 5 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 databases/libgda/patches/patch-ab
 create mode 100644 databases/libgda/patches/patch-ac

(limited to 'databases/libgda')

diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 6dad5a83791..e5e2f5224c9 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2002/11/30 16:24:36 salo Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/12/25 15:58:20 jmmv Exp $
 #
 
 DISTNAME?=		libgda-0.8.199
+PKGREVISION?=		1
 CATEGORIES?=		databases gnome
 MASTER_SITES?=		${MASTER_SITE_GNOME:=sources/libgda/0.8/}
 EXTRACT_SUFX?=		.tar.bz2
@@ -18,9 +19,16 @@ GNU_CONFIGURE=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	libgda
+EGDIR=			${PREFIX}/share/examples/libgda
+CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
+
 .include "../../textproc/gtk-doc/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
 .include "../../lang/python22/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index 3dd0897ef7c..0d368d05372 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/30 00:52:10 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/25 15:58:20 jmmv Exp $
 bin/gda-run
 bin/gda-test
-etc/libgda/config
 include/libgda-report/gda-report-document.h
 include/libgda-report/gda-report-types.h
 include/libgda-report/gda-report.h
@@ -71,6 +70,7 @@ lib/libgdasql.so
 lib/libgdasql.so.0
 lib/libgdasql.so.0.0
 lib/pkgconfig/libgda.pc
+share/examples/libgda/config
 share/gtk-doc/html/libgda/architecture.html
 share/gtk-doc/html/libgda/c680.html
 share/gtk-doc/html/libgda/c685.html
@@ -205,10 +205,10 @@ share/omf/libgda/libgda-C.omf
 @dirrm share/libgda
 @dirrm share/idl/libgda
 @dirrm share/gtk-doc/html/libgda
+@dirrm share/examples/libgda
 @dirrm lib/libgda/providers
 @dirrm lib/libgda
 @exec ${MKDIR} %D/include/libgda/sql
 @dirrm include/libgda/sql
 @dirrm include/libgda-report
 @dirrm include/libgda
-@dirrm etc/libgda
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index defbd692d88..2413fb8d97c 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/10/30 03:11:19 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/12/25 15:58:20 jmmv Exp $
 
 SHA1 (libgda-0.8.199.tar.bz2) = a1a41659d117ca5f1686a0deeee097b92441b756
 Size (libgda-0.8.199.tar.bz2) = 674693 bytes
 SHA1 (patch-aa) = 15f5be86f2fb44aaf6266551a50d7d43fd84af1b
+SHA1 (patch-ab) = 06f205d56743720583fa5e950e71e12ab6a1f914
+SHA1 (patch-ac) = 6a6373363167e33a24772d6b03753b9fb785c56b
diff --git a/databases/libgda/patches/patch-ab b/databases/libgda/patches/patch-ab
new file mode 100644
index 00000000000..f6f9c39060f
--- /dev/null
+++ b/databases/libgda/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2002/12/25 15:58:21 jmmv Exp $
+
+--- data/Makefile.in.orig	Wed Oct 23 23:33:13 2002
++++ data/Makefile.in
+@@ -161,7 +161,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
+ YACC = @YACC@
+ cxxflags_set = @cxxflags_set@
+ 
+-configdir = $(sysconfdir)/libgda
++configdir = $(datadir)/examples/@PACKAGE@
+ config_DATA = config
+ 
+ EXTRA_DIST =  	$(config_DATA) 	gda-xml-query.dtd 	gda-xml-query.xsl
diff --git a/databases/libgda/patches/patch-ac b/databases/libgda/patches/patch-ac
new file mode 100644
index 00000000000..6dc55dc578c
--- /dev/null
+++ b/databases/libgda/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/12/25 15:58:21 jmmv Exp $
+
+--- libgda/Makefile.in.orig	Wed Dec 25 16:30:35 2002
++++ libgda/Makefile.in
+@@ -161,7 +161,7 @@ cxxflags_set = @cxxflags_set@
+ 
+ lib_LTLIBRARIES = libgda-2.la
+ 
+-INCLUDES =  	$(LIBGDA_CFLAGS) 	-I$(top_srcdir) 	-I$(top_builddir) 	-DLIBGDA_PLUGINDIR=\""$(prefix)/lib/libgda/providers"\" 	-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" 	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
++INCLUDES =  	$(LIBGDA_CFLAGS) 	-I$(top_srcdir) 	-I$(top_builddir) 	-DLIBGDA_PLUGINDIR=\""$(prefix)/lib/libgda/providers"\" 	-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" 	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/config"\"
+ 
+ 
+ gda_marshal_built_files = gda-marshal.h gda-marshal.c
-- 
cgit v1.2.3