Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18393 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 21 insertions, 42 deletions

diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index e7dfcc44d..ad1bbd660 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-doc-utils
-# Date created:				11 November 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.20.10
@@ -25,9 +21,8 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
 USE_XZ=		yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnomehack libxslt intlhack
-USE_PKGCONFIG=	build
+USES=		gettext pathfix pkgconfig
+USE_GNOME=	gnomehier libxslt intlhack
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 869cef56a..f2e4c6a7c 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	gtk-doc
-# Date created:				8 March 2001
-# Whom:					fenner
-#
+# Created by: fenner
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/textproc/gtk-doc/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gtk-doc
 PORTVERSION=	1.18
@@ -32,8 +29,8 @@ USE_XZ=		yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnomeprefix libxslt gnomedocutils
-USE_PKGCONFIG=	build
+USES=		pathfix pkgconfig
+USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index a91588c9c..d386a4afc 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	intltool
-# Date created:				19th January 2001
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
+# Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/intltool/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	intltool
 PORTVERSION=	0.50.2
@@ -18,7 +15,7 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 9b0f8eb6b..4086aca4d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	libxml2
-# Date created:				28 September 1998
-# Whom:					Yukihiro Nakai <Nakai@technologist.com>
-#
+# Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/textproc/libxml2/Makefile 17268 2013-04-01 05:13:11Z marcus $
 #
 # WITHOUT_SCHEMA disable XML schema support
 # WITHOUT_THREADS disable threads support
@@ -28,10 +25,8 @@ COMMENT?=	XML parser library for GNOME
 USE_CSTD=	gnu89
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME?=	gnomehack
-USE_PKGCONFIG=	build
+USES=		iconv pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index cd4136816..018242cba 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	py-libxml2
-# Date created:				30 Jun 2004
-# Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
-#
+#   $MCom$
 
 PORTREVISION=	0
 CATEGORIES=	textproc gnome python
@@ -18,7 +15,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-USE_GNOME=	gnomehack libxml2
+USES=		pathfix
+USE_GNOME=	libxml2
 USE_PYTHON=	yes
 CPPFLAGS+=	`${PYTHON_VERSION}-config --cflags`
 LDFLAGS+=	`${PYTHON_VERSION}-config --libs`
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index 3c9da00e0..5caa70974 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/yelp-tools/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	yelp-tools
 PORTVERSION=	3.4.1
@@ -14,11 +14,9 @@ COMMENT=	Utilities to help manage documentation for Yelp and the web
 BUILD_DEPENDS=	yelp-xsl>=3.1.5:${PORTSDIR}/textproc/yelp-xsl \
 		itstool:${PORTSDIR}/textproc/itstool
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		pathfix
-USE_PKGCONFIG=	build
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index 6256661ca..1598df90f 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/yelp-xsl/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	yelp-xsl
 PORTVERSION=	3.4.2
@@ -13,7 +13,6 @@ COMMENT=	DocBook XSLT stylesheets for yelp
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-#USE_GETTEXT=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
 USES=		pathfix