- Update to 2.1

PR:		ports/135995
Submitted by:	bf <bf1783@gmail.com> (maintainer)

3 files changed, 22 insertions, 17 deletions

diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 591ba574c723..bfac3d549037 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	dillo
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/
 
@@ -21,6 +21,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+MAN1=		dillo.1
 PORTDOCS=	*
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 CONFLICTS=	dillo-i18n-[0-9]* \
@@ -68,20 +69,20 @@ CONFIGURE_ARGS+= --disable-threaded-dns
 .endif
 
 post-patch:
-.ifdef(WITH_SSL)
-	${REINPLACE_CMD} -e '/^#undef ENABLE_SSL/d' ${WRKSRC}/dpi/https.c
-.endif
 	@${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.dist
+	@${MV} ${WRKSRC}/dpid/dpidrc.in ${WRKSRC}/dpid/dpidrc.dist.in
+	@${MV} ${WRKSRC}/src/keysrc ${WRKSRC}/src/keysrc.dist
+	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
 	@${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
 
 post-install:
-.if !exists(${PREFIX}/etc/dillorc)
-	${INSTALL_DATA} ${PREFIX}/etc/dillorc.dist ${PREFIX}/etc/dillorc
-.endif
-.if !exists(${PREFIX}/etc/dpidrc)
-	${INSTALL_DATA} ${PREFIX}/etc/dpidrc.dist ${PREFIX}/etc/dpidrc
-.endif
+.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)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR}
diff --git a/www/dillo2/distinfo b/www/dillo2/distinfo
index 56db74527d40..fe21038a8c7e 100644
--- a/www/dillo2/distinfo
+++ b/www/dillo2/distinfo
@@ -1,3 +1,3 @@
-MD5 (dillo-2.0.tar.bz2) = bb9999cabeb4db3d915687de465dbeb0
-SHA256 (dillo-2.0.tar.bz2) = 847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
-SIZE (dillo-2.0.tar.bz2) = 551569
+MD5 (dillo-2.1.tar.bz2) = c703851a5c44f739195febd09268edc1
+SHA256 (dillo-2.1.tar.bz2) = e9a36a19a0e28b96e202dadac4ec255489bccfd6734170a32631e1b22406909e
+SIZE (dillo-2.1.tar.bz2) = 625886
diff --git a/www/dillo2/pkg-plist b/www/dillo2/pkg-plist
index 638bfdc8f08d..beb379c68af0 100644
--- a/www/dillo2/pkg-plist
+++ b/www/dillo2/pkg-plist
@@ -1,12 +1,15 @@
 bin/dillo
 bin/dpid
 bin/dpidc
-@unexec if cmp -s %D/etc/dillorc.dist %D/etc/dillorc; then rm -f %D/etc/dillorc; fi
-etc/dillorc.dist
+@unexec if cmp -s %D/etc/dillo/dillorc.dist %D/etc/dillo/dillorc; then rm -f %D/etc/dillo/dillorc; fi
+etc/dillo/dillorc.dist
 @exec if [ ! -f %B/dillorc ]; then cp -p %D/%F %B/dillorc; fi
-@unexec if cmp -s %D/etc/dpidrc.dist %D/etc/dpidrc; then rm -f %D/etc/dpidrc; fi
-etc/dpidrc.dist
+@unexec if cmp -s %D/etc/dillo/dpidrc.dist %D/etc/dillo/dpidrc; then rm -f %D/etc/dillo/dpidrc; fi
+etc/dillo/dpidrc.dist
 @exec if [ ! -f %B/dpidrc ]; then cp -p %D/%F %B/dpidrc; fi
+@unexec if cmp -s %D/etc/dillo/keysrc.dist %D/etc/dillo/keysrc; then rm -f %D/etc/dillo/keysrc; fi
+etc/dillo/keysrc.dist
+@exec if [ ! -f %B/keysrc ]; then cp -p %D/%F %B/keysrc; fi
 libexec/dillo/dpi/bookmarks/bookmarks.dpi
 libexec/dillo/dpi/cookies/cookies.dpi
 libexec/dillo/dpi/datauri/datauri.filter.dpi
@@ -25,3 +28,4 @@ libexec/dillo/dpi/https/https.filter.dpi
 @dirrm libexec/dillo/dpi/bookmarks
 @dirrm libexec/dillo/dpi
 @dirrm libexec/dillo
+@dirrmtry etc/dillo