svn commit: r316950 - in head: emulators/open-vm-tools mail/spmfilter-clamav mail/spmfilter-spamassassin sysutils/rsyslog7 x11/gnome-libs x11/mlterm x11/wbarconf

[Bryan Drewery]

Author: bdrewery
Date: Tue Apr 30 16:37:46 2013
New Revision: 316950
URL: http://svnweb.freebsd.org/changeset/ports/316950

Log:
  - Fix cases where 2 USES= were used
  
  With hat:	portmgr

Modified:
  head/emulators/open-vm-tools/Makefile
  head/mail/spmfilter-clamav/Makefile
  head/mail/spmfilter-spamassassin/Makefile
  head/sysutils/rsyslog7/Makefile
  head/x11/gnome-libs/Makefile
  head/x11/mlterm/Makefile
  head/x11/wbarconf/Makefile

Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/emulators/open-vm-tools/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -51,7 +51,7 @@ CONFLICTS=		open-vm-tools-nox11-[0-9]*
 .endif
 
 .if !defined(WITHOUT_FUSE)
-USES=		fuse
+USES+=		fuse
 PLIST_SUB+=	FUSE=""
 .else
 PLIST_SUB+=	FUSE="@comment "

Modified: head/mail/spmfilter-clamav/Makefile
==============================================================================
--- head/mail/spmfilter-clamav/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/mail/spmfilter-clamav/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -14,12 +14,11 @@ BUILD_DEPENDS=	spmfilter>=0.4:${PORTSDIR
 
 RUN_DEPENDS=	spmfilter>=0.4:${PORTSDIR}/mail/spmfilter
 
-USES=		cmake
+USES=		cmake pkgconfig
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
 
 USE_LDCONFIG=	${PREFIX}/lib/spmfilter
-USES=		pkgconfig
 
 OPTIONS=	DEBUG	"Enable Debugging"	off
 

Modified: head/mail/spmfilter-spamassassin/Makefile
==============================================================================
--- head/mail/spmfilter-spamassassin/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/mail/spmfilter-spamassassin/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -13,12 +13,11 @@ COMMENT=	Spamassassin plugin for spmfilt
 BUILD_DEPENDS=	spmfilter>=0.4:${PORTSDIR}/mail/spmfilter
 RUN_DEPENDS=	spmfilter>=0.4:${PORTSDIR}/mail/spmfilter
 
-USES=		cmake
+USES=		cmake pkgconfig
 CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
 
 USE_LDCONFIG=	${PREFIX}/lib/spmfilter
-USES=		pkgconfig
 
 OPTIONS=	DEBUG	"Enable Debugging"	off
 

Modified: head/sysutils/rsyslog7/Makefile
==============================================================================
--- head/sysutils/rsyslog7/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/sysutils/rsyslog7/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -75,7 +75,7 @@ PLIST_FILES+=	lib/rsyslog/ompgsql.so \
 
 .if ${PORT_OPTIONS:MRELP}
 LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
-USES=		pkgconfig
+USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.la \
 		lib/rsyslog/imrelp.so \
@@ -85,7 +85,7 @@ PLIST_FILES+=	lib/rsyslog/imrelp.la \
 
 .if ${PORT_OPTIONS:MRFC3195}
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
-USES=		pkgconfig
+USES+=		pkgconfig
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.la \
 		lib/rsyslog/im3195.so

Modified: head/x11/gnome-libs/Makefile
==============================================================================
--- head/x11/gnome-libs/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/x11/gnome-libs/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -16,12 +16,11 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSD
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USES=		charsetfix gettext
+USES=		charsetfix gettext pathfix
 USE_BZIP2=	yes
 USE_XORG=	xpm ice x11
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USES=		pathfix gettext
 USE_GNOME=	gnomehier gnomeprefix esound gtk12 imlib libxml orbit
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

Modified: head/x11/mlterm/Makefile
==============================================================================
--- head/x11/mlterm/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/x11/mlterm/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -111,7 +111,6 @@ LIB_DEPENDS+=	utempter:${PORTSDIR}/sysut
 .endif
 
 USE_LDCONFIG=	yes
-USES=		gettext
 
 MAN1=	mlterm.1 mlclient.1
 

Modified: head/x11/wbarconf/Makefile
==============================================================================
--- head/x11/wbarconf/Makefile	Tue Apr 30 16:35:19 2013	(r316949)
+++ head/x11/wbarconf/Makefile	Tue Apr 30 16:37:46 2013	(r316950)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wbarconf
-# Date created:		21 may 2009
-# Whom:			Olivier Cochard-Labbe <olivier at cochard.me>
-#
+# Created by: Olivier Cochard-Labbe <olivier at cochard.me>
 # $FreeBSD$
-#
 
 PORTNAME=	wbarconf
 PORTVERSION=	0.7.2.2
@@ -22,7 +18,6 @@ USES=		gettext
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	README COPYING
-USES=		gettext
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin