From 0e11add0b7b94813d0e59400609d160c09923e00 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 22 May 2005 20:51:45 +0000
Subject: Remove explicit dependencies on the GNU m4 package with USE_TOOLS+=m4
 and appropriate TOOLS_DEPMETHOD.gm4 settings.

---
 cad/gnetlist/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cad')

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 42fd6f27480..8979bb8a340 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:51:45 jlam Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -11,7 +11,8 @@ COMMENT=		Netlist generation program
 
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
-DEPENDS+=		m4>=1.4:../../devel/m4
+USE_TOOLS+=		gm4
+TOOLS_DEPMETHOD.gm4=	DEPENDS
 
 .include "../../cad/geda/Makefile.common"
 
@@ -23,12 +24,11 @@ USE_TOOLS+=		gmake
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 EVAL_PREFIX+=   PCBDIR=pcb
-M4DIR=	${LOCALBASE}
 
 post-patch:
 .for f in gnet-PCBboard.scm gnet-gsch2pcb.scm
 	${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak
-	${SED} -e 's;@M4@;${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4;g' \
+	${SED} -e 's;@M4@;${TOOLS_M4:Q};g' \
 	       -e 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
 	       -e 's;@pcb_m4dir@;${PCBDIR}/share/pcb/m4;g' \
 		${WRKSRC}/scheme/${f}.bak > ${WRKSRC}/scheme/${f}
-- 
cgit v1.2.3