diff options
author | is <is@pkgsrc.org> | 2011-12-02 13:06:31 +0000 |
---|---|---|
committer | is <is@pkgsrc.org> | 2011-12-02 13:06:31 +0000 |
commit | 05501b512921c57e400bd54e115469d9a06b3b89 (patch) | |
tree | 0e3bca97ed6ca2d4a1ede09e12c226bc3db3d445 /www/dillo | |
parent | 4f3a737a5a644a69f6752a8414b5758ad15b079a (diff) | |
download | pkgsrc-05501b512921c57e400bd54e115469d9a06b3b89.tar.gz |
Upgrade dillo to 3.0.1.
Diffstat (limited to 'www/dillo')
-rw-r--r-- | www/dillo/Makefile | 8 | ||||
-rw-r--r-- | www/dillo/PLIST | 3 | ||||
-rw-r--r-- | www/dillo/distinfo | 12 | ||||
-rw-r--r-- | www/dillo/patches/patch-ab | 8 | ||||
-rw-r--r-- | www/dillo/patches/patch-ad | 24 |
5 files changed, 21 insertions, 34 deletions
diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 7abddc868fa..48680001d62 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2011/11/01 06:02:45 sbd Exp $ +# $NetBSD: Makefile,v 1.52 2011/12/02 13:06:31 is Exp $ -DISTNAME= dillo-2.2 -PKGREVISION= 3 +DISTNAME= dillo-3.0.1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.dillo.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -41,7 +41,7 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../x11/fltk2/buildlink3.mk" +.include "../../x11/fltk13/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/dillo/PLIST b/www/dillo/PLIST index 038c1ea38fd..b32400c2010 100644 --- a/www/dillo/PLIST +++ b/www/dillo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2010/02/14 20:19:25 snj Exp $ +@comment $NetBSD: PLIST,v 1.17 2011/12/02 13:06:31 is Exp $ bin/dillo bin/dpid bin/dpidc @@ -10,6 +10,7 @@ lib/dillo/dpi/file/file.dpi lib/dillo/dpi/ftp/ftp.filter.dpi lib/dillo/dpi/hello/hello.filter.dpi lib/dillo/dpi/https/https.filter.dpi +lib/dillo/dpi/vsource/vsource.filter.dpi man/man1/dillo.1 share/doc/dillo/Cache.txt share/doc/dillo/Cookies.txt diff --git a/www/dillo/distinfo b/www/dillo/distinfo index cf7eb042fb7..9880be623aa 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.32 2011/01/13 13:52:54 wiz Exp $ +$NetBSD: distinfo,v 1.33 2011/12/02 13:06:31 is Exp $ -SHA1 (dillo-2.2.tar.bz2) = 06b325a246a639d936dabfc73d005f951d23c151 -RMD160 (dillo-2.2.tar.bz2) = 050f5bcd46042764c9bba536e6e5fd97453e1d6f -Size (dillo-2.2.tar.bz2) = 630259 bytes +SHA1 (dillo-3.0.1.tar.bz2) = fd7324d0ceee05b4dc189f06ed0483ef5ac2c28a +RMD160 (dillo-3.0.1.tar.bz2) = bc818e8bd94dd31916151c0e2cf46b101882b5ad +Size (dillo-3.0.1.tar.bz2) = 625504 bytes SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1 -SHA1 (patch-ab) = 827ed561c4622cf0d940090fcaac37f98d6cbab4 +SHA1 (patch-ab) = 2cb89a6fd5bcb19b83de94fed6a67605f83b4764 SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158 -SHA1 (patch-ad) = 994c27f2a2d9a6e8fbe1e6ee43ee0623638a80f3 +SHA1 (patch-ad) = dbae6a09285673771ff95ff3b40fe113f4b09726 diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab index 6f2676827c1..d33f3fd316a 100644 --- a/www/dillo/patches/patch-ab +++ b/www/dillo/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.16 2010/02/14 20:19:25 snj Exp $ +$NetBSD: patch-ab,v 1.17 2011/12/02 13:06:31 is Exp $ ---- Makefile.in.orig 2010-02-11 02:20:01.000000000 -0800 -+++ Makefile.in 2010-02-14 09:56:36.000000000 -0800 +--- Makefile.in.orig 2011-09-21 17:30:15.000000000 +0000 ++++ Makefile.in @@ -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 + EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h -sysconf_DATA = dillorc +sysconf_DATA = all: config.h diff --git a/www/dillo/patches/patch-ad b/www/dillo/patches/patch-ad index 0f2598ca0a7..1d1da9c4fb3 100644 --- a/www/dillo/patches/patch-ad +++ b/www/dillo/patches/patch-ad @@ -1,27 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2011/01/13 13:52:54 wiz Exp $ +$NetBSD: patch-ad,v 1.4 2011/12/02 13:06:31 is Exp $ ---- configure.orig 2010-02-11 05:19:59.000000000 -0500 -+++ configure 2010-12-11 13:52:46.000000000 -0500 -@@ -2999,7 +2999,7 @@ - +--- configure.orig 2011-09-21 17:30:13.000000000 +0000 ++++ configure +@@ -3143,7 +3143,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am ac_config_headers="$ac_config_headers config.h" + -sysconfdir=${sysconfdir}/${PACKAGE} +sysconfdir=${sysconfdir} -@@ -6214,8 +6214,12 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5 - $as_echo_n "checking for libpng-config... " >&6; } - -+ - if test -z "$PNG_CONFIG"; then -- PNG_CONFIG=`which libpng12-config` -+ PNG_CONFIG=`which libpng15-config` -+ if test -z "$PNG_CONFIG"; then -+ PNG_CONFIG=`which libpng15-config` -+ fi - if test -z "$PNG_CONFIG"; then - PNG_CONFIG=`which libpng-config` - fi |