8 files changed, 116 insertions, 72 deletions

diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 09e0daae0763..610eecda074f 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20050313
-PORTREVISION=	1
+PORTVERSION=	20060123
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,7 +16,7 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
 GNU_CONFIGURE=	yes
diff --git a/cad/geda-netlist/distinfo b/cad/geda-netlist/distinfo
index 3e255bf92262..0901f5faa070 100644
--- a/cad/geda-netlist/distinfo
+++ b/cad/geda-netlist/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gnetlist-20050313.tar.gz) = 0d7f0c0feecdbbc1eb8d4ba174551051
-SHA256 (geda-gnetlist-20050313.tar.gz) = 3aa100aca2f539d513132451f32d317c0b32a0ef92c5d97b0cfed01c7e4e6f84
-SIZE (geda-gnetlist-20050313.tar.gz) = 317092
+MD5 (geda-gnetlist-20060123.tar.gz) = b976e9dac5764844ae79892cfdc3d6a4
+SHA256 (geda-gnetlist-20060123.tar.gz) = 80a437ba751981cdf7d85d39622263d8f2172b1dac0a2f19482e0fa065227f75
+SIZE (geda-gnetlist-20060123.tar.gz) = 323201
diff --git a/cad/geda-netlist/files/patch-src_Makefile.in b/cad/geda-netlist/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..244c25799ecf
--- /dev/null
+++ b/cad/geda-netlist/files/patch-src_Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	Tue Jan 24 06:24:35 2006
++++ src/Makefile.in	Mon Jun 26 02:55:21 2006
+@@ -194,7 +194,7 @@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lgeda
+ DIST_SOURCES = $(gnetlist_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnetlist_SOURCES)
+@@ -234,7 +234,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ gnetlist$(EXEEXT): $(gnetlist_OBJECTS) $(gnetlist_DEPENDENCIES) 
+ 	@rm -f gnetlist$(EXEEXT)
+-	$(LINK) $(gnetlist_LDFLAGS) $(gnetlist_OBJECTS) $(gnetlist_LDADD) $(LIBS)
++	$(LINK) $(gnetlist_LDADD) $(gnetlist_LDFLAGS) $(LIBS) $(gnetlist_OBJECTS) 
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index fece6401e9f1..92d98afda06a 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -1,51 +1,54 @@
 bin/gnetlist
 bin/mk_verilog_syms
-bin/sw2asc
 bin/sch2eaglepos.sh
-share/doc/geda-doc/readmes/vams_mode.txt
-share/doc/geda-doc/readmes/syntax_architecture.txt
-share/doc/geda-doc/readmes/syntax_entity.txt
+bin/sw2asc
+share/doc/geda-doc/man/gnetlist.html
 share/doc/geda-doc/readmes/README.bom
+share/doc/geda-doc/readmes/README.eagle
 share/doc/geda-doc/readmes/README.pcb
 share/doc/geda-doc/readmes/README.switcap
+share/doc/geda-doc/readmes/README.sysc
 share/doc/geda-doc/readmes/README.verilog
 share/doc/geda-doc/readmes/README.vhdl
-share/doc/geda-doc/readmes/README.sysc
-share/doc/geda-doc/readmes/README.eagle
-share/doc/geda-doc/man/gnetlist.html
-share/gEDA/system-gnetlistrc
+share/doc/geda-doc/readmes/syntax_architecture.txt
+share/doc/geda-doc/readmes/syntax_entity.txt
+share/doc/geda-doc/readmes/vams_mode.txt
 share/gEDA/scheme/gnet-PCB.scm
-share/gEDA/scheme/gnet-allegro.scm
-share/gEDA/scheme/gnet-bom.scm
-share/gEDA/scheme/gnet-geda.scm
-share/gEDA/scheme/gnet-spice.scm
-share/gEDA/scheme/gnet-tango.scm
-share/gEDA/scheme/gnet-verilog.scm
-share/gEDA/scheme/gnet-vhdl.scm
-share/gEDA/scheme/gnet-vipec.scm
 share/gEDA/scheme/gnet-PCBboard.scm
-share/gEDA/scheme/gnet-pads.scm
-share/gEDA/scheme/gnetlist.scm
+share/gEDA/scheme/gnet-allegro.scm
 share/gEDA/scheme/gnet-bae.scm
-share/gEDA/scheme/gnet-protelII.scm
+share/gEDA/scheme/gnet-bom.scm
 share/gEDA/scheme/gnet-bom2.scm
-share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-drc.scm
-share/gEDA/scheme/gnet-vams.scm
+share/gEDA/scheme/gnet-drc2.scm
+share/gEDA/scheme/gnet-eagle.scm
+share/gEDA/scheme/gnet-futurenet2.scm
+share/gEDA/scheme/gnet-geda.scm
+share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-gsch2pcb.scm
+share/gEDA/scheme/gnet-maxascii.scm
+share/gEDA/scheme/gnet-pads.scm
 share/gEDA/scheme/gnet-partslist-common.scm
 share/gEDA/scheme/gnet-partslist1.scm
 share/gEDA/scheme/gnet-partslist2.scm
 share/gEDA/scheme/gnet-partslist3.scm
-share/gEDA/scheme/gnet-maxascii.scm
-share/gEDA/scheme/gnet-switcap.scm
-share/gEDA/scheme/gnet-spice-sdb.scm
-share/gEDA/scheme/gnet-drc2.scm
-share/gEDA/scheme/gnet-gsch2pcb.scm
-share/gEDA/scheme/gnet-futurenet2.scm
-share/gEDA/scheme/gnet-cascade.scm
+share/gEDA/scheme/gnet-pcbpins.scm
+share/gEDA/scheme/gnet-protelII.scm
 share/gEDA/scheme/gnet-redac.scm
+share/gEDA/scheme/gnet-spice-sdb.scm
+share/gEDA/scheme/gnet-spice.scm
+share/gEDA/scheme/gnet-switcap.scm
 share/gEDA/scheme/gnet-systemc.scm
-share/gEDA/scheme/gnet-eagle.scm
+share/gEDA/scheme/gnet-tango.scm
+share/gEDA/scheme/gnet-vams.scm
+share/gEDA/scheme/gnet-verilog.scm
+share/gEDA/scheme/gnet-vhdl.scm
+share/gEDA/scheme/gnet-vipec.scm
+share/gEDA/scheme/gnetlist.scm
+share/gEDA/system-gnetlistrc
+@dirrmtry share/gEDA/scheme
+@dirrmtry share/gEDA
 @dirrmtry share/doc/geda-doc/readmes
 @dirrmtry share/doc/geda-doc/man
-@dirrmtry share/gEDA/scheme
+@dirrmtry share/doc/geda-doc
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 09e0daae0763..610eecda074f 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20050313
-PORTREVISION=	1
+PORTVERSION=	20060123
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,7 +16,7 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
 GNU_CONFIGURE=	yes
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index 3e255bf92262..0901f5faa070 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gnetlist-20050313.tar.gz) = 0d7f0c0feecdbbc1eb8d4ba174551051
-SHA256 (geda-gnetlist-20050313.tar.gz) = 3aa100aca2f539d513132451f32d317c0b32a0ef92c5d97b0cfed01c7e4e6f84
-SIZE (geda-gnetlist-20050313.tar.gz) = 317092
+MD5 (geda-gnetlist-20060123.tar.gz) = b976e9dac5764844ae79892cfdc3d6a4
+SHA256 (geda-gnetlist-20060123.tar.gz) = 80a437ba751981cdf7d85d39622263d8f2172b1dac0a2f19482e0fa065227f75
+SIZE (geda-gnetlist-20060123.tar.gz) = 323201
diff --git a/cad/gnetlist/files/patch-src_Makefile.in b/cad/gnetlist/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..244c25799ecf
--- /dev/null
+++ b/cad/gnetlist/files/patch-src_Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.in.orig	Tue Jan 24 06:24:35 2006
++++ src/Makefile.in	Mon Jun 26 02:55:21 2006
+@@ -194,7 +194,7 @@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lgeda
+ DIST_SOURCES = $(gnetlist_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnetlist_SOURCES)
+@@ -234,7 +234,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ gnetlist$(EXEEXT): $(gnetlist_OBJECTS) $(gnetlist_DEPENDENCIES) 
+ 	@rm -f gnetlist$(EXEEXT)
+-	$(LINK) $(gnetlist_LDFLAGS) $(gnetlist_OBJECTS) $(gnetlist_LDADD) $(LIBS)
++	$(LINK) $(gnetlist_LDADD) $(gnetlist_LDFLAGS) $(LIBS) $(gnetlist_OBJECTS) 
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
index fece6401e9f1..92d98afda06a 100644
--- a/cad/gnetlist/pkg-plist
+++ b/cad/gnetlist/pkg-plist
@@ -1,51 +1,54 @@
 bin/gnetlist
 bin/mk_verilog_syms
-bin/sw2asc
 bin/sch2eaglepos.sh
-share/doc/geda-doc/readmes/vams_mode.txt
-share/doc/geda-doc/readmes/syntax_architecture.txt
-share/doc/geda-doc/readmes/syntax_entity.txt
+bin/sw2asc
+share/doc/geda-doc/man/gnetlist.html
 share/doc/geda-doc/readmes/README.bom
+share/doc/geda-doc/readmes/README.eagle
 share/doc/geda-doc/readmes/README.pcb
 share/doc/geda-doc/readmes/README.switcap
+share/doc/geda-doc/readmes/README.sysc
 share/doc/geda-doc/readmes/README.verilog
 share/doc/geda-doc/readmes/README.vhdl
-share/doc/geda-doc/readmes/README.sysc
-share/doc/geda-doc/readmes/README.eagle
-share/doc/geda-doc/man/gnetlist.html
-share/gEDA/system-gnetlistrc
+share/doc/geda-doc/readmes/syntax_architecture.txt
+share/doc/geda-doc/readmes/syntax_entity.txt
+share/doc/geda-doc/readmes/vams_mode.txt
 share/gEDA/scheme/gnet-PCB.scm
-share/gEDA/scheme/gnet-allegro.scm
-share/gEDA/scheme/gnet-bom.scm
-share/gEDA/scheme/gnet-geda.scm
-share/gEDA/scheme/gnet-spice.scm
-share/gEDA/scheme/gnet-tango.scm
-share/gEDA/scheme/gnet-verilog.scm
-share/gEDA/scheme/gnet-vhdl.scm
-share/gEDA/scheme/gnet-vipec.scm
 share/gEDA/scheme/gnet-PCBboard.scm
-share/gEDA/scheme/gnet-pads.scm
-share/gEDA/scheme/gnetlist.scm
+share/gEDA/scheme/gnet-allegro.scm
 share/gEDA/scheme/gnet-bae.scm
-share/gEDA/scheme/gnet-protelII.scm
+share/gEDA/scheme/gnet-bom.scm
 share/gEDA/scheme/gnet-bom2.scm
-share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-drc.scm
-share/gEDA/scheme/gnet-vams.scm
+share/gEDA/scheme/gnet-drc2.scm
+share/gEDA/scheme/gnet-eagle.scm
+share/gEDA/scheme/gnet-futurenet2.scm
+share/gEDA/scheme/gnet-geda.scm
+share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-gsch2pcb.scm
+share/gEDA/scheme/gnet-maxascii.scm
+share/gEDA/scheme/gnet-pads.scm
 share/gEDA/scheme/gnet-partslist-common.scm
 share/gEDA/scheme/gnet-partslist1.scm
 share/gEDA/scheme/gnet-partslist2.scm
 share/gEDA/scheme/gnet-partslist3.scm
-share/gEDA/scheme/gnet-maxascii.scm
-share/gEDA/scheme/gnet-switcap.scm
-share/gEDA/scheme/gnet-spice-sdb.scm
-share/gEDA/scheme/gnet-drc2.scm
-share/gEDA/scheme/gnet-gsch2pcb.scm
-share/gEDA/scheme/gnet-futurenet2.scm
-share/gEDA/scheme/gnet-cascade.scm
+share/gEDA/scheme/gnet-pcbpins.scm
+share/gEDA/scheme/gnet-protelII.scm
 share/gEDA/scheme/gnet-redac.scm
+share/gEDA/scheme/gnet-spice-sdb.scm
+share/gEDA/scheme/gnet-spice.scm
+share/gEDA/scheme/gnet-switcap.scm
 share/gEDA/scheme/gnet-systemc.scm
-share/gEDA/scheme/gnet-eagle.scm
+share/gEDA/scheme/gnet-tango.scm
+share/gEDA/scheme/gnet-vams.scm
+share/gEDA/scheme/gnet-verilog.scm
+share/gEDA/scheme/gnet-vhdl.scm
+share/gEDA/scheme/gnet-vipec.scm
+share/gEDA/scheme/gnetlist.scm
+share/gEDA/system-gnetlistrc
+@dirrmtry share/gEDA/scheme
+@dirrmtry share/gEDA
 @dirrmtry share/doc/geda-doc/readmes
 @dirrmtry share/doc/geda-doc/man
-@dirrmtry share/gEDA/scheme
+@dirrmtry share/doc/geda-doc