summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorjlam <jlam>2005-05-22 20:28:47 +0000
committerjlam <jlam>2005-05-22 20:28:47 +0000
commit2ddbb8afaecc884b415390bb8b7a524e329f125f (patch)
tree241d2823c401d78f7a7f1c2fef687b213864c459 /cad
parentc25a2f8043e1d06b71df110f50dc25cac286d4ad (diff)
downloadpkgsrc-2ddbb8afaecc884b415390bb8b7a524e329f125f.tar.gz
Replace explicit build dependencies on bison and manipulations on the
YACC variable with USE_TOOLS+=bison.
Diffstat (limited to 'cad')
-rw-r--r--cad/pcb-current/Makefile17
-rw-r--r--cad/verilog-current/Makefile15
-rw-r--r--cad/verilog/Makefile12
3 files changed, 17 insertions, 27 deletions
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index e264f58c12c..376e668a320 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:28:47 jlam Exp $
#
DISTNAME= pcb-${SNAPDATE}
@@ -10,28 +10,23 @@ MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://pcb.sourceforge.net/
COMMENT= Printed circuit board layout system (development snapshot version)
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-DEPENDS+= m4>=1.4:../../devel/m4
DEPENDS+= tk>=8.3:../../x11/tk
PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS+= pcb-[0-9]*
-SNAPDATE= 20050315
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake lex
-USE_X11= yes
+SNAPDATE= 20050315
+GNU_CONFIGURE= yes
+USE_TOOLS+= bison gm4 gmake lex
+TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_X11= yes
INFO_FILES= pcb.info
.include "../../mk/bsd.prefs.mk"
-EVAL_PREFIX+= BISONDIR=bison
-EVAL_PREFIX+= M4DIR=m4
EVAL_PREFIX+= TKDIR=tk
-M4=${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
-YACC= ${BISONDIR}/bin/bison
CONFIGURE_ENV+= WISH=${TKDIR}/bin/wish
.if ${XAW_TYPE} == "xpm"
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 7ce1e16b607..d11cc15c710 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:28:47 jlam Exp $
#
DISTNAME= verilog-${SNAPDATE}
@@ -14,15 +14,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS+= verilog-[0-9]*
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-
-SNAPDATE= 20041004
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake lex
+SNAPDATE= 20041004
+GNU_CONFIGURE= yes
+USE_TOOLS+= bison gmake lex
CONFIGURE_ARGS+= --without-ipal
-YACC= ${LOCALBASE}/bin/bison
-TEST_DIRS= ${WRKSRC}
-TEST_TARGET= check
+TEST_DIRS= ${WRKSRC}
+TEST_TARGET= check
.include "../../devel/zlib/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index 05782e359c7..2155d2aa7aa 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:28:47 jlam Exp $
#
DISTNAME= verilog-0.8.1
@@ -11,16 +11,14 @@ COMMENT= Verilog simulation and synthesis tool (stable release version)
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-
CONFLICTS+= verilog-current-[0-9]*
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake lex
+GNU_CONFIGURE= yes
+USE_TOOLS+= bison gmake lex
CONFIGURE_ARGS+= --without-ipal
YACC= ${LOCALBASE}/bin/bison
-TEST_DIRS= ${WRKSRC}
-TEST_TARGET= check
+TEST_DIRS= ${WRKSRC}
+TEST_TARGET= check
.include "../../devel/zlib/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"