From 3f837e4172d20d91763e6d77aed1dc64653875fd Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 19 Mar 2007 12:33:01 +0000 Subject: [PATCH] - Update to 1.1.29 - Use DATADIR, DOCSDIR - Remove IS_INTERACTIVE by disabling interacting part from install.sh for batch mode and pointyhat build - Remove 4.x support - Pass maintainership to submitter PR: ports/108289 (bsaed on) Submitted by: Marcelo Araujo --- www/bins/Makefile | 34 +- www/bins/distinfo | 6 +- www/bins/files/extra-patch-install.sh | 26 +- www/bins/pkg-descr | 2 +- www/bins/pkg-plist | 543 ++++++++++++++++++++------ 5 files changed, 454 insertions(+), 157 deletions(-) diff --git a/www/bins/Makefile b/www/bins/Makefile index 79c18fd848b1..ee1c99059273 100644 --- a/www/bins/Makefile +++ b/www/bins/Makefile @@ -6,18 +6,19 @@ # PORTNAME= bins -PORTVERSION= 1.1.20 -PORTREVISION= 2 +PORTVERSION= 1.1.29 CATEGORIES= www -MASTER_SITES= http://jsautret.free.fr/BINS/ +MASTER_SITES= http://download.gna.org/bins/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= araujo@bsdmail.org COMMENT= Tool to generate HTML photo albums with XML support RUN_DEPENDS= \ ${PBASE}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \ ${PBASE}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \ ${PBASE}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \ + ${PBASE}/${PERL_ARCH}/Text/Unaccent.pm:${PORTSDIR}/textproc/p5-Text-Unaccent \ + ${PBASE}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \ ${PBASE}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ ${PBASE}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \ ${PBASE}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ @@ -29,7 +30,6 @@ RUN_DEPENDS= \ ${PBASE}/XML/Handler/YAWriter.pm:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \ ${PBASE}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml -IS_INTERACTIVE= yes USE_BZIP2= yes USE_PERL5_RUN= yes NO_BUILD= yes @@ -38,13 +38,13 @@ NO_BUILD= yes PBASE= ${SITE_PERL} # additional scripts -BINS_SCRIPTS= bins_txt2xml +BINS_SCRIPTS= tools/bins_txt2xml # doc file extension DOC_EXTS= html sgml xml MAN1= bins-edit-gui.1 bins.1 bins_edit.1 -post-patch: +post-patch:: # perl PREFIX safeness @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 -x ${REINPLACE_CMD} -E \ @@ -52,7 +52,7 @@ post-patch: # prefix safeness @${REINPLACE_CMD} -E \ -e 's|(bins_edit=)".+"(.*)$$|\1"${PREFIX}/bin/bins_edit"\2|' \ - ${WRKSRC}/bins_txt2xml + ${WRKSRC}/tools/bins_txt2xml do-install: @${SETENV} PREFIX=${PREFIX} RC=${PREFIX}/share/bins ${WRKSRC}/install.sh @@ -71,29 +71,25 @@ post-install: .include ## -## this port requires PERL 5.6.x or later +## default for either pointyhat or unattended builds ## -.if !(exists(${LOCALBASE}/bin/perl5.6.0) || exists(${LOCALBASE}/bin/perl5.6.1)) -IGNORE= requires perl 5.6.x or later. Install lang/perl5 then try again -.endif +.if defined(PACKAGE_BUILDING) || defined(BATCH) +WITH_I18N= yes -## -## default for either bento or unattended builds -## -.ifdef(BATCH) -WITH_I18N=yes +post-patch:: + @${REINPLACE_CMD} -e 's,read dummy,,' ${WRKSRC}/install.sh .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-install.sh # localization support -.ifdef(WITH_I18N) +.if defined(WITH_I18N) RUN_DEPENDS+= \ ${PBASE}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext .endif pre-everything:: -.ifndef(WITH_I18N) +.if !defined(WITH_I18N) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_I18N to enable localization support.' @${ECHO_MSG} '===> Support for languages other than english.' diff --git a/www/bins/distinfo b/www/bins/distinfo index 2b6d2df7a7ea..7a6fe0dc337b 100644 --- a/www/bins/distinfo +++ b/www/bins/distinfo @@ -1,3 +1,3 @@ -MD5 (bins-1.1.20.tar.bz2) = c0933c1952077fd2c6f8c7062c63b4b4 -SHA256 (bins-1.1.20.tar.bz2) = 25b01b9ba2a3b7077bd399268be118faaac2c069b545f1b2fb6b84cac7507a40 -SIZE (bins-1.1.20.tar.bz2) = 147155 +MD5 (bins-1.1.29.tar.bz2) = 3398d0ea3a97e49f5aaabb3b79da334a +SHA256 (bins-1.1.29.tar.bz2) = efdf1932ec260d80f1fda6054baf9b3c9a47ce263a1db9e10ad5d4df5871d626 +SIZE (bins-1.1.29.tar.bz2) = 259270 diff --git a/www/bins/files/extra-patch-install.sh b/www/bins/files/extra-patch-install.sh index 110917bffb6a..08fe44255c90 100644 --- a/www/bins/files/extra-patch-install.sh +++ b/www/bins/files/extra-patch-install.sh @@ -1,23 +1,21 @@ ---- install.sh.orig Sat Nov 23 09:40:01 2002 -+++ install.sh Sat Nov 23 09:40:58 2002 -@@ -60,12 +60,11 @@ - mkdir -p $BIN 2>/dev/null || true +--- install.sh.orig Thu Aug 25 06:07:05 2005 ++++ install.sh Mon Mar 19 02:47:24 2007 +@@ -67,11 +67,10 @@ if [ -w $BIN ] ; then echo "Installing program files in $BIN" + # bins_cleanupgallery anti_bins - cp bins bins_edit bins-edit-gui $BIN + cp bins bins_edit $BIN chmod a+rx $BIN/bins chmod a+rx $BIN/bins_edit + chmod a+rx $BIN/bins_cleanupgallery - chmod a+rx $BIN/bins-edit-gui - perl -pi -e "s{/usr/local/share}{$SHARE}g" \ -- $BIN/bins $BIN/bins_edit $BIN/bins-edit-gui -+ $BIN/bins $BIN/bins_edit - return 0 - else - echo "Cannot write to $BIN directory." -@@ -124,13 +123,6 @@ - fi + chmod a+rx $BIN/anti_bins + # perl -pi -e "s{/usr/local/share}{$SHARE}g" \ + # $BIN/bins $BIN/bins_edit $BIN/bins-edit-gui +@@ -169,13 +168,6 @@ fi + set -o errexit -# additionnal files -mkdir -p $GLADE 2>/dev/null || true @@ -29,7 +27,7 @@ # man pages mkdir -p $MAN 2>/dev/null || true if [ -w $MAN ] ; then -@@ -146,9 +138,6 @@ +@@ -203,9 +195,6 @@ do mkdir -p $LOCALE/$L/LC_MESSAGES 2>/dev/null || true cp intl/$L.mo $LOCALE/$L/LC_MESSAGES/bins.mo @@ -38,4 +36,4 @@ - fi done else - cat <