svn commit: r348280 - in head: comms/trustedqsl databases/rrdtool12 databases/slony1 deskutils/ganttproject editors/yzis games/briquolo games/pink-pony math/wfmath misc/gkrellshoot2 net-mgmt/ipplan...

Tijl Coosemans tijl at FreeBSD.org
Fri Mar 14 20:59:23 UTC 2014 

Author: tijl
Date: Fri Mar 14 20:59:20 2014
New Revision: 348280
URL: http://svnweb.freebsd.org/changeset/ports/348280
QAT: https://qat.redports.org/buildarchive/r348280/

Log:
  Fix double occurences of USES=

Modified:
  head/comms/trustedqsl/Makefile
  head/databases/rrdtool12/Makefile
  head/databases/slony1/Makefile
  head/deskutils/ganttproject/Makefile
  head/editors/yzis/Makefile
  head/games/briquolo/Makefile
  head/games/pink-pony/Makefile
  head/math/wfmath/Makefile
  head/misc/gkrellshoot2/Makefile
  head/net-mgmt/ipplan/Makefile
  head/textproc/yodl/Makefile
  head/x11/xpra/Makefile

Modified: head/comms/trustedqsl/Makefile
==============================================================================
--- head/comms/trustedqsl/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/comms/trustedqsl/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libdb-5.so:${PORTSDIR}/data
 
 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

Modified: head/databases/rrdtool12/Makefile
==============================================================================
--- head/databases/rrdtool12/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/databases/rrdtool12/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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

Modified: head/databases/slony1/Makefile
==============================================================================
--- head/databases/slony1/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/databases/slony1/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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 <bsd.port.options.mk>
 
 .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

Modified: head/deskutils/ganttproject/Makefile
==============================================================================
--- head/deskutils/ganttproject/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/deskutils/ganttproject/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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 sched
 
 LICENSE=	GPLv3
 
-USES=		shebangfix
+USES=		shebangfix zip
 SHEBANG_FILES=	ganttproject
-USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes

Modified: head/editors/yzis/Makefile
==============================================================================
--- head/editors/yzis/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/editors/yzis/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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}" \

Modified: head/games/briquolo/Makefile
==============================================================================
--- head/games/briquolo/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/games/briquolo/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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

Modified: head/games/pink-pony/Makefile
==============================================================================
--- head/games/pink-pony/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/games/pink-pony/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -23,7 +23,6 @@ LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphi
 USES=		pkgconfig
 USE_BZIP2=	yes
 USE_SCONS=	yes
-USES=		pkgconfig
 USE_GL=		gl glu
 USE_SDL=	mixer
 SUB_FILES=	pink-pony.sh

Modified: head/math/wfmath/Makefile
==============================================================================
--- head/math/wfmath/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/math/wfmath/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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 at FreeBSD.org
 COMMENT=	Worldforge math library
 
-USES=	gmake
-USES=	pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 GNU_CONFIGURE=	yes

Modified: head/misc/gkrellshoot2/Makefile
==============================================================================
--- head/misc/gkrellshoot2/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/misc/gkrellshoot2/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -16,7 +16,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/gkre
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2 \
 		import:${PORTSDIR}/graphics/ImageMagick
 
-USES=		pkgconfig
 PLIST_FILES=	libexec/gkrellm2/plugins/gkrellshoot.so
 WRKSRC=		${WRKDIR}/gkrellShoot-${PORTVERSION}
 

Modified: head/net-mgmt/ipplan/Makefile
==============================================================================
--- head/net-mgmt/ipplan/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/net-mgmt/ipplan/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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 track
 
 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

Modified: head/textproc/yodl/Makefile
==============================================================================
--- head/textproc/yodl/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/textproc/yodl/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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/
 		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 <bsd.port.options.mk>
-
-.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/rawmacro
 		${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 <bsd.port.options.mk>
+
+.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}"| ; \

Modified: head/x11/xpra/Makefile
==============================================================================
--- head/x11/xpra/Makefile	Fri Mar 14 20:10:26 2014	(r348279)
+++ head/x11/xpra/Makefile	Fri Mar 14 20:59:20 2014	(r348280)
@@ -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

More information about the svn-ports-head mailing list