Date: Wed, 24 Jun 2009 09:15:22 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135995: [PATCH]www/dillo2: update to 2.1 Message-ID: <200906240915.n5O9FMjv052060@www.freebsd.org> Resent-Message-ID: <200906240920.n5O9K1ts043517@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135995 >Category: ports >Synopsis: [PATCH]www/dillo2: update to 2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 24 09:20:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: bf >Release: 8-CURRRENT i386 >Organization: - >Environment: >Description: Everybody throw your hands in the air, and party like you just don't care -- 'cause 2.1 is out. Details: http://hg.dillo.org/dillo/file/tip/ChangeLog >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN dillo2.orig/Makefile dillo2/Makefile --- dillo2.orig/Makefile 2009-06-24 02:49:00.400876999 -0400 +++ dillo2/Makefile 2009-06-24 04:45:34.951885577 -0400 @@ -5,7 +5,7 @@ # $FreeBSD: ports/www/dillo2/Makefile,v 1.44 2009/06/07 18:51:21 miwi Exp $ PORTNAME= dillo -PORTVERSION= 2.0 +PORTVERSION= 2.1 CATEGORIES= www ipv6 MASTER_SITES= http://www.dillo.org/download/ @@ -21,6 +21,7 @@ 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 @@ .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 -ruN dillo2.orig/distinfo dillo2/distinfo --- dillo2.orig/distinfo 2009-06-24 02:49:00.406874130 -0400 +++ dillo2/distinfo 2009-06-24 04:45:34.951885577 -0400 @@ -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 -ruN dillo2.orig/pkg-plist dillo2/pkg-plist --- dillo2.orig/pkg-plist 2009-06-24 02:49:00.415874715 -0400 +++ dillo2/pkg-plist 2009-06-24 04:45:34.951885577 -0400 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906240915.n5O9FMjv052060>