[pkgsrc/trunk]: pkgsrc/www/dillo Properly handle the dpidrc configuration fil...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34272ac77753
branches:  trunk
changeset: 486868:34272ac77753
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Jan 04 14:09:17 2005 +0000

description:
Properly handle the dpidrc configuration file.  Bump PKGREVISION to 1.
Closes PR pkg/28854 by Alexander Becher.

diffstat:

 www/dillo/Makefile         |   4 +++-
 www/dillo/PLIST            |   3 ++-
 www/dillo/distinfo         |   3 ++-
 www/dillo/patches/patch-aa |  15 +++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diffs (67 lines):

diff -r fcf852a5903a -r 34272ac77753 www/dillo/Makefile
--- a/www/dillo/Makefile        Tue Jan 04 14:06:35 2005 +0000
+++ b/www/dillo/Makefile        Tue Jan 04 14:09:17 2005 +0000
@@ -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 @@
 
 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 -r fcf852a5903a -r 34272ac77753 www/dillo/PLIST
--- a/www/dillo/PLIST   Tue Jan 04 14:06:35 2005 +0000
+++ b/www/dillo/PLIST   Tue Jan 04 14:09:17 2005 +0000
@@ -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/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 -r fcf852a5903a -r 34272ac77753 www/dillo/distinfo
--- a/www/dillo/distinfo        Tue Jan 04 14:06:35 2005 +0000
+++ b/www/dillo/distinfo        Tue Jan 04 14:09:17 2005 +0000
@@ -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 -r fcf852a5903a -r 34272ac77753 www/dillo/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/dillo/patches/patch-aa        Tue Jan 04 14:09:17 2005 +0000
@@ -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: