From 6afb8198749beaa98363b79a8e476a25879c7c43 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Sat, 1 Jun 2002 20:11:55 +0000
Subject: add PKG_SYSCONFDIR/pcb, $HOME/.pcb and . to the search path for PCB
 m4 files.  In addition sinclude the files 'site-config.inc',
 'user-config.inc', and 'proj-config.inc' to allow for per-site, per-user, and
 per-project configuration instead of only per-site configuration. This is
 essential for use by non-sysadmin users and users who need to keep project
 specific setups.

---
 cad/gnetlist/Makefile         | 10 ++++++++--
 cad/gnetlist/distinfo         |  4 ++--
 cad/gnetlist/patches/patch-aa |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'cad/gnetlist')

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 67b51e94a4c..a5f3e5a9431 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/05/31 15:51:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2002/06/01 20:11:55 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -31,4 +31,10 @@ USE_GMAKE=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+post-patch:
+	${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+	${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \
+		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
+	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index fec816192e7..329d3f27182 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/05/31 15:51:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/06/01 20:11:55 dmcmahill Exp $
 
 SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb
 Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes
-SHA1 (patch-aa) = 2ec0c4ae6743f79b2d905c98d634cebb77bbc7d7
+SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293
 SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3
diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa
index 1af901dc1f7..a6930e11cdc 100644
--- a/cad/gnetlist/patches/patch-aa
+++ b/cad/gnetlist/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/31 15:51:44 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2002/06/01 20:11:55 dmcmahill Exp $
 
 needs GNU m4
 
@@ -9,7 +9,7 @@ needs GNU m4
  ;;  (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  ;; Fixed pipe command (AVH 1/27/02)
 -   (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
-+   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename))))
++   (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename))))
  
  
         ;; packages is a list with the different uref value
-- 
cgit v1.2.3