From owner-svn-ports-all@FreeBSD.ORG Wed Oct 10 16:56:08 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9A8B933; Wed, 10 Oct 2012 16:56:08 +0000 (UTC) (envelope-from az@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F30A8FC16; Wed, 10 Oct 2012 16:56:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9AGu8Mq065810; Wed, 10 Oct 2012 16:56:08 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9AGu8Hj065791; Wed, 10 Oct 2012 16:56:08 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201210101656.q9AGu8Hj065791@svn.freebsd.org> From: Andrej Zverev Date: Wed, 10 Oct 2012 16:56:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305672 - in head: astro/wmspaceweather databases/namazu2 devel/p5-Carp-Datum graphics/p5-Imager-AverageGray japanese/another-htmllint japanese/eijiro-fpw japanese/mypaedia-fpw japanese... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 16:56:08 -0000 Author: az Date: Wed Oct 10 16:56:07 2012 New Revision: 305672 URL: http://svn.freebsd.org/changeset/ports/305672 Log: - Remove SITE_PERL from *_DEPENDS (final part) Approved by: portmgr@ (bapt@) Modified: head/astro/wmspaceweather/Makefile head/databases/namazu2/Makefile head/devel/p5-Carp-Datum/Makefile head/graphics/p5-Imager-AverageGray/Makefile head/japanese/another-htmllint/Makefile head/japanese/eijiro-fpw/Makefile head/japanese/mypaedia-fpw/Makefile head/japanese/namazu2/Makefile head/japanese/otojiro-fpw/Makefile head/japanese/srd-fpw/Makefile head/japanese/waeijiro-fpw/Makefile head/mail/websieve/Makefile head/net-mgmt/p5-Net-SNMP/Makefile head/security/p5-Crypt-Primes/Makefile head/sysutils/psgconf/Makefile head/textproc/ruby-xmlparser/Makefile head/www/bins/Makefile head/www/fswiki/Makefile Modified: head/astro/wmspaceweather/Makefile ============================================================================== --- head/astro/wmspaceweather/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/astro/wmspaceweather/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -17,7 +17,7 @@ COMMENT= A DockApp that shows the weathe LICENSE= GPLv2 -RUN_DEPENDS= ${SITE_PERL}/Time/CTime.pm:${PORTSDIR}/devel/p5-Time-modules +RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather Modified: head/databases/namazu2/Makefile ============================================================================== --- head/databases/namazu2/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/databases/namazu2/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -14,10 +14,8 @@ PKGNAMESUFFIX= 2 MAINTAINER= ports@FreeBSD.org COMMENT= Full-text search system intended for easy use -BUILD_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic -RUN_DEPENDS= ${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic - -PM_BASE= ${SITE_PERL} +BUILD_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic +RUN_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic USE_PERL5= yes USE_ICONV= yes Modified: head/devel/p5-Carp-Datum/Makefile ============================================================================== --- head/devel/p5-Carp-Datum/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/devel/p5-Carp-Datum/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -14,12 +14,11 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Debugging And Tracing Ultimate Module -BUILD_DEPENDS= ${PM_BASE}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \ - ${PM_BASE}/Getargs/Long.pm:${PORTSDIR}/devel/p5-Getargs-Long +BUILD_DEPENDS= p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \ + p5-Getargs-Long>=0:${PORTSDIR}/devel/p5-Getargs-Long RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -PM_BASE= ${SITE_PERL} MAN1= datum_strip.1 MAN3= Carp::Datum::Assert.3 \ Modified: head/graphics/p5-Imager-AverageGray/Makefile ============================================================================== --- head/graphics/p5-Imager-AverageGray/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/graphics/p5-Imager-AverageGray/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= vvelox@vvelox.net COMMENT= Finds the average gray for a Imager object or image -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Imager.pm:${PORTSDIR}/graphics/p5-Imager/ +RUN_DEPENDS= p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager/ PERL_CONFIGURE= yes Modified: head/japanese/another-htmllint/Makefile ============================================================================== --- head/japanese/another-htmllint/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/another-htmllint/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -14,7 +14,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Another HTML-lint (all messages are written in Japanese) RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode USE_PERL5= YES USE_ZIP= YES @@ -51,6 +51,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -JCODE= ${SITE_PERL}/Jcode.pm - .include Modified: head/japanese/eijiro-fpw/Makefile ============================================================================== --- head/japanese/eijiro-fpw/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/eijiro-fpw/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -17,7 +17,7 @@ COMMENT= EIJIRO English - Japanese Dicti EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode MANUAL_PACKAGE_BUILD=Needs data from CDROM RESTRICTED= "The original dictionary is not free" @@ -30,8 +30,6 @@ SRCFILE?= eijiro52.txt # For eijiro included in a book sold by ALC Inc. # (http://www.alc.co.jp/alcshop/eng/eijiro/) -JCODE= ${SITE_PERL}/Jcode.pm - .include DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} Modified: head/japanese/mypaedia-fpw/Makefile ============================================================================== --- head/japanese/mypaedia-fpw/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/mypaedia-fpw/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An encyclopedia "Mypaedia" (EPWING V1 format) BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode IS_INTERACTIVE= YES RESTRICTED= "The original dictionary is not free" @@ -56,6 +56,4 @@ do-install: .endfor .endif -JCODE= ${SITE_PERL}/Jcode.pm - .include Modified: head/japanese/namazu2/Makefile ============================================================================== --- head/japanese/namazu2/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/namazu2/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -17,9 +17,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Meta-port of Namazu and Japanese support modules LIB_DEPENDS= nmz.8:${PORTSDIR}/databases/namazu2 -RUN_DEPENDS= ${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf +RUN_DEPENDS= ja-p5-nkf>=0:${PORTSDIR}/japanese/p5-nkf -PM_BASE= ${SITE_PERL} PLIST= "@comment this plist is intentionally left empty" .if defined(WITH_CHASEN) Modified: head/japanese/otojiro-fpw/Makefile ============================================================================== --- head/japanese/otojiro-fpw/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/otojiro-fpw/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -21,7 +21,7 @@ EXPIRATION_DATE= 2012-10-20 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode MANUAL_PACKAGE_BUILD=Needs data from CDROM RESTRICTED= "The original dictionary is not free" @@ -35,8 +35,6 @@ SRCFILE?= otojiro.txt # (http://www.alc.co.jp/alcshop/eng/eijiro/) .include -JCODE= ${SITE_PERL}/Jcode.pm - DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} .if exists(${DICT_ARCHIVE}) EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha Modified: head/japanese/srd-fpw/Makefile ============================================================================== --- head/japanese/srd-fpw/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/srd-fpw/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A English - Japanese Dictionary "Random House" (EPWING V1 format) BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode IS_INTERACTIVE= YES RESTRICTED= "The original dictionary is not free" @@ -60,6 +60,4 @@ do-install: .endfor .endif -JCODE= ${SITE_PERL}/Jcode.pm - .include Modified: head/japanese/waeijiro-fpw/Makefile ============================================================================== --- head/japanese/waeijiro-fpw/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/japanese/waeijiro-fpw/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -18,7 +18,7 @@ COMMENT= WAEIJIRO English - Japanese Dic EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \ - ${JCODE}:${PORTSDIR}/japanese/p5-Jcode + ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode MANUAL_PACKAGE_BUILD=Needs data from a CDROM RESTRICTED= "The original dictionary is not free" @@ -29,7 +29,6 @@ SRCFILE?= waeiji52.txt # For eijiro included in a book sold by ALC Inc. # (http://www.alc.co.jp/alcshop/eng/eijiro/) -JCODE= ${SITE_PERL}/Jcode.pm .include DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} Modified: head/mail/websieve/Makefile ============================================================================== --- head/mail/websieve/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/mail/websieve/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -34,19 +34,17 @@ CYRUS_IMAPD_24_DESC= With Cyrus IMAPd ve .include -CYRUS_IMAP_PM= ${SITE_PERL}/${PERL_ARCH}/Cyrus/IMAP/Admin.pm - .if ${PORT_OPTIONS:MCYRUS_IMAPD_24} -RUN_DEPENDS+= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd24 +RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd24 FUNCLIB_PL= funclib.cyrus .elif ${PORT_OPTIONS:MCYRUS_IMAPD_23} -RUN_DEPENDS+= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd23 +RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd23 FUNCLIB_PL= funclib.cyrus .elif ${PORT_OPTIONS:MCYRUS_IMAPD_22} -RUN_DEPENDS+= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd22 +RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd22 FUNCLIB_PL= funclib.cyrus .elif ${PORT_OPTIONS:MCYRUS_IMAPD_21} -RUN_DEPENDS+= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd2 +RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd2 FUNCLIB_PL= funclib.cyrus .else RUN_DEPENDS+= p5-IMAP-Admin>=0:${PORTSDIR}/mail/p5-IMAP-Admin \ Modified: head/net-mgmt/p5-Net-SNMP/Makefile ============================================================================== --- head/net-mgmt/p5-Net-SNMP/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/net-mgmt/p5-Net-SNMP/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -16,13 +16,12 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= lth@FreeBSD.org COMMENT= Object oriented interface to SNMP -BUILD_DEPENDS= ${ARCH_PERL}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \ - ${ARCH_PERL}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ +BUILD_DEPENDS= p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \ + p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \ p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -ARCH_PERL= ${SITE_PERL}/${PERL_ARCH} CONFLICTS= p5-Net-SNMP3-[0-9]* MAN1= snmpkey.1 Modified: head/security/p5-Crypt-Primes/Makefile ============================================================================== --- head/security/p5-Crypt-Primes/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/security/p5-Crypt-Primes/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -14,10 +14,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Provable Prime Number Generator suitable for Cryptographic Applications -PERLBASE= ${SITE_PERL} - -BUILD_DEPENDS= ${PERLBASE}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random \ - ${PERLBASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari +BUILD_DEPENDS= p5-Crypt-Random>=0:${PORTSDIR}/security/p5-Crypt-Random \ + p5-Math-Pari>=0:${PORTSDIR}/math/p5-Math-Pari PERL_CONFIGURE= yes Modified: head/sysutils/psgconf/Makefile ============================================================================== --- head/sysutils/psgconf/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/sysutils/psgconf/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -14,14 +14,14 @@ MASTER_SITES= ftp://ftp-dev.cites.uiuc.e MAINTAINER= pirzyk@FreeBSD.org COMMENT= Controls system configuration -BUILD_DEPENDS= ${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Objective \ - ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \ - p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ - ${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable/Process.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \ - ${SITE_PERL}/${PERL_ARCH}/Unix/Mknod.pm:${PORTSDIR}/sysutils/p5-Unix-Mknod \ - ${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \ - ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \ - ${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff +BUILD_DEPENDS= p5-Config-Objective>=0:${PORTSDIR}/devel/p5-Config-Objective \ + p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \ + p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ + p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \ + Unix-Mknod>=0:${PORTSDIR}/sysutils/p5-Unix-Mknod \ + p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \ + p5-version>=0:${PORTSDIR}/devel/p5-version \ + p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= YES Modified: head/textproc/ruby-xmlparser/Makefile ============================================================================== --- head/textproc/ruby-xmlparser/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/textproc/ruby-xmlparser/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -15,20 +15,18 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby module to access James Clark XML Parser ToolKit ("expat") -BUILD_DEPENDS= ${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser +BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \ - ${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser + p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser # to utilize encoding maps included in p5-XML-Parser USE_PERL5= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes -PERL_ARCHLIB= ${SITE_PERL}/${PERL_ARCH} - WRKSRC= ${WRKDIR}/${PORTNAME} -CONFIGURE_ARGS= --with-perl-enc-map=${PERL_ARCHLIB}/XML/Parser/Encodings +CONFIGURE_ARGS= --with-perl-enc-map=${SITE_PERL}/${PERL_ARCH}/XML/Parser/Encodings INSTALL_TARGET= site-install post-extract: Modified: head/www/bins/Makefile ============================================================================== --- head/www/bins/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/www/bins/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -15,28 +15,25 @@ MAINTAINER= araujo@FreeBSD.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}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \ - ${PBASE}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ - ${PBASE}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \ - ${PBASE}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \ - ${PBASE}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \ - ${PBASE}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ - ${PBASE}/XML/Grove.pm:${PORTSDIR}/textproc/p5-XML-Grove \ - ${PBASE}/XML/Handler/YAWriter.pm:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \ - ${PBASE}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml + p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ + convert:${PORTSDIR}/graphics/ImageMagick \ + p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \ + p5-Text-Iconv>=0:${PORTSDIR}/textproc/p5-Text-Unaccent \ + p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \ + p5-HTML-Clean>0:${PORTSDIR}/www/p5-HTML-Clean \ + p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \ + p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \ + p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info \ + p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \ + p5-URI>=0:${PORTSDIR}/net/p5-URI \ + p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \ + p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \ + p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml USE_BZIP2= yes USE_PERL5_RUN= yes NO_BUILD= yes -# perlbase -PBASE= ${SITE_PERL} - # additional scripts BINS_SCRIPTS= tools/bins_txt2xml # doc file extension @@ -84,8 +81,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- # localization support .if defined(WITH_I18N) -RUN_DEPENDS+= \ - ${PBASE}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext +RUN_DEPENDS+= p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext .endif pre-everything:: Modified: head/www/fswiki/Makefile ============================================================================== --- head/www/fswiki/Makefile Wed Oct 10 16:14:57 2012 (r305671) +++ head/www/fswiki/Makefile Wed Oct 10 16:56:07 2012 (r305672) @@ -15,15 +15,13 @@ DISTNAME= wiki${PORTVERSION:S|.|_|g} MAINTAINER= kuriyama@FreeBSD.org COMMENT= FreeStyle Wiki (perl based wiki clone) -RUN_DEPENDS= ${JCODE}:${PORTSDIR}/japanese/p5-Jcode \ +RUN_DEPENDS= ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \ p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template USE_ZIP= yes USE_PERL5= yes NO_BUILD= yes -JCODE= ${SITE_PERL}/Jcode.pm - post-extract: ${SED} -e 's|__DATADIR__|${DATADIR}|' ${FILESDIR}/setup.sh \ >${WRKSRC}/setup.sh