From 66e0552abe20cc25d0a7459df8e311ea2400237b Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Fri, 13 Dec 2002 05:19:44 +0000
Subject: update the gEDA suite of tools to the 20021103 release.

This represents many many improvements and bug fixes.  A few items to
note are that the attributes used by the symbol library have been
greately cleaned up and unified.  You may want to run gsymupdate and gschemupdate
if migrating from older versions of the tools.
---
 cad/gnetlist/Makefile         |  9 +++---
 cad/gnetlist/distinfo         |  7 ++---
 cad/gnetlist/patches/patch-ab | 71 -------------------------------------------
 3 files changed, 7 insertions(+), 80 deletions(-)
 delete mode 100644 cad/gnetlist/patches/patch-ab

(limited to 'cad/gnetlist')

diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 61c4a22d14f..0f0e6851fb0 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/10/14 09:59:30 rh Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/13 05:19:49 dmcmahill Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
-PKGREVISION=		2
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
@@ -15,9 +14,8 @@ HOMEPAGE=		http://www.geda.seul.org/
 COMMENT=		Netlist generation program
 
 DIST_SUBDIR=		geda
-PKGVERSION=		20020414
+PKGVERSION=		20021103
 
-DEPENDS+=		libgeda-${PKGVERSION}:../../cad/libgeda
 DEPENDS+=		geda-symbols-${PKGVERSION}:../../cad/geda-symbols
 # needs GNU m4 for the PCBboard netlister
 DEPENDS+=		m4-1.4:../../devel/m4
@@ -28,7 +26,7 @@ GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
-
+USE_BUILDLINK2=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 post-patch:
@@ -37,4 +35,5 @@ post-patch:
 		${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm
 	${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak
 
+.include "../../cad/libgeda/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 329d3f27182..041e94923f4 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/06/01 20:11:55 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2002/12/13 05:19:49 dmcmahill Exp $
 
-SHA1 (geda/geda-gnetlist-20020414.tar.gz) = f568fc3dc198046d7865b38d99a9de36d47f17fb
-Size (geda/geda-gnetlist-20020414.tar.gz) = 236941 bytes
+SHA1 (geda/geda-gnetlist-20021103.tar.gz) = 7fe02e7d0bb0539df584c1b6b6f86c8f9d25819b
+Size (geda/geda-gnetlist-20021103.tar.gz) = 253431 bytes
 SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293
-SHA1 (patch-ab) = 7546a526795b2e42c0fe716030c3e0c93687e4c3
diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab
deleted file mode 100644
index 44d9af9d672..00000000000
--- a/cad/gnetlist/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/05/31 15:51:44 dmcmahill Exp $
-
-use sh(1) and awk(1) not bash(1) and gawk(1).  Also use short options for
-head(1) and tail(1).
-
---- src/gschem2pcb.orig	Fri Apr 21 16:48:38 2000
-+++ src/gschem2pcb
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -43,7 +43,7 @@
- 	fi
- 
- # Search for the beginning of the filename assuming it ends by .sch
--FILENAME=`echo "$1" | sed 's/.sch//g' -`
-+FILENAME=`echo "$1" | sed 's/.sch//g' `
- PCBFILENAME=$FILENAME.pcb
- 
- # test if a .pcb file exists
-@@ -59,7 +59,7 @@
- 	gnetlist -g PCB -o $NETFILENAME $1  
- 	gnetlist -g PCBboard -o $PCBTEMPFILENAME $1 
- 	echo
--	gawk 'BEGIN {FS=","}
-+	awk 'BEGIN {FS=","}
- 		/^PKG_*/{
- 		footprint=$1
- 		sub(/PKG_/,"",footprint)
-@@ -68,23 +68,23 @@
- 		value=substr($3,0,length($3)-1)
- 		printf("Error: the footprint %s for the device %s does not exist\n",footprint,$2,value)
- 		}' $PCBTEMPFILENAME
--	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
--	gawk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
--	UREF=`diff $NEWLISTFILE $LISTFILE | gawk '/</{printf("%s\n",$2)}' -`
-+	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBFILENAME|sort > $LISTFILE
-+	awk '/^Element\(.*/{printf("%s\t%s\t\n",$3,$4)}' $PCBTEMPFILENAME|sort > $NEWLISTFILE
-+	UREF=`diff $NEWLISTFILE $LISTFILE | awk '/</{printf("%s\n",$2)}' -`
- 	#Search for UREF if $PCBTEMPFILENAME and create $PCBNEWFILENAME
- 	#Header of the pcb file
--	head --lines 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
-+	head -n 5 $PCBTEMPFILENAME > $PCBNEWFILENAME
- 	for f in `echo $UREF`; do
- 		echo "Find new element $f"
--		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' -`
--		gawk -v line=$LINE '{if (NR>=line)
-+		LINE=`grep -n $f $PCBTEMPFILENAME|sed 's/:.*$//g' `
-+		awk -v line=$LINE '{if (NR>=line)
- 					{print
- 					if ($1==")") exit}
- 					}' $PCBTEMPFILENAME >> $PCBNEWFILENAME
- 					
- 	done
- 	# End of the pcb file
--	tail --lines 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
-+	tail -n 24 $PCBTEMPFILENAME >> $PCBNEWFILENAME
- 	
- 	# Un peu de ménage (in french in the texte)
- 	rm $PCBTEMPFILENAME $NEWLISTFILE $LISTFILE
-@@ -96,7 +96,7 @@
- 	gnetlist -g PCB -o $NETFILENAME $1 
- 	gnetlist -g PCBboard -o $PCBFILENAME $1 
- 	# Test if a footprint has not been found
--	gawk 'BEGIN {FS=","}
-+	awk 'BEGIN {FS=","}
- 		/^PKG_*/{
- 		footprint=$1
- 		sub(/PKG_/,"",footprint)
-- 
cgit v1.2.3