From cfac08870a10f5a16c84fecb8cbbb002a2a41b16 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Tue, 26 Nov 2002 15:07:31 +0000
Subject: Make this package install its configuration file in the examples
 directory and use PKG_SYSCONFDIR stuff to copy it to the right place. Bump
 PKGREVISION to 1.

Approved by wiz.
---
 www/dillo/Makefile         |  9 ++++++++-
 www/dillo/PLIST            |  5 +++--
 www/dillo/distinfo         |  5 +++--
 www/dillo/patches/patch-ab | 22 ++++++++++++++++------
 www/dillo/patches/patch-ac | 14 ++++++++++++++
 5 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 www/dillo/patches/patch-ac

(limited to 'www')

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 1e0e5568931..bb96f3720a4 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/08/25 21:52:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/11/26 15:07:31 jmmv Exp $
 #
 
 DISTNAME=	dillo-0.6.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dillo.cipsga.org.br/download/
 
@@ -14,6 +15,11 @@ USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+EGDIR=		${PREFIX}/share/examples/dillo
+CONF_FILES=	${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
+
+CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dillo
@@ -22,4 +28,5 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index edcc5a62ef5..2459b66d453 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/29 11:57:03 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/26 15:07:31 jmmv Exp $
 bin/dillo
-etc/dillorc
 share/doc/dillo/Cache.txt
 share/doc/dillo/Cookies.txt
 share/doc/dillo/Dillo.txt
@@ -18,4 +17,6 @@ share/doc/dillo/Makefile.am
 share/doc/dillo/Makefile.in
 share/doc/dillo/NC_design.txt
 share/doc/dillo/README
+share/examples/dillo/dillorc
 @dirrm share/doc/dillo
+@dirrm share/examples/dillo
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 8b7072b2fc0..1885bc9f7c7 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2002/08/25 21:52:08 jlam Exp $
+$NetBSD: distinfo,v 1.11 2002/11/26 15:07:31 jmmv Exp $
 
 SHA1 (dillo-0.6.6.tar.gz) = 6ff27fe122f53f2e554a5377b67258d2df7ec381
 Size (dillo-0.6.6.tar.gz) = 310331 bytes
 SHA1 (patch-aa) = 1ae5a680306102d03d587acfbbf16cbf1f5df366
-SHA1 (patch-ab) = 1687c870ae8f6c5a3be4a91335a6d913d9773ff2
+SHA1 (patch-ab) = a383b528fa10331a7539c6ec8f303d71539576c4
+SHA1 (patch-ac) = 3cc37a8cd2020ea39ade2651ca1e40c4280066a0
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index 8c92ab926e2..c57d9c970bb 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,16 +1,26 @@
-$NetBSD: patch-ab,v 1.5 2002/08/25 21:52:09 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2002/11/26 15:07:32 jmmv Exp $
 
---- Makefile.in.orig	Tue May 21 12:53:53 2002
+--- Makefile.in.orig	Wed May 29 23:02:18 2002
 +++ Makefile.in
-@@ -359,9 +359,9 @@
+@@ -23,7 +23,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/@PACKAGE@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -358,10 +358,9 @@ mostlyclean distclean maintainer-clean
+ 
  
  install-data-local: dillorc
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
  	-if [ -d $(DESTDIR)$(sysconfdir) ]; then \
 -		$(INSTALL_DATA) --backup=t $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
-+		$(INSTALL_DATA) $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
- 	elif [ -d /etc/ ]; then \
+-	elif [ -d /etc/ ]; then \
 -		$(INSTALL_DATA) --backup=t $(srcdir)/dillorc /etc/; \
-+		$(INSTALL_DATA) $(srcdir)/dillorc /etc/; \
++		$(INSTALL_DATA) $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
  	fi
  
  uninstall-local:
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
new file mode 100644
index 00000000000..bd177076d1d
--- /dev/null
+++ b/www/dillo/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2002/11/26 15:07:32 jmmv Exp $
+
+--- src/prefs.c.orig	Wed Apr  3 18:31:46 2002
++++ src/prefs.c
+@@ -243,8 +244,7 @@ static gint Prefs_load(void)
+    file = a_Misc_prepend_user_home(".dillo/dillorc");
+    fd = open(file, O_RDONLY);
+    g_free(file);
+-   if (fd < 0 && (fd = open("/etc/dillorc", O_RDONLY)) < 0)
+-      if ((fd = open("/usr/local/etc/dillorc", O_RDONLY)) < 0)
++   if (fd < 0 && (fd = open(PKG_SYSCONFDIR "/dillorc", O_RDONLY)) < 0)
+          return FILE_NOT_FOUND;
+ 
+    scanner = g_scanner_new(NULL);
-- 
cgit v1.2.3