5 files changed, 9 insertions, 34 deletions

diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index d7217c614709..a868accbba36 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	dillo
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://www.dillo.org/download/
+MASTER_SITES=	http://www.dillo.org/download/ LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A fast, small graphical Web browser built upon fltk2
@@ -23,9 +23,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-.ifndef(NO_INSTALL_MANPAGES)
 MAN1=		dillo.1
-.endif
 .ifndef(NOPORTDOCS)
 PORTDOCS=	*
 .endif
@@ -82,17 +80,14 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|dillorc|dillorc.dist|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|dpidrc|dpidrc.dist|g" ${WRKSRC}/dpid/Makefile.in
 	@${REINPLACE_CMD} -e "s|keysrc|keysrc.dist|g" ${WRKSRC}/src/Makefile.in
-.ifdef(NO_INSTALL_MANPAGES)
-	@${REINPLACE_CMD} -e "\|install-data-am:|s|install-man||" ${WRKSRC}/doc/Makefile.in
-.endif
 .ifdef(NOPORTDOCS)
 	@${REINPLACE_CMD} -e "\|install-data-am:|s|install-dist_docDATA||" ${WRKSRC}/doc/Makefile.in
 .endif
 
 post-install:
-.for _F in dillorc dpidrc keysrc
-. if !exists(${PREFIX}/etc/dillo/${_F})
-	${INSTALL_DATA} ${PREFIX}/etc/dillo/${_F}.dist ${PREFIX}/etc/dillo/${_F}
+.for f in dillorc dpidrc keysrc
+. if !exists(${PREFIX}/etc/dillo/${f})
+	${INSTALL_DATA} ${PREFIX}/etc/dillo/${f}.dist ${PREFIX}/etc/dillo/${f}
 . endif
 .endfor
 .ifndef(NOPORTDOCS)
diff --git a/www/dillo2/distinfo b/www/dillo2/distinfo
index fc76eb7beb60..3e3663d2bf45 100644
--- a/www/dillo2/distinfo
+++ b/www/dillo2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dillo-2.2.tar.bz2) = f4352970bda70404faa66d1fc90e1dcd1e3417266bf4e29759674d48804ac2ba
-SIZE (dillo-2.2.tar.bz2) = 630259
+SHA256 (dillo-2.2.1.tar.bz2) = 70c5768abe8234ffc65a833c8b663f30f115011096367d63a2a0fa39d5df7181
+SIZE (dillo-2.2.1.tar.bz2) = 633999
diff --git a/www/dillo2/files/patch-src-cookies.c b/www/dillo2/files/patch-src-cookies.c
deleted file mode 100644
index f907e831d09c..000000000000
--- a/www/dillo2/files/patch-src-cookies.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cookies.c.orig	2008-09-28 22:57:42.000000000 +0400
-+++ src/cookies.c	2008-11-24 17:21:06.000000000 +0300
-@@ -17,6 +17,8 @@
- 
- #ifdef DISABLE_COOKIES
- 
-+#include "msg.h"
-+
- /*
-  * Initialize the cookies module
-  */
diff --git a/www/dillo2/files/patch-src-png.c b/www/dillo2/files/patch-src-png.c
deleted file mode 100644
index f63b35aeb52f..000000000000
--- a/www/dillo2/files/patch-src-png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/png.c.orig	2005-10-27 18:20:14.000000000 +0200
-+++ src/png.c	2010-03-29 21:23:10.000000000 +0200
-@@ -355,7 +355,7 @@
-             return;            /* need MORE data */
-          }
-          /* check the image signature - DON'T update ipbufstart! */
--         if (!png_check_sig(png->ipbuf, DATASIZE)) {
-+         if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) {
-             /* you lied to me about it being a PNG image */
-             png->state = IS_finished;
-             break;
diff --git a/www/dillo2/pkg-plist b/www/dillo2/pkg-plist
index beb379c68af0..02a70f4d737a 100644
--- a/www/dillo2/pkg-plist
+++ b/www/dillo2/pkg-plist
@@ -18,6 +18,7 @@ libexec/dillo/dpi/file/file.dpi
 libexec/dillo/dpi/ftp/ftp.filter.dpi
 libexec/dillo/dpi/hello/hello.filter.dpi
 libexec/dillo/dpi/https/https.filter.dpi
+libexec/dillo/dpi/vsource/vsource.filter.dpi
 @dirrm libexec/dillo/dpi/https
 @dirrm libexec/dillo/dpi/hello
 @dirrm libexec/dillo/dpi/ftp
@@ -26,6 +27,7 @@ libexec/dillo/dpi/https/https.filter.dpi
 @dirrm libexec/dillo/dpi/datauri
 @dirrm libexec/dillo/dpi/cookies
 @dirrm libexec/dillo/dpi/bookmarks
+@dirrm libexec/dillo/dpi/vsource
 @dirrm libexec/dillo/dpi
 @dirrm libexec/dillo
 @dirrmtry etc/dillo