Date: Mon, 4 May 2015 18:08:46 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385422 - in head/www/dillo2: . files Message-ID: <201505041808.t44I8kvF053009@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Mon May 4 18:08:45 2015 New Revision: 385422 URL: https://svnweb.freebsd.org/changeset/ports/385422 Log: Update to 3.0.4.1; simplify with @sample and @dir Deleted: head/www/dillo2/files/ Modified: head/www/dillo2/Makefile head/www/dillo2/distinfo head/www/dillo2/pkg-plist Modified: head/www/dillo2/Makefile ============================================================================== --- head/www/dillo2/Makefile Mon May 4 17:48:08 2015 (r385421) +++ head/www/dillo2/Makefile Mon May 4 18:08:45 2015 (r385422) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dillo -PORTVERSION= 3.0.4 -PORTREVISION= 1 +PORTVERSION= 3.0.4.1 CATEGORIES= www ipv6 MASTER_SITES= http://www.dillo.org/download/ LOCAL/bf/dillo/ \ TEX_CTAN:hyphen @@ -56,14 +55,14 @@ PORTDOCS= * .if ${PORT_OPTIONS:MHYPHENATION} ALL_HYPHENATION_LANGS= af as bg bn ca cop cs cy da de-1901 de-1996 \ de-ch-1901 el-monoton el-polyton en-gb en-us eo es et eu fi fr fur ga \ -gl grc gu hi hr hsb hu hy ia id is it kmr kn la lt lv ml mn-cyrl mr \ +gl grc gu hi hr hsb hu hy ia id is it ka kmr kn la la-x-classic lt lv ml mn-cyrl mr \ mul-ethi nb nl nn or pa pl pms pt rm ro ru sa sh-cyrl sh-latn sk sl \ -sr-cyrl sv ta te tk tr uk zh-latn-pinyin +sr-cyrl sv ta te th tk tr uk zh-latn-pinyin .if defined(MAINTAINER_MODE) || make(makesum) HYPHENATION_LANGS?= ${ALL_HYPHENATION_LANGS} .else HYPHENATION_LANGS?= \ - ${ALL_HYPHENATION_LANGS:N*-1901:N*-latn:N*-gb:N*-monoton} + ${ALL_HYPHENATION_LANGS:N*-1901:N*-classic:N*-latn:N*-gb:N*-monoton} .endif .for _l in ${HYPHENATION_LANGS} .if !${ALL_HYPHENATION_LANGS:M${_l}} @@ -95,14 +94,14 @@ CONFIGURE_ARGS+= --disable-threaded-dns .endif post-patch: - @${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.dist - @${MV} ${WRKSRC}/dpid/dpidrc.in ${WRKSRC}/dpid/dpidrc.dist.in - @${MV} ${WRKSRC}/src/domainrc ${WRKSRC}/src/domainrc.dist - @${MV} ${WRKSRC}/src/keysrc ${WRKSRC}/src/keysrc.dist + @${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample + @${MV} ${WRKSRC}/dpid/dpidrc.in ${WRKSRC}/dpid/dpidrc.sample.in + @${MV} ${WRKSRC}/src/domainrc ${WRKSRC}/src/domainrc.sample + @${MV} ${WRKSRC}/src/keysrc ${WRKSRC}/src/keysrc.sample @${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/(domain|keys)rc/&.dist/g" ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e "s|dillorc|dillorc.sample|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|dpidrc|dpidrc.sample|g" ${WRKSRC}/dpid/Makefile.in + @${REINPLACE_CMD} -E "s/(domain|keys)rc/&.sample/g" ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e "s|/lib/dillo|/libexec/dillo|" \ ${WRKSRC}/dillo-install-hyphenation \ ${WRKSRC}/doc/dillo.1.in \ @@ -113,20 +112,14 @@ post-patch: .endif post-install: -.for f in dillorc domainrc dpidrc keysrc -. if !exists(${PREFIX}/etc/dillo/${f}) - ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/dillo/${f}.dist ${STAGEDIR}${PREFIX}/etc/dillo/${f} -. endif -.endfor .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .endif @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dillo/hyphenation - @${TOUCH} ${STAGEDIR}${PREFIX}/libexec/dillo/hyphenation/.keep_me .if ${PORT_OPTIONS:MHYPHENATION} .for _l in ${HYPHENATION_LANGS} - @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hyph-${_l}.pat.txt \ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/hyph-${_l}.pat.txt \ ${STAGEDIR}${PREFIX}/libexec/dillo/hyphenation/${_l:C/-.*\$//}.pat .endfor .endif Modified: head/www/dillo2/distinfo ============================================================================== --- head/www/dillo2/distinfo Mon May 4 17:48:08 2015 (r385421) +++ head/www/dillo2/distinfo Mon May 4 18:08:45 2015 (r385422) @@ -1,5 +1,5 @@ -SHA256 (dillo/dillo-3.0.4.tar.bz2) = ee2bab25010dd27b18ba80259df6eb8f6b549f5af596539c08eed0b70322df39 -SIZE (dillo/dillo-3.0.4.tar.bz2) = 738826 +SHA256 (dillo/dillo-3.0.4.1.tar.bz2) = ed97c48029ad1fe62c8a505f81c6ea127532697374153e652065fc6ced098647 +SIZE (dillo/dillo-3.0.4.1.tar.bz2) = 744101 SHA256 (dillo/hyph-af.pat.txt) = 094be0ccc966cb8a9919abffb4d481566bbc25d62bb182647be9feb431de5b5b SIZE (dillo/hyph-af.pat.txt) = 76602 SHA256 (dillo/hyph-as.pat.txt) = 7e919515a24ff650b14cb21458498aadf5267b5cdc761058e72f274544a4ecb6 @@ -72,12 +72,16 @@ SHA256 (dillo/hyph-is.pat.txt) = 68a5f18 SIZE (dillo/hyph-is.pat.txt) = 26023 SHA256 (dillo/hyph-it.pat.txt) = ce650cffad4e81ecaf04591f3274a8ed909e82c587698c55e33b00e2aa7746de SIZE (dillo/hyph-it.pat.txt) = 1840 +SHA256 (dillo/hyph-ka.pat.txt) = 80eac1aa8ea0e34f9751858b22df777b22c65a6efdd9a92e0d71054d83550cbe +SIZE (dillo/hyph-ka.pat.txt) = 25709 SHA256 (dillo/hyph-kmr.pat.txt) = 80bdb7635999aad9010654cfef8703f0f503e8f3b4b444ce9dedee1e44bf4fc7 SIZE (dillo/hyph-kmr.pat.txt) = 1351 SHA256 (dillo/hyph-kn.pat.txt) = d7939c1e1c8fef58585cd0af4c852d665440cf16c3c5cdf2f956bc4ce1201292 SIZE (dillo/hyph-kn.pat.txt) = 373 SHA256 (dillo/hyph-la.pat.txt) = c333bf3b72a0775c3cd499618c3af4fbd6b1c1f890f2d5b58360dd5b3a9c810b SIZE (dillo/hyph-la.pat.txt) = 1757 +SHA256 (dillo/hyph-la-x-classic.pat.txt) = 9f3204897d80ed9a6ec49f4fe2be6f07c15b05a29d4df35b5e5e41aa99d63e35 +SIZE (dillo/hyph-la-x-classic.pat.txt) = 5323 SHA256 (dillo/hyph-lt.pat.txt) = 38e3ac46376bc32db4197facffedff4ee442c3871f0244e08cd520d62665d56d SIZE (dillo/hyph-lt.pat.txt) = 8417 SHA256 (dillo/hyph-lv.pat.txt) = f24446f5c68d9732b4a017d193724241edff598f02573f0767894fb2f9abe10c @@ -130,6 +134,8 @@ SHA256 (dillo/hyph-ta.pat.txt) = 6ccd02f SIZE (dillo/hyph-ta.pat.txt) = 457 SHA256 (dillo/hyph-te.pat.txt) = 43676d49d447ccfe6e4cf8280a879a08ddbc1f50cf86145f7bf7564119b57d35 SIZE (dillo/hyph-te.pat.txt) = 368 +SHA256 (dillo/hyph-th.pat.txt) = cfdf0166c9a13b5c54dc3804422cea95425fedbea03e5dd474fd6f5503ee06ab +SIZE (dillo/hyph-th.pat.txt) = 53240 SHA256 (dillo/hyph-tk.pat.txt) = a016ebc51d23accd92d958f58b4c10583432f56ea4e70ab2987bbf517ca8ec50 SIZE (dillo/hyph-tk.pat.txt) = 13246 SHA256 (dillo/hyph-tr.pat.txt) = 0e7dda13d183f667e3eca0f7ea426dbe51458ca6072b878eb35102966ec22f03 Modified: head/www/dillo2/pkg-plist ============================================================================== --- head/www/dillo2/pkg-plist Mon May 4 17:48:08 2015 (r385421) +++ head/www/dillo2/pkg-plist Mon May 4 18:08:45 2015 (r385422) @@ -2,18 +2,10 @@ bin/dillo bin/dillo-install-hyphenation bin/dpid bin/dpidc -@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/dillo/domainrc.dist %D/etc/dillo/domainrc; then rm -f %D/etc/dillo/domainrc; fi -etc/dillo/domainrc.dist -@exec if [ ! -f %B/domainrc ]; then cp -p %D/%F %B/domainrc; fi -@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 +@sample etc/dillo/dillorc.sample +@sample etc/dillo/domainrc.sample +@sample etc/dillo/dpidrc.sample +@sample etc/dillo/keysrc.sample libexec/dillo/dpi/bookmarks/bookmarks.dpi libexec/dillo/dpi/cookies/cookies.dpi libexec/dillo/dpi/datauri/datauri.filter.dpi @@ -23,18 +15,5 @@ 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 -libexec/dillo/hyphenation/.keep_me man/man1/dillo.1.gz -@dirrmtry libexec/dillo/hyphenation -@dirrm libexec/dillo/dpi/https -@dirrm libexec/dillo/dpi/hello -@dirrm libexec/dillo/dpi/ftp -@dirrm libexec/dillo/dpi/file -@dirrm libexec/dillo/dpi/downloads -@dirrm libexec/dillo/dpi/datauri -@dirrm libexec/dillo/dpi/cookies -@dirrm libexec/dillo/dpi/bookmarks -@dirrm libexec/dillo/dpi/vsource -@dirrm libexec/dillo/dpi -@dirrmtry libexec/dillo -@dirrmtry etc/dillo +@dir libexec/dillo/hyphenation
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041808.t44I8kvF053009>