Sweep pkgsrc and convert packages that included intltool/buildlink3.mk

to use instead "USE_TOOLS+=intltool".  Remove now unused
intltool/buildlink3.mk

4 files changed, 6 insertions, 49 deletions

diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index b98574c78ea..fd298eaacac 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/02 10:40:13 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/05 05:37:45 jlam Exp $
 #
 
 DISTNAME=	gnome-doc-utils-0.6.0
@@ -14,7 +14,7 @@ COMMENT=	Documentation utilities for the GNOME project
 DEPENDS+=	${PYPKGPREFIX}-libxml2>=2.6.16:../../textproc/py-libxml2
 DEPENDS+=	${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		intltool pkg-config
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -39,7 +39,6 @@ post-install:
 	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/share/xml2po
 
 .include "../../lang/python/application.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 7f9a93dfdeb..a040e8f57f6 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/22 10:18:55 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 05:37:45 jlam Exp $
 
 DISTNAME=	gnome-spell-1.0.6
 PKGREVISION=	5
@@ -13,7 +13,7 @@ COMMENT=	Spell checking as you type like gtkspell
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.3
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
@@ -25,6 +25,5 @@ BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
deleted file mode 100644
index fe69ecb166a..00000000000
--- a/textproc/intltool/buildlink3.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/12 10:27:37 rillig Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-INTLTOOL_BUILDLINK3_MK:=	${INTLTOOL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	intltool
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nintltool}
-BUILDLINK_PACKAGES+=	intltool
-
-.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.intltool+=	intltool>=0.34.1
-BUILDLINK_ABI_DEPENDS.intltool?=	intltool>=0.34.1nb2
-BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
-BUILDLINK_DEPMETHOD.intltool?=	build
-.endif	# INTLTOOL_BUILDLINK3_MK
-
-USE_TOOLS+=		perl
-
-.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-CONFIGURE_ENV+=		INTLTOOL_PERL=${PERL5:Q}
-INTLTOOLIZE=		${BUILDLINK_PREFIX.intltool}/bin/intltoolize
-INTLTOOL_OVERRIDE?=	intltool-* */intltool-*
-
-_CONFIGURE_POSTREQ+=	override-intltool
-
-.PHONY: override-intltool
-override-intltool:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO} "=> Overriding intltool."
-	@cd ${WRKSRC} && for f in ${INTLTOOL_OVERRIDE}; do		\
-	    if ${TEST} -f ${BUILDLINK_PREFIX.intltool}/bin/${f}; then	\
-	        ${CP} ${BUILDLINK_PREFIX.intltool}/bin/${f} ${f};	\
-	    fi;								\
-	done
-.endif	# INTLTOOL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 6f3aa91723a..e1ac4f385e1 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/06/15 20:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/05 05:37:45 jlam Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 DEPENDS+=		docbook-xml>=4.4nb4:../../textproc/docbook-xml
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake msgfmt
+USE_TOOLS+=		gmake intltool msgfmt
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -67,7 +67,6 @@ SUBST_SED.sc-gtfd=	-e s,scrollkeeper-get-toc-from-docpath\ ,${PREFIX}/bin/scroll
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 
 .include "../../mk/bsd.pkg.mk"