summaryrefslogtreecommitdiff
path: root/cad
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 /cad
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 'cad')
-rw-r--r--cad/gattrib/Makefile4
-rw-r--r--cad/geda-utils/Makefile5
-rw-r--r--cad/geda/Makefile4
-rw-r--r--cad/gnetlist/Makefile7
-rw-r--r--cad/gschem/Makefile4
-rw-r--r--cad/gsmc/Makefile5
-rw-r--r--cad/gsymcheck/Makefile4
-rw-r--r--cad/libgeda/Makefile4
-rw-r--r--cad/transcalc/Makefile5
9 files changed, 19 insertions, 23 deletions
diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile
index 092e94cd96a..df9688a0991 100644
--- a/cad/gattrib/Makefile
+++ b/cad/gattrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
DISTNAME= geda-gattrib-${PKGVERSION}
PKGNAME= gattrib-${PKGVERSION}
@@ -12,9 +12,9 @@ COMMENT= Attribute editor for gEDA
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
+USE_TOOLS+= pkg-config
.include "../../x11/gtk2/buildlink3.mk"
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 124b919cd91..fabf954c4b6 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
@@ -20,7 +20,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
# let (f)lex rebuild this file. The distributed one doesn't
# always work.
@@ -42,5 +42,4 @@ REPLACE_PERL+= scripts/pads_backannotate \
scripts/sarlacc_sym
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index b1af1127d5a..5dcfa1e7b51 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-${PKGVERSION}
@@ -20,11 +20,11 @@ DEPENDS+= geda-examples-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-examples
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../cad/libgeda/buildlink3.mk"
.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/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 072a29c164a..ccf7eeef17c 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -11,7 +11,7 @@ COMMENT= Netlist generation program
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
# needs GNU m4 for the PCBboard netlister
-USE_TOOLS+= gm4:run
+USE_TOOLS+= gm4:run pkg-config
.include "../../cad/geda/Makefile.common"
@@ -19,7 +19,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EVAL_PREFIX+= PCBDIR=pcb
@@ -35,5 +35,4 @@ post-patch:
.endfor
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index bdc34031473..c8a36c453b1 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gschem-${PKGVERSION}
@@ -16,6 +16,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
USE_MAKEINFO= YES
INFO_FILES= gschemdoc.info
@@ -23,5 +24,4 @@ INFO_FILES= gschemdoc.info
.include "../../cad/libgeda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libstroke/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index c91cc5b51d4..deac87627e2 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= gsmc-1.1
@@ -13,9 +13,8 @@ COMMENT= Smith charting program
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
# The following were just links in the distfile so
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 8b1ecda9c47..db8efb1f091 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gsymcheck-${PKGVERSION}
@@ -18,7 +18,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+USE_TOOLS+= pkg-config
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index bac98bc9316..7cdd28dbd38 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= libgeda-${PKGVERSION}
@@ -14,10 +14,10 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
INFO_FILES= libgedadoc.info
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgdgeda/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 6d3e06647ed..cba2b044f29 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= transcalc-0.14
@@ -11,9 +11,8 @@ HOMEPAGE= http://transcalc.sourceforge.net/
COMMENT= Transmission line analysis/synthesis
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
#.include "../../graphics/imlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"