diff options
| -rw-r--r-- | www/dillo/Makefile | 5 | ||||
| -rw-r--r-- | www/dillo/PLIST | 5 | ||||
| -rw-r--r-- | www/dillo/distinfo | 12 | ||||
| -rw-r--r-- | www/dillo/patches/patch-aa | 29 | ||||
| -rw-r--r-- | www/dillo/patches/patch-ab | 10 |
5 files changed, 32 insertions, 29 deletions
diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 6cbd67199f2..47881a75f08 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:30 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2010/02/14 20:19:24 snj Exp $ -DISTNAME= dillo-2.1.1 -PKGREVISION= 2 +DISTNAME= dillo-2.2 CATEGORIES= www MASTER_SITES= http://www.dillo.org/download/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/dillo/PLIST b/www/dillo/PLIST index efbcc9d3a45..038c1ea38fd 100644 --- a/www/dillo/PLIST +++ b/www/dillo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2009/07/09 05:04:02 snj Exp $ +@comment $NetBSD: PLIST,v 1.16 2010/02/14 20:19:25 snj Exp $ bin/dillo bin/dpid bin/dpidc @@ -18,11 +18,12 @@ share/doc/dillo/Dpid.txt share/doc/dillo/Dw.txt share/doc/dillo/HtmlParser.txt share/doc/dillo/IO.txt -share/doc/dillo/Imgbuf.txt share/doc/dillo/Images.txt +share/doc/dillo/Imgbuf.txt share/doc/dillo/NC_design.txt share/doc/dillo/README share/doc/dillo/Selection.txt +share/doc/dillo/user_help.html share/examples/dillo/dillorc share/examples/dillo/dpidrc share/examples/dillo/keysrc diff --git a/www/dillo/distinfo b/www/dillo/distinfo index fbc5a75a351..34bf7c43442 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2009/07/09 05:04:02 snj Exp $ +$NetBSD: distinfo,v 1.30 2010/02/14 20:19:25 snj Exp $ -SHA1 (dillo-2.1.1.tar.bz2) = eb252663b9480e53e0376d75b81130404ccf40ce -RMD160 (dillo-2.1.1.tar.bz2) = 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6 -Size (dillo-2.1.1.tar.bz2) = 612711 bytes -SHA1 (patch-aa) = 3a7b8d9e70d82edebf63cd5a715754dfad935832 -SHA1 (patch-ab) = 37bbf07cb5120cbc677ad12d4d9f3ab07a02722e +SHA1 (dillo-2.2.tar.bz2) = 06b325a246a639d936dabfc73d005f951d23c151 +RMD160 (dillo-2.2.tar.bz2) = 050f5bcd46042764c9bba536e6e5fd97453e1d6f +Size (dillo-2.2.tar.bz2) = 630259 bytes +SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1 +SHA1 (patch-ab) = 827ed561c4622cf0d940090fcaac37f98d6cbab4 SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158 SHA1 (patch-ad) = 005df4881ecea7b1a7aff51ea06697e9949547dd diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa index 5b7c8289a00..b36339e6ceb 100644 --- a/www/dillo/patches/patch-aa +++ b/www/dillo/patches/patch-aa @@ -1,20 +1,23 @@ -$NetBSD: patch-aa,v 1.8 2009/07/09 05:04:02 snj Exp $ +$NetBSD: patch-aa,v 1.9 2010/02/14 20:19:25 snj Exp $ ---- dpid/Makefile.in.orig 2009-07-01 10:56:37.000000000 -0700 -+++ dpid/Makefile.in 2009-07-08 20:42:08.000000000 -0700 -@@ -320,12 +320,12 @@ distclean-compile: - uninstall-info-am: +--- dpid/Makefile.in.orig 2010-02-11 02:20:00.000000000 -0800 ++++ dpid/Makefile.in 2010-02-14 09:55:43.000000000 -0800 +@@ -335,15 +335,15 @@ distclean-compile: + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(datadir)/examples/$(PACKAGE)" || $(mkdir_p) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" - @list='$(sysconf_DATA)'; for p in $$list; do \ +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ $(MKDIR_P) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ -- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f'"; \ -+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/$(PACKAGE)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" || exit $$?; \ done uninstall-sysconfDATA: diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab index 4601f37df92..6f2676827c1 100644 --- a/www/dillo/patches/patch-ab +++ b/www/dillo/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.15 2009/07/09 05:04:03 snj Exp $ +$NetBSD: patch-ab,v 1.16 2010/02/14 20:19:25 snj Exp $ ---- Makefile.in.orig 2009-07-01 10:56:55.000000000 -0700 -+++ Makefile.in 2009-07-08 15:30:55.000000000 -0700 -@@ -194,7 +194,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ +--- Makefile.in.orig 2010-02-11 02:20:01.000000000 -0800 ++++ Makefile.in 2010-02-14 09:56:36.000000000 -0800 +@@ -244,7 +244,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = lout dw dlib dpip src doc dpid dpi test EXTRA_DIST = Doxyfile dillorc install-dpi-local -sysconf_DATA = dillorc |