diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index d841111f764c..103ce4953745 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= libdb-5.so:${PORTSDIR}/databases/db5 \ PKGMESSAGE= ${WRKDIR}/pkg-message -USES= cmake pkgconfig -USES= compiler:features cmake pkgconfig +USES= cmake compiler:features pkgconfig USE_WX= 2.8+ WX_UNICODE= yes USE_LDCONFIG= yes diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile index 8222583c5704..5ae7ff9f447f 100644 --- a/databases/rrdtool12/Makefile +++ b/databases/rrdtool12/Makefile @@ -3,7 +3,7 @@ PORTNAME= rrdtool PORTVERSION= 1.2.30 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ PKGNAMESUFFIX= 12 @@ -53,7 +53,7 @@ PLIST_SUB+= WITH_RUBY="@comment " .endif .if ${PORT_OPTIONS:MPERL} -USES= perl5 +USES+= perl5 CONFIGURE_ARGS+= --enable-perl --enable-perl-site-install PLIST_SUB+= WITH_PERL="" .else diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile index 6518fc3d6f62..bbca94a8e7d1 100644 --- a/databases/slony1/Makefile +++ b/databases/slony1/Makefile @@ -3,6 +3,7 @@ PORTNAME= slony1 PORTVERSION= 1.2.23 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://main.slony.info/downloads/1.2/source/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -32,7 +33,7 @@ NO_STAGE= yes .include .if ${PORT_OPTIONS:MPERLTOOLS} -USES= perl5 +USES+= perl5 CONFIGURE_ARGS+= --with-perltools=${LOCALBASE}/sbin RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg BUILD_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile index 4aee529fa657..cf09d9fdb8cd 100644 --- a/deskutils/ganttproject/Makefile +++ b/deskutils/ganttproject/Makefile @@ -3,6 +3,7 @@ PORTNAME= ganttproject PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= deskutils java MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-r1544 @@ -12,9 +13,8 @@ COMMENT= Gantt chart based project scheduling and management tool LICENSE= GPLv3 -USES= shebangfix +USES= shebangfix zip SHEBANG_FILES= ganttproject -USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile index cdc07b05f5a8..6586fe774f4c 100644 --- a/editors/yzis/Makefile +++ b/editors/yzis/Makefile @@ -3,7 +3,7 @@ PORTNAME= yzis PORTVERSION= 1.0.a.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= editors MASTER_SITES= http://labs.freehackers.org/attachments/download/45/ \ http://contribs.martymac.org/FreeBSD-ports/distfiles/ @@ -15,14 +15,12 @@ COMMENT= Vi-like editor LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi +USES= cmake gettext perl5 USE_BZIP2= yes USE_XORG= x11 xext ice USE_LUA= 5.1 LUA_COMPS= lua USE_QT4= qtestlib qmake_build rcc_build uic_build moc_build gui xml -USES= perl5 - -USES= cmake gettext CMAKE_ARGS+= -DLOCALBASE:STRING="${LOCALBASE}" \ -DLUA_INCDIR:STRING="${LUA_INCDIR}" \ -DLUA_LIBDIR:STRING="${LUA_LIBDIR}" \ diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile index 28da1081e888..439a76769003 100644 --- a/games/briquolo/Makefile +++ b/games/briquolo/Makefile @@ -3,7 +3,7 @@ PORTNAME= briquolo PORTVERSION= 0.5.7 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://briquolo.free.fr/download/ @@ -14,11 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +USES= desktop-file-utils gmake iconv USE_BZIP2= yes -USES= iconv USE_GL= gl USE_SDL= mixer sdl ttf -USES= gmake desktop-file-utils USE_XORG= x11 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index 623ea0e91636..2ba400a325a2 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -23,7 +23,6 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ USES= pkgconfig USE_BZIP2= yes USE_SCONS= yes -USES= pkgconfig USE_GL= gl glu USE_SDL= mixer SUB_FILES= pink-pony.sh diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile index e8053c8db0b5..755e9abfed67 100644 --- a/math/wfmath/Makefile +++ b/math/wfmath/Makefile @@ -3,15 +3,14 @@ PORTNAME= wfmath PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= Worldforge math library -USES= gmake -USES= pathfix pkgconfig +USES= gmake pathfix pkgconfig USE_LDCONFIG= yes USE_GCC= yes GNU_CONFIGURE= yes diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile index 5a30c9ec62d4..f5ebbd6bbcf9 100644 --- a/misc/gkrellshoot2/Makefile +++ b/misc/gkrellshoot2/Makefile @@ -16,7 +16,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkre RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 \ import:${PORTSDIR}/graphics/ImageMagick -USES= pkgconfig PLIST_FILES= libexec/gkrellm2/plugins/gkrellshoot.so WRKSRC= ${WRKDIR}/gkrellShoot-${PORTVERSION} diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile index 18f31124a9d4..6b2ae6562474 100644 --- a/net-mgmt/ipplan/Makefile +++ b/net-mgmt/ipplan/Makefile @@ -3,7 +3,7 @@ PORTNAME= ipplan PORTVERSION= 4.92b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/iptrack/${PORTNAME}/Release%204.92 @@ -12,17 +12,16 @@ COMMENT= IP address management and tracking RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap -USES= perl5 +USES= perl5 shebangfix USE_PERL5= run USE_PHP= gettext pcre xml zlib +SHEBANG_FILES= ${WRKSRC}/contrib/process-exports.pl ${WRKSRC}/contrib/ipplan-poller.php NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} CONFIG= config.php SUB_FILES= pkg-message REINPLACE_ARGS= -i '' -USES= shebangfix -SHEBANG_FILES= ${WRKSRC}/contrib/process-exports.pl ${WRKSRC}/contrib/ipplan-poller.php OPTIONS_DEFINE= MYSQL PGSQL SNMP OPTIONS_DEFAULT= MYSQL diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile index ffd574d4a649..b4fb44d03ebb 100644 --- a/textproc/yodl/Makefile +++ b/textproc/yodl/Makefile @@ -3,6 +3,7 @@ PORTNAME= yodl PORTVERSION= 3.03.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -17,26 +18,9 @@ BUILD_DEPENDS= icmake:${PORTSDIR}/devel/icmake \ bash:${PORTSDIR}/shells/bash \ gsed:${PORTSDIR}/textproc/gsed -USES= perl5 +USES= perl5 shebangfix USE_PERL5= build -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= * - -PLIST_SUB+= PORTVERSION="${PORTVERSION}" - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} -USE_TEX= latex:build dvipsk:build -.endif - -USES= shebangfix - SHEBANG_LANG= icmake icmake_OLD_CMD= /usr/bin/icmake icmake_CMD= ${LOCALBASE}/bin/icmake @@ -57,6 +41,21 @@ SHEBANG_FILES= ${WRKSRC}/macros/rawmacros/create \ ${WRKSRC}/scripts/yodl2whatever.in \ ${WRKSRC}/build +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} +PORTDOCS= * + +PLIST_SUB+= PORTVERSION="${PORTVERSION}" + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +OPTIONS_DEFINE= DOCS + +.include + +.if ${PORT_OPTIONS:MDOCS} +USE_TEX= latex:build dvipsk:build +.endif + post-patch: @${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \ s|"/share/yodl"|"/share/${PORTNAME}-${PORTVERSION}"| ; \ diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index d50ae8514400..e10af3a95b2b 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -29,7 +29,6 @@ USES= pkgconfig USE_BZIP2= yes USE_PYTHON= yes USE_XORG= x11 xtst xfixes xcomposite xdamage xrandr -USES= pkgconfig USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= xpra_all