svn commit: r322366 - in head: chinese/libchewing devel/m17n-db devel/m17n-lib editors/gummi games/gnudoku graphics/makehuman graphics/nathive net-mgmt/collectd5 print/libotf

[Baptiste Daroussin]

Author: bapt
Date: Sat Jul  6 07:59:09 2013
New Revision: 322366
URL: http://svnweb.freebsd.org/changeset/ports/322366

Log:
  Convert remanent USE_PKGCONFIG to USES=pkgconfig
  While here convert:
  USE_ICONV -> USES=iconv
  USE_GMAKE -> USES=gmake
  USE_GNOME=gnomehack -> USES=pathfix
  some post-patch to USES=pathfix

Modified:
  head/chinese/libchewing/Makefile
  head/devel/m17n-db/Makefile
  head/devel/m17n-lib/Makefile
  head/editors/gummi/Makefile
  head/games/gnudoku/Makefile
  head/graphics/makehuman/Makefile
  head/graphics/nathive/Makefile
  head/net-mgmt/collectd5/Makefile
  head/print/libotf/Makefile

Modified: head/chinese/libchewing/Makefile
==============================================================================
--- head/chinese/libchewing/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/chinese/libchewing/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -11,9 +11,7 @@ COMMENT=	The Chewing intelligent phoneti
 
 INFO=		libchewing
 
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack
-USE_PKGCONFIG=	yes
+USES=		gmake pkgconfig pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes

Modified: head/devel/m17n-db/Makefile
==============================================================================
--- head/devel/m17n-db/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/devel/m17n-db/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -15,8 +15,7 @@ EXTRACT_ONLY=	${M17N_DISTFILE}
 MAINTAINER=	nikola.lecic at anthesphoria.net
 COMMENT=	Data files for the m17n library
 
-USE_PKGCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-charmaps=${CHARMAPSDIR}
 

Modified: head/devel/m17n-lib/Makefile
==============================================================================
--- head/devel/m17n-lib/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/devel/m17n-lib/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -21,8 +21,8 @@ RUN_DEPENDS=	m17n-db>=1.6.4:${PORTSDIR}/
 
 MAKE_JOBS_UNSAFE=	yes
 
+USES=		pkgconfig
 USE_XORG=	ice sm x11 xaw xft xt
-USE_PKGCONFIG=	yes
 USE_GNOME=	libxml2
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes

Modified: head/editors/gummi/Makefile
==============================================================================
--- head/editors/gummi/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/editors/gummi/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -15,12 +15,10 @@ BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel
 LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
 		gtkspell:${PORTSDIR}/textproc/gtkspell
 
-USE_GMAKE=	yes
+USES=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_XORG=	xdamage xft xcursor xcomposite
 USE_GNOME=	desktopfileutils gtksourceview2 glib20 intlhack
-USE_PKGCONFIG=	build
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 

Modified: head/games/gnudoku/Makefile
==============================================================================
--- head/games/gnudoku/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/games/gnudoku/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -13,9 +13,8 @@ COMMENT=	A free program for creating and
 
 LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 MAKE_ENV=	CXXLAGS="${CXXFLAGS}"
-USE_PKGCONFIG=	build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX=|PREFIX?=|' ${WRKSRC}/Makefile

Modified: head/graphics/makehuman/Makefile
==============================================================================
--- head/graphics/makehuman/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/graphics/makehuman/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -13,9 +13,8 @@ COMMENT=	Application for parametrical mo
 LIB_DEPENDS=	animorph:${PORTSDIR}/graphics/animorph \
 		mhgui:${PORTSDIR}/graphics/mhgui
 
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PKGCONFIG=	build
 USE_GL=		glut
 
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/graphics/nathive/Makefile
==============================================================================
--- head/graphics/nathive/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/graphics/nathive/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_sou
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Lightweight image editor
 
+USES=		pkgconfig
 USE_GNOME=	glib20 gtk20
-USE_PKGCONFIG=	build
 ALL_TARGET=	default
 
 post-patch:

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/net-mgmt/collectd5/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -10,11 +10,10 @@ MASTER_SITES=	http://collectd.org/files/
 MAINTAINER=	ports at bsdserwis.com
 COMMENT=	Systems & network statistics collection daemon
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf autoheader automake libltdl
-WANT_GNOME=	yes
 
 LATEST_LINK=	collectd5
 
@@ -310,7 +309,7 @@ PLIST_SUB+=	RRDTOOL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSTATGRAB}
-USE_PKGCONFIG=	yes
+USES+=		pkgconfig
 LIB_DEPENDS+=	statgrab:${PORTSDIR}/devel/libstatgrab
 CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`"
 CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \

Modified: head/print/libotf/Makefile
==============================================================================
--- head/print/libotf/Makefile	Sat Jul  6 07:24:37 2013	(r322365)
+++ head/print/libotf/Makefile	Sat Jul  6 07:59:09 2013	(r322366)
@@ -12,14 +12,10 @@ COMMENT=	Library for handling OpenType f
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
+USES=		pathfix pkgconfig
 USE_XORG=	x11 xt xaw xmu
-USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>