Properly handle the dpidrc configuration file. Bump PKGREVISION to 1.

Closes PR pkg/28854 by Alexander Becher.

4 files changed, 22 insertions, 3 deletions

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 88052fdaff3..45d62f15e19 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/11/08 11:00:24 adam Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/04 14:09:17 jmmv Exp $
 
 DISTNAME=	dillo-0.8.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dillo.auriga.wearlab.de/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,6 +19,7 @@ CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=		${PREFIX}/share/examples/dillo
 CONF_FILES=	${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc
+CONF_FILES+=	${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index 2a18d7608cb..2eb0bd7bc37 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/08 11:00:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/01/04 14:09:17 jmmv Exp $
 bin/dillo
 bin/dpid
 bin/dpidc
@@ -28,6 +28,7 @@ share/doc/dillo/NC_design.txt
 share/doc/dillo/README
 share/doc/dillo/Selection.txt
 share/examples/dillo/dillorc.default
+share/examples/dillo/dpidrc
 @dirrm share/examples/dillo
 @dirrm share/doc/dillo
 @dirrm lib/dillo/dpi/https
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index e92e8a2d5ad..e12390db807 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2004/11/08 11:00:24 adam Exp $
+$NetBSD: distinfo,v 1.20 2005/01/04 14:09:17 jmmv Exp $
 
 SHA1 (dillo-0.8.3.tar.bz2) = c023eface4516c89ba9a2818cfd24f3ef5d24dae
 Size (dillo-0.8.3.tar.bz2) = 418714 bytes
+SHA1 (patch-aa) = 2c89724fa0846d154292f983db86b3cc1d117343
 SHA1 (patch-ab) = 682f85d285d64f85a9b34d0177a8c6ef5cafd31c
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
new file mode 100644
index 00000000000..9aa1e05b0ad
--- /dev/null
+++ b/www/dillo/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2005/01/04 14:09:17 jmmv Exp $
+
+--- dpid/Makefile.in.orig	2004-10-25 13:12:18.000000000 +0200
++++ dpid/Makefile.in
+@@ -475,8 +475,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ 
+ install-data-local :
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE)
++	echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: