summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-08-10 20:56:10 +0000
committerjlam <jlam@pkgsrc.org>2005-08-10 20:56:10 +0000
commit7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f (patch)
tree4d8a0ec4125811389b8272e1e14bc12417f9448c /print
parent50dfb1eae01aa73de001b1546218ed750ef35575 (diff)
downloadpkgsrc-7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f.tar.gz
Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That
file's sole purpose was to provide a dependency on pkg-config and set some environment variables. Instead, turn pkg-config into a "tool" in the tools framework, where the pkg-config wrapper automatically adds PKG_CONFIG_LIBDIR to the environment before invoking the real pkg-config. For all package Makefiles that included pkg-config/buildlink3.mk, remove that inclusion and replace it with USE_TOOLS+=pkg-config.
Diffstat (limited to 'print')
-rw-r--r--print/ggv2/Makefile5
-rw-r--r--print/glabels/Makefile5
-rw-r--r--print/gpdf/Makefile5
-rw-r--r--print/imposter/Makefile5
-rw-r--r--print/libgnomecups/Makefile4
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprintui/Makefile5
7 files changed, 14 insertions, 20 deletions
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 8bfe9cd0903..acd3d5ed485 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= ggv-2.8.4
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GCONF2_SCHEMAS= ggv.schemas
@@ -24,7 +24,6 @@ GCONF2_SCHEMAS= ggv.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 676eed77d68..231193b1e12 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= glabels-2.0.2
@@ -13,12 +13,11 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 9680d303a54..8d6f0cd54a2 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gpdf-2.10.0
@@ -13,7 +13,7 @@ COMMENT= GNOME 2 version of xpdf
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -27,7 +27,6 @@ GCONF2_SCHEMAS= gpdf.schemas
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index 1478404ba89..bbf9d3842ef 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= imposter-0.2
@@ -13,10 +13,9 @@ COMMENT= Standalone OpenOffice presentations viewer using GTK2
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 6c476a93b1f..b686d69ab95 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomecups-0.2.0
@@ -9,6 +9,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME interface to CUPS
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -16,7 +17,6 @@ PKGCONFIG_OVERRIDE= libgnomecups-1.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/cups/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 9e84fb99ea4..5969082117f 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomeprint-2.10.3
@@ -12,7 +12,7 @@ COMMENT= Library for the GNOME2 Printing Architecture
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -52,7 +52,6 @@ PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; }
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index df8783ce4ab..dce6fbdf46e 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomeprintui-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
@@ -28,7 +28,6 @@ BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.10.2
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"