diff options
| author | jmmv <jmmv> | 2002-11-26 15:07:31 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2002-11-26 15:07:31 +0000 |
| commit | 195374dcb56ceead3f4fce223151918597cf478e (patch) | |
| tree | c8caa0ae1b67da59d270ffd032f1db1950a7cbf4 /www/dillo/patches | |
| parent | 11ebdb50acdfc637209041799fb2845ee345f253 (diff) | |
| download | pkgsrc-195374dcb56ceead3f4fce223151918597cf478e.tar.gz | |
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.
Diffstat (limited to 'www/dillo/patches')
| -rw-r--r-- | www/dillo/patches/patch-ab | 22 | ||||
| -rw-r--r-- | www/dillo/patches/patch-ac | 14 |
2 files changed, 30 insertions, 6 deletions
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); |