25 files changed, 371 insertions, 156 deletions

diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index dd24ae2393ee..a1b32cd5e91a 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -6,33 +6,28 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
 		http://www.tinkerbox.org/projects/files/gEDA/
-
-DISTNAME=       geda-${PORTNAME}-${PORTVERSION}
+DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools
 
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
 USE_LIBTOOL=	yes
-
-GNU_CONFIGURE=	yes
-AUTOCONF=	autoconf
-
 USE_GNOME=	gtk12
 CONFIGURE_ARGS=	--enable-gdgeda
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
+INFO=		gschemdoc
 MAN1=		gschem.1
 
 .include <bsd.port.mk>
diff --git a/cad/geda-gschem/distinfo b/cad/geda-gschem/distinfo
index cbb96c2ee697..8e0b89c00ea6 100644
--- a/cad/geda-gschem/distinfo
+++ b/cad/geda-gschem/distinfo
@@ -1 +1 @@
-MD5 (geda-gschem-20030223.tar.gz) = f0cb62fb9c9d403fd0c46d2231a109c4
+MD5 (geda-gschem-20040111.tar.gz) = 1826f8615615129883ab01d766877323
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index eed63043cf4b..9c25552e041c 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -1,33 +1,35 @@
 bin/gschem
-@unexec install-info --delete %D/info/gschemdoc.info %D/info/dir
-info/gschemdoc.info
-info/gschemdoc.info-1
-info/gschemdoc.info-2
-info/gschemdoc.info-3
-info/gschemdoc.info-4
-info/gschemdoc.info-5
-info/gschemdoc.info-6
-info/gschemdoc.info-7
-info/gschemdoc.info-8
-info/gschemdoc.info-9
-info/gschemdoc.info-10
-info/gschemdoc.info-11
-info/gschemdoc.info-12
-info/gschemdoc.info-13
-info/gschemdoc.info-14
-info/gschemdoc.info-15
-info/gschemdoc.info-16
-info/gschemdoc.info-17
-info/gschemdoc.info-18
-info/gschemdoc.info-19
-@exec install-info %D/info/gschemdoc.info %D/info/dir
+share/doc/geda-doc/man/gschem.html
+share/gEDA/system-gschemrc
+share/gEDA/gschem-gtkrc
+share/gEDA/gschem-lightbg
+share/gEDA/gschem-darkbg
+share/gEDA/scheme/auto-uref.scm
+share/gEDA/scheme/generate_netlist.scm
+share/gEDA/scheme/gschem.scm
+share/gEDA/scheme/list-keys.scm
+share/gEDA/scheme/print-NB-attribs.scm
+share/gEDA/bitmap/gschem-bus.xpm
+share/gEDA/bitmap/gschem-comp.xpm
+share/gEDA/bitmap/gschem-net.xpm
+share/gEDA/bitmap/gschem-new.xpm
+share/gEDA/bitmap/gschem-open.xpm
+share/gEDA/bitmap/gschem-redo.xpm
+share/gEDA/bitmap/gschem-save.xpm
+share/gEDA/bitmap/gschem-select.xpm
+share/gEDA/bitmap/gschem-undo.xpm
+share/gEDA/bitmap/gschem-edit.xpm
+share/gEDA/bitmap/gschem-text.xpm
+share/gEDA/bitmap/gschem-copy.xpm
+share/gEDA/bitmap/gschem-move.xpm
+share/gEDA/bitmap/gschem-delete.xpm
+share/gEDA/bitmap/gschem-rotate.xpm
+share/gEDA/bitmap/gschem-mirror.xpm
 share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
 share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
 share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
 share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
 share/locale/ru/LC_MESSAGES/geda-gschem.mo
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/de_DE/LC_MESSAGES
-@dirrm share/locale/nl_NL/LC_MESSAGES
-@dirrm share/locale/ja_JP/LC_MESSAGES
-@dirrm share/locale/ru/LC_MESSAGES
+@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrm share/gEDA/bitmap
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 6dc4b6b0b079..5490996a9e51 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,15 +16,11 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
 USE_LIBTOOL=	yes
-
-GNU_CONFIGURE=	yes
-AUTOCONF=	autoconf
-
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/geda-netlist/distinfo b/cad/geda-netlist/distinfo
index d83a471d54f3..f355d8975266 100644
--- a/cad/geda-netlist/distinfo
+++ b/cad/geda-netlist/distinfo
@@ -1 +1 @@
-MD5 (geda-gnetlist-20030223.tar.gz) = 0d8d72ec7765ee9e6aa9706392812bc9
+MD5 (geda-gnetlist-20040111.tar.gz) = 9bbeb64aea9455468d5aef16685a03de
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index 7dac45e34e35..be3668c70939 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -1,3 +1,47 @@
 bin/gnetlist
-bin/gschem2pcb
 bin/mk_verilog_syms
+bin/sw2asc
+bin/gschem2pcb
+share/doc/geda-doc/readmes/vams_mode.txt
+share/doc/geda-doc/readmes/syntax_architecture.txt
+share/doc/geda-doc/readmes/syntax_entity.txt
+share/doc/geda-doc/readmes/README.bom
+share/doc/geda-doc/readmes/README.pcb
+share/doc/geda-doc/readmes/README.switcap
+share/doc/geda-doc/readmes/README.verilog
+share/doc/geda-doc/readmes/README.vhdl
+share/doc/geda-doc/man/gnetlist.html
+share/gEDA/system-gnetlistrc
+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-bae.scm
+share/gEDA/scheme/gnet-protelII.scm
+share/gEDA/scheme/gnet-bom2.scm
+share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-drc.scm
+share/gEDA/scheme/gnet-vams.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-redac.scm
+@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
+@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 65c22d0f2de9..0ffbf6cf49d1 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geda-symbols
-PORTVERSION=	20030223
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,9 +16,10 @@ MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA symbols
 
 GNU_CONFIGURE=	yes
-AUTOCONF=	autoconf
-
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-install:
+	@${TOUCH} ${PREFIX}/share/gEDA/sym/local/.keep_me
+
 .include <bsd.port.mk>
diff --git a/cad/geda-symbols/distinfo b/cad/geda-symbols/distinfo
index 251a174608dc..d720dfe08a6f 100644
--- a/cad/geda-symbols/distinfo
+++ b/cad/geda-symbols/distinfo
@@ -1 +1 @@
-MD5 (geda-symbols-20030223.tar.gz) = d8fb0b742bcdcb6d95b3efc64e6f2cf0
+MD5 (geda-symbols-20040111.tar.gz) = 97ff0fa7bfabf150dc047c733d7b8c34
diff --git a/cad/geda-symbols/pkg-plist b/cad/geda-symbols/pkg-plist
index 7c479ed22b6a..f2f6c042dc26 100644
--- a/cad/geda-symbols/pkg-plist
+++ b/cad/geda-symbols/pkg-plist
@@ -1,4 +1,3 @@
-bin/gesym-config
 share/doc/geda-doc/nc.pdf
 share/gEDA/sym/4000/4000-1.sym
 share/gEDA/sym/4000/4000-2.sym
@@ -227,6 +226,7 @@ share/gEDA/sym/74/74125-1.sym
 share/gEDA/sym/74/74126-1.sym
 share/gEDA/sym/74/74131-1.sym
 share/gEDA/sym/74/74132-1.sym
+share/gEDA/sym/74/74133-1.sym
 share/gEDA/sym/74/74137-1.sym
 share/gEDA/sym/74/74138-1.sym
 share/gEDA/sym/74/74138-2.sym
@@ -268,6 +268,7 @@ share/gEDA/sym/74/74175-1.sym
 share/gEDA/sym/74/74181-1.sym
 share/gEDA/sym/74/74182-1.sym
 share/gEDA/sym/74/74189-1.sym
+share/gEDA/sym/74/74189-2.sym
 share/gEDA/sym/74/74190-1.sym
 share/gEDA/sym/74/74191-1.sym
 share/gEDA/sym/74/74191-2.sym
@@ -289,6 +290,7 @@ share/gEDA/sym/74/74244-1.sym
 share/gEDA/sym/74/74244-2.sym
 share/gEDA/sym/74/74245-1.sym
 share/gEDA/sym/74/74257-1.sym
+share/gEDA/sym/74/74259-1.sym
 share/gEDA/sym/74/74265-1.sym
 share/gEDA/sym/74/74265-2.sym
 share/gEDA/sym/74/74266-1.sym
@@ -300,6 +302,7 @@ share/gEDA/sym/74/7430-1.sym
 share/gEDA/sym/74/7430-2.sym
 share/gEDA/sym/74/7431-1.sym
 share/gEDA/sym/74/7432-1.sym
+share/gEDA/sym/74/7432-2.sym
 share/gEDA/sym/74/74367-1.sym
 share/gEDA/sym/74/74373-1.sym
 share/gEDA/sym/74/74374-1.sym
@@ -314,6 +317,7 @@ share/gEDA/sym/74/7448-1.sym
 share/gEDA/sym/74/7451-1.sym
 share/gEDA/sym/74/74520-1.sym
 share/gEDA/sym/74/74520-2.sym
+share/gEDA/sym/74/74520-3.sym
 share/gEDA/sym/74/7454-1.sym
 share/gEDA/sym/74/74541-1.sym
 share/gEDA/sym/74/7455-1.sym
@@ -323,8 +327,10 @@ share/gEDA/sym/74/74573-1.sym
 share/gEDA/sym/74/74574-1.sym
 share/gEDA/sym/74/74595-1.sym
 share/gEDA/sym/74/74673A-1.sym
+share/gEDA/sym/74/74673A-2.sym
 share/gEDA/sym/74/74684-1.sym
 share/gEDA/sym/74/74688-1.sym
+share/gEDA/sym/74/74688-2.sym
 share/gEDA/sym/74/7472-1.sym
 share/gEDA/sym/74/7473-1.sym
 share/gEDA/sym/74/7474-1.sym
@@ -470,6 +476,7 @@ share/gEDA/sym/analog/battery-2.sym
 share/gEDA/sym/analog/battery-3.sym
 share/gEDA/sym/analog/beeper-1.sym
 share/gEDA/sym/analog/bridge-1.sym
+share/gEDA/sym/analog/bridge-2.sym
 share/gEDA/sym/analog/capacitor-1.sym
 share/gEDA/sym/analog/capacitor-2.sym
 share/gEDA/sym/analog/capacitor-3.sym
@@ -479,8 +486,10 @@ share/gEDA/sym/analog/coil-1.sym
 share/gEDA/sym/analog/coil-2.sym
 share/gEDA/sym/analog/crystal-1.sym
 share/gEDA/sym/analog/current-1.sym
+share/gEDA/sym/analog/darlington_NPN-1.sym
 share/gEDA/sym/analog/dual-opamp-1.sym
 share/gEDA/sym/analog/fuse-1.sym
+share/gEDA/sym/analog/fuse-2.sym
 share/gEDA/sym/analog/glow-lamp-1.sym
 share/gEDA/sym/analog/inamp-1.sym
 share/gEDA/sym/analog/inductor-1.sym
@@ -495,9 +504,12 @@ share/gEDA/sym/analog/nmos-3.sym
 share/gEDA/sym/analog/npn-1.sym
 share/gEDA/sym/analog/npn-2.sym
 share/gEDA/sym/analog/npn-3.sym
+share/gEDA/sym/analog/npn-IGBT-1.sym
+share/gEDA/sym/analog/ntc-1.sym
 share/gEDA/sym/analog/opamp-1.sym
 share/gEDA/sym/analog/opamp-2.sym
 share/gEDA/sym/analog/photo-resistor-1.sym
+share/gEDA/sym/analog/photo-transistor-1.sym
 share/gEDA/sym/analog/photodiode-1.sym
 share/gEDA/sym/analog/pmos-1.sym
 share/gEDA/sym/analog/pmos-2.sym
@@ -505,6 +517,8 @@ share/gEDA/sym/analog/pmos-3.sym
 share/gEDA/sym/analog/pnp-1.sym
 share/gEDA/sym/analog/pnp-2.sym
 share/gEDA/sym/analog/pnp-3.sym
+share/gEDA/sym/analog/pot-1.sym
+share/gEDA/sym/analog/pot-2.sym
 share/gEDA/sym/analog/pot-bourns.sym
 share/gEDA/sym/analog/pwrxfmr-1.sym
 share/gEDA/sym/analog/quad_opamp-1.sym
@@ -520,19 +534,26 @@ share/gEDA/sym/analog/resistorpack4-1.sym
 share/gEDA/sym/analog/resistorpack5-1.sym
 share/gEDA/sym/analog/resistorpack6-1.sym
 share/gEDA/sym/analog/resistorpack7-1.sym
+share/gEDA/sym/analog/resistorpack7-2.sym
 share/gEDA/sym/analog/resistorpack8-1.sym
 share/gEDA/sym/analog/resistorpack8-2.sym
 share/gEDA/sym/analog/resistorpack9-1.sym
 share/gEDA/sym/analog/rpack-1.sym
 share/gEDA/sym/analog/speaker-1.sym
 share/gEDA/sym/analog/speaker-2.sym
+share/gEDA/sym/analog/testpt-1.sym
 share/gEDA/sym/analog/transformer-1.sym
+share/gEDA/sym/analog/transformer-2.sym
+share/gEDA/sym/analog/transformer-3.sym
+share/gEDA/sym/analog/transformer-4.sym
+share/gEDA/sym/analog/triac-1.sym
 share/gEDA/sym/analog/txo-1.sym
 share/gEDA/sym/analog/voltage-1.sym
 share/gEDA/sym/analog/voltage-2.sym
 share/gEDA/sym/analog/voltage-3.sym
 share/gEDA/sym/analog/voltmeter-1.sym
 share/gEDA/sym/connector/BNC-1.sym
+share/gEDA/sym/connector/DB15-1.sym
 share/gEDA/sym/connector/DB25-1.sym
 share/gEDA/sym/connector/DB25-2.sym
 share/gEDA/sym/connector/DB31-1.sym
@@ -551,7 +572,6 @@ share/gEDA/sym/connector/DIN41617C31-1.sym
 share/gEDA/sym/connector/ISA-98W-SOCKET-1.sym
 share/gEDA/sym/connector/MCX-1.sym
 share/gEDA/sym/connector/aui-1.sym
-share/gEDA/sym/connector/dip24-1.sym
 share/gEDA/sym/connector/connector10-1.sym
 share/gEDA/sym/connector/connector12-1.sym
 share/gEDA/sym/connector/connector15-1.sym
@@ -567,6 +587,7 @@ share/gEDA/sym/connector/connector5-1.sym
 share/gEDA/sym/connector/connector6-1.sym
 share/gEDA/sym/connector/connector8-1.sym
 share/gEDA/sym/connector/connector9-1.sym
+share/gEDA/sym/connector/dip24-1.sym
 share/gEDA/sym/connector/gpib-1.sym
 share/gEDA/sym/connector/header10-1.sym
 share/gEDA/sym/connector/header10-2.sym
@@ -577,18 +598,24 @@ share/gEDA/sym/connector/header20-2.sym
 share/gEDA/sym/connector/header20-3.sym
 share/gEDA/sym/connector/header22-1.sym
 share/gEDA/sym/connector/header26-1.sym
+share/gEDA/sym/connector/header26-2.sym
 share/gEDA/sym/connector/header3-1.sym
+share/gEDA/sym/connector/header32-2.sym
 share/gEDA/sym/connector/header34-1.sym
 share/gEDA/sym/connector/header40-2.sym
 share/gEDA/sym/connector/header50-1.sym
 share/gEDA/sym/connector/header50-2.sym
+share/gEDA/sym/connector/header50-3.sym
+share/gEDA/sym/connector/header50r-1.sym
 share/gEDA/sym/connector/header8-1.sym
 share/gEDA/sym/connector/header8-2.sym
 share/gEDA/sym/connector/jumper-1.sym
 share/gEDA/sym/connector/mains-plug-1.sym
 share/gEDA/sym/connector/mains-plug-2.sym
 share/gEDA/sym/connector/pwrjack-1.sym
+share/gEDA/sym/connector/rj45-1.sym
 share/gEDA/sym/connector/rs232-idc10.sym
+share/gEDA/sym/connector/smart-media-1.sym
 share/gEDA/sym/font/0.sym
 share/gEDA/sym/font/1.sym
 share/gEDA/sym/font/2.sym
@@ -599,33 +626,37 @@ share/gEDA/sym/font/6.sym
 share/gEDA/sym/font/7.sym
 share/gEDA/sym/font/8.sym
 share/gEDA/sym/font/9.sym
+share/gEDA/sym/font/A-acute-accent.sym
 share/gEDA/sym/font/A-diaeresis.sym
 share/gEDA/sym/font/A-ring.sym
 share/gEDA/sym/font/A.sym
 share/gEDA/sym/font/AE-lig.sym
 share/gEDA/sym/font/B.sym
 share/gEDA/sym/font/C.sym
-share/gEDA/sym/font/ChangeLog
 share/gEDA/sym/font/D.sym
+share/gEDA/sym/font/E-acute-accent.sym
 share/gEDA/sym/font/E.sym
 share/gEDA/sym/font/F.sym
 share/gEDA/sym/font/G.sym
 share/gEDA/sym/font/H.sym
+share/gEDA/sym/font/I-acute-accent.sym
 share/gEDA/sym/font/I.sym
 share/gEDA/sym/font/J.sym
 share/gEDA/sym/font/K.sym
 share/gEDA/sym/font/L.sym
 share/gEDA/sym/font/M.sym
+share/gEDA/sym/font/N-tilde.sym
 share/gEDA/sym/font/N.sym
-share/gEDA/sym/font/O-slash.sym
+share/gEDA/sym/font/O-acute-accent.sym
 share/gEDA/sym/font/O-diaeresis.sym
+share/gEDA/sym/font/O-slash.sym
 share/gEDA/sym/font/O.sym
 share/gEDA/sym/font/P.sym
 share/gEDA/sym/font/Q.sym
 share/gEDA/sym/font/R.sym
-share/gEDA/sym/font/README
 share/gEDA/sym/font/S.sym
 share/gEDA/sym/font/T.sym
+share/gEDA/sym/font/U-acute-accent.sym
 share/gEDA/sym/font/U-diaeresis.sym
 share/gEDA/sym/font/U.sym
 share/gEDA/sym/font/V.sym
@@ -633,14 +664,15 @@ share/gEDA/sym/font/W.sym
 share/gEDA/sym/font/X.sym
 share/gEDA/sym/font/Y.sym
 share/gEDA/sym/font/Z.sym
+share/gEDA/sym/font/a_-acute-accent.sym
 share/gEDA/sym/font/a_-diaeresis.sym
 share/gEDA/sym/font/a_-ring.sym
 share/gEDA/sym/font/a_.sym
 share/gEDA/sym/font/ae_-lig.sym
+share/gEDA/sym/font/at.sym
 share/gEDA/sym/font/amper.sym
 share/gEDA/sym/font/apost.sym
 share/gEDA/sym/font/astericks.sym
-share/gEDA/sym/font/at.sym
 share/gEDA/sym/font/b_.sym
 share/gEDA/sym/font/backslash.sym
 share/gEDA/sym/font/backtick.sym
@@ -651,12 +683,15 @@ share/gEDA/sym/font/colon.sym
 share/gEDA/sym/font/comma.sym
 share/gEDA/sym/font/d_.sym
 share/gEDA/sym/font/dollar.sym
+share/gEDA/sym/font/e_-acute-accent.sym
 share/gEDA/sym/font/e_.sym
 share/gEDA/sym/font/equal.sym
+share/gEDA/sym/font/excl-open.sym
 share/gEDA/sym/font/excl.sym
 share/gEDA/sym/font/f_.sym
 share/gEDA/sym/font/g_.sym
 share/gEDA/sym/font/h_.sym
+share/gEDA/sym/font/i_-acute-accent.sym
 share/gEDA/sym/font/i_.sym
 share/gEDA/sym/font/j_.sym
 share/gEDA/sym/font/k_.sym
@@ -668,7 +703,10 @@ share/gEDA/sym/font/lparen.sym
 share/gEDA/sym/font/m_.sym
 share/gEDA/sym/font/minus.sym
 share/gEDA/sym/font/more.sym
+share/gEDA/sym/font/n_-tilde.sym
 share/gEDA/sym/font/n_.sym
+share/gEDA/sym/font/newline.sym
+share/gEDA/sym/font/o_-acute-accent.sym
 share/gEDA/sym/font/o_-diaeresis.sym
 share/gEDA/sym/font/o_-slash.sym
 share/gEDA/sym/font/o_.sym
@@ -678,6 +716,7 @@ share/gEDA/sym/font/period.sym
 share/gEDA/sym/font/plus.sym
 share/gEDA/sym/font/pound.sym
 share/gEDA/sym/font/q_.sym
+share/gEDA/sym/font/quest-open.sym
 share/gEDA/sym/font/quest.sym
 share/gEDA/sym/font/quote.sym
 share/gEDA/sym/font/r_.sym
@@ -690,6 +729,7 @@ share/gEDA/sym/font/slash.sym
 share/gEDA/sym/font/space.sym
 share/gEDA/sym/font/t_.sym
 share/gEDA/sym/font/tilde.sym
+share/gEDA/sym/font/u_-acute-accent.sym
 share/gEDA/sym/font/u_-diaeresis.sym
 share/gEDA/sym/font/u_.sym
 share/gEDA/sym/font/under.sym
@@ -713,8 +753,10 @@ share/gEDA/sym/linear/TDA2822M-1.sym
 share/gEDA/sym/linear/ad633JN-1.sym
 share/gEDA/sym/linear/ad633JN-2.sym
 share/gEDA/sym/linear/ad633JR-1.sym
+share/gEDA/sym/linear/l200-1.sym
 share/gEDA/sym/linear/lm135-1.sym
 share/gEDA/sym/linear/lm1877-1.sym
+share/gEDA/sym/linear/lm2576T-1.sym
 share/gEDA/sym/linear/lm2822-1.sym
 share/gEDA/sym/linear/lm2822m-1.sym
 share/gEDA/sym/linear/lm2902-1.sym
@@ -722,7 +764,9 @@ share/gEDA/sym/linear/lm2941-1.sym
 share/gEDA/sym/linear/lm311-1.sym
 share/gEDA/sym/linear/lm317-1.sym
 share/gEDA/sym/linear/lm324-1.sym
+share/gEDA/sym/linear/lm337-1.sym
 share/gEDA/sym/linear/lm339-1.sym
+share/gEDA/sym/linear/lm339-2.sym
 share/gEDA/sym/linear/lm358-1.sym
 share/gEDA/sym/linear/lm386-1.sym
 share/gEDA/sym/linear/lm3909-1.sym
@@ -739,6 +783,7 @@ share/gEDA/sym/linear/lm7815-1.sym
 share/gEDA/sym/linear/lm7818-1.sym
 share/gEDA/sym/linear/lm7824-1.sym
 share/gEDA/sym/linear/lm7885-1.sym
+share/gEDA/sym/linear/lm7912-1.sym
 share/gEDA/sym/linear/lt1108-1.sym
 share/gEDA/sym/linear/lt1160-1.sym
 share/gEDA/sym/linear/lt1162-1.sym
@@ -751,16 +796,24 @@ share/gEDA/sym/linear/lt1782-1.sym
 share/gEDA/sym/linear/ltc1799-1.sym
 share/gEDA/sym/linear/ltc2400-1.sym
 share/gEDA/sym/linear/volt_reg_adj-1.sym
+share/gEDA/sym/local/.keep_me
 share/gEDA/sym/maxim/adc0820-1.sym
+share/gEDA/sym/maxim/adm202-1.sym
+share/gEDA/sym/maxim/adm202-2.sym
 share/gEDA/sym/maxim/max038-1.sym
+share/gEDA/sym/maxim/max038-2.sym
 share/gEDA/sym/maxim/max100-1.sym
 share/gEDA/sym/maxim/max1005-1.sym
+share/gEDA/sym/maxim/max1005-2.sym
 share/gEDA/sym/maxim/max1011-1.sym
+share/gEDA/sym/maxim/max1011-2.sym
 share/gEDA/sym/maxim/max101A-1.sym
 share/gEDA/sym/maxim/max1055-1.sym
 share/gEDA/sym/maxim/max1080-1.sym
 share/gEDA/sym/maxim/max1081-1.sym
 share/gEDA/sym/maxim/max1114-1.sym
+share/gEDA/sym/maxim/max1114-2.sym
+share/gEDA/sym/maxim/max1211-1.sym
 share/gEDA/sym/maxim/max135-1.sym
 share/gEDA/sym/maxim/max1407-1.sym
 share/gEDA/sym/maxim/max147-1.sym
@@ -809,6 +862,9 @@ share/gEDA/sym/maxim/max6018-1.sym
 share/gEDA/sym/maxim/max6314-1.sym
 share/gEDA/sym/maxim/max663-1.sym
 share/gEDA/sym/maxim/max664-1.sym
+share/gEDA/sym/maxim/max6674-1.sym
+share/gEDA/sym/maxim/max713-1.sym
+share/gEDA/sym/maxim/max7652-1.sym
 share/gEDA/sym/maxim/max807-1.sym
 share/gEDA/sym/maxim/max865EUA-1.sym
 share/gEDA/sym/maxim/max872-1.sym
@@ -823,6 +879,7 @@ share/gEDA/sym/memory/4164-1.sym
 share/gEDA/sym/memory/581000-1.sym
 share/gEDA/sym/memory/62256-1.sym
 share/gEDA/sym/memory/62256-2.sym
+share/gEDA/sym/memory/628512-1.sym
 share/gEDA/sym/memory/93Cx6-1.sym
 share/gEDA/sym/memory/HM6264P15-1.sym
 share/gEDA/sym/memory/N82S23N-1.sym
@@ -830,6 +887,7 @@ share/gEDA/sym/memory/ST39SF020A-1.sym
 share/gEDA/sym/memory/am27S13D-1.sym
 share/gEDA/sym/memory/am9128-1.sym
 share/gEDA/sym/micro/6821-1.sym
+share/gEDA/sym/micro/6821-2.sym
 share/gEDA/sym/micro/8031.sym
 share/gEDA/sym/micro/8052basic-1.sym
 share/gEDA/sym/micro/8086-1.sym
@@ -839,6 +897,7 @@ share/gEDA/sym/micro/8255A-1.sym
 share/gEDA/sym/micro/8259A-1.sym
 share/gEDA/sym/micro/ACE1202-1.sym
 share/gEDA/sym/micro/AT43USB320A.sym
+share/gEDA/sym/micro/AT89C2051-1.sym
 share/gEDA/sym/micro/AT89C51_DIP.sym
 share/gEDA/sym/micro/AT89C51_PLCC.sym
 share/gEDA/sym/micro/AT89C51_TQFP.sym
@@ -847,12 +906,12 @@ share/gEDA/sym/micro/AT90S1200.sym
 share/gEDA/sym/micro/AT90S2313.sym
 share/gEDA/sym/micro/AT90S2323.sym
 share/gEDA/sym/micro/AT90S2343.sym
+share/gEDA/sym/micro/AT90S8535.sym
 share/gEDA/sym/micro/AT90S4433_DIP.sym
 share/gEDA/sym/micro/AT90S4433_TQFP.sym
 share/gEDA/sym/micro/AT90S8515_DIP.sym
 share/gEDA/sym/micro/AT90S8515_PLCC.sym
 share/gEDA/sym/micro/AT90S8515_TQFP.sym
-share/gEDA/sym/micro/AT90S8535.sym
 share/gEDA/sym/micro/AT90S8535J-1.sym
 share/gEDA/sym/micro/AT90S8535P-1.sym
 share/gEDA/sym/micro/AT90S8535_DIP.sym
@@ -866,6 +925,7 @@ share/gEDA/sym/micro/ATmega163_TQFP.sym
 share/gEDA/sym/micro/ATmega323-1.sym
 share/gEDA/sym/micro/ATtiny11.sym
 share/gEDA/sym/micro/ATtiny12.sym
+share/gEDA/sym/micro/DS1602-1.sym
 share/gEDA/sym/micro/ATtiny28_DIP.sym
 share/gEDA/sym/micro/ATtiny28_TQFP.sym
 share/gEDA/sym/micro/DS2450-1.sym
@@ -874,6 +934,7 @@ share/gEDA/sym/micro/DS80C310-1.sym
 share/gEDA/sym/micro/DS80C310.sym
 share/gEDA/sym/micro/DS80C320-1.sym
 share/gEDA/sym/micro/DS80C320.sym
+share/gEDA/sym/micro/M41T00-SO8-1.sym
 share/gEDA/sym/micro/MSP430x11x1.sym
 share/gEDA/sym/micro/MSP430x11x2.sym
 share/gEDA/sym/micro/MSP430x12x.sym
@@ -886,6 +947,7 @@ share/gEDA/sym/micro/MSP430x44x.sym
 share/gEDA/sym/micro/TINIm390-RevD.sym
 share/gEDA/sym/micro/basicstamp-1.sym
 share/gEDA/sym/micro/mc68hc05j1a-1.sym
+share/gEDA/sym/micro/mc68hc705kj1-1.sym
 share/gEDA/sym/micro/mc68hc811e2fn-1.sym
 share/gEDA/sym/micro/mc68hc812a4-1.sym
 share/gEDA/sym/micro/mc68hc908gp32cp-1.sym
@@ -910,9 +972,12 @@ share/gEDA/sym/misc/AN82527.sym
 share/gEDA/sym/misc/DM9368.sym
 share/gEDA/sym/misc/FND5148-1.sym
 share/gEDA/sym/misc/HFA1100-1.sym
+share/gEDA/sym/misc/HIP4080A-1.sym
+share/gEDA/sym/misc/HIP4081A-1.sym
 share/gEDA/sym/misc/L293.sym
 share/gEDA/sym/misc/MAC160-1.sym
 share/gEDA/sym/misc/NE-592-1.sym
+share/gEDA/sym/misc/PCF8563-1.sym
 share/gEDA/sym/misc/PCF8591.sym
 share/gEDA/sym/misc/PCM2702E-1.sym
 share/gEDA/sym/misc/QT60040-1.sym
@@ -933,6 +998,8 @@ share/gEDA/sym/misc/interpage_bidir-1.sym
 share/gEDA/sym/misc/interpage_from-1.sym
 share/gEDA/sym/misc/interpage_to-1.sym
 share/gEDA/sym/misc/mc1496-1.sym
+share/gEDA/sym/misc/mc3479-1.sym
+share/gEDA/sym/misc/mc3487-1.sym
 share/gEDA/sym/misc/mt8870-1.sym
 share/gEDA/sym/misc/nc-bottom-1.sym
 share/gEDA/sym/misc/nc-left-1.sym
@@ -941,9 +1008,11 @@ share/gEDA/sym/misc/nc-top-1.sym
 share/gEDA/sym/misc/osc-1.sym
 share/gEDA/sym/misc/osc-2.sym
 share/gEDA/sym/misc/si9200-1.sym
-share/gEDA/sym/misc/vicor_gen1.sym
+share/gEDA/sym/misc/tl062-1.sym
+share/gEDA/sym/misc/tl072-1.sym
+share/gEDA/sym/misc/tl082-1.sym
 share/gEDA/sym/misc/tl16c554afn-1.sym
-share/gEDA/sym/radio/README
+share/gEDA/sym/misc/vicor_gen1.sym
 share/gEDA/sym/radio/af_output_transformer-1.sym
 share/gEDA/sym/radio/if_trans_aircore-1.sym
 share/gEDA/sym/radio/loop_antenna-1.sym
@@ -966,6 +1035,7 @@ share/gEDA/sym/switch/switch-pushbutton-nc-2.sym
 share/gEDA/sym/switch/switch-pushbutton-no-1.sym
 share/gEDA/sym/switch/switch-pushbutton-spdt-1.sym
 share/gEDA/sym/switch/switch-spdt-1.sym
+share/gEDA/sym/switch/switch-spdt-2.sym
 share/gEDA/sym/switch/switch-spst-1.sym
 share/gEDA/sym/titleblock/cvstitleblock-1.sym
 share/gEDA/sym/titleblock/title-A.sym
@@ -996,7 +1066,14 @@ share/gEDA/sym/tube/50L6GT-1.sym
 share/gEDA/sym/spice/aop-spice-1.sym
 share/gEDA/sym/spice/cccs-1.sym
 share/gEDA/sym/spice/ccvs-1.sym
+share/gEDA/sym/spice/idc-1.sym
 share/gEDA/sym/spice/nullor-1.sym
+share/gEDA/sym/spice/spice-directive-1.sym
+share/gEDA/sym/spice/spice-include-1.sym
+share/gEDA/sym/spice/spice-model-1.sym
+share/gEDA/sym/spice/spice-options-1.sym
+share/gEDA/sym/spice/spice-subcircuit-IO-1.sym
+share/gEDA/sym/spice/spice-subcircuit-LL-1.sym
 share/gEDA/sym/spice/tline.sym
 share/gEDA/sym/spice/vac-1.sym
 share/gEDA/sym/spice/vccs-1.sym
@@ -1170,8 +1247,13 @@ share/gEDA/sym/xilinx/XC95108-PC84.sym
 share/gEDA/sym/lattice/isp2032-1.sym
 share/gEDA/sym/national/ADC0804-1.sym
 share/gEDA/sym/national/DAC0808-1.sym
+share/gEDA/sym/national/DS2405-1.sym
+share/gEDA/sym/national/DS26C31-1.sym
 share/gEDA/sym/national/DS26C32-1.sym
+share/gEDA/sym/national/DS26C32-2.sym
 share/gEDA/sym/national/DS26C61-1.sym
+share/gEDA/sym/national/DS26LS31-1.sym
+share/gEDA/sym/national/DS2890_TO92-1.sym
 share/gEDA/sym/national/lm4871m-1.sym
 share/gEDA/sym/national/pc16500d-1.sym
 share/gEDA/sym/supervisor/adm707.sym
@@ -1182,16 +1264,21 @@ share/gEDA/sym/opto/4N29-1.sym
 share/gEDA/sym/opto/6N135-1.sym
 share/gEDA/sym/opto/6N136-1.sym
 share/gEDA/sym/opto/6n137-1.sym
+share/gEDA/sym/opto/810-1.sym
+share/gEDA/sym/opto/CNY17-1.sym
 share/gEDA/sym/opto/HCPL4502-1.sym
 share/gEDA/sym/opto/HCPL4701-1.sym
 share/gEDA/sym/opto/HCTL-2000-1.sym
 share/gEDA/sym/opto/HCTL-2016-1.sym
 share/gEDA/sym/opto/HSDL7000-1.sym
+share/gEDA/sym/opto/K3020P-1.sym
+share/gEDA/sym/opto/hcnr201-1.sym
 share/gEDA/sym/opto/hcpl-2630-1.sym
 share/gEDA/sym/opto/hcpl-2631-1.sym
 share/gEDA/sym/opto/hcpl-4534-1.sym
 share/gEDA/sym/opto/mct9001-1.sym
 share/gEDA/sym/opto/ps2501-1.sym
+share/gEDA/sym/opto/tfds4500-1.sym
 share/gEDA/sym/diode/bav70lt1-1.sym
 share/gEDA/sym/diode/diode-1.sym
 share/gEDA/sym/diode/diode-2.sym
@@ -1200,6 +1287,8 @@ share/gEDA/sym/diode/diode-bridge-1.sym
 share/gEDA/sym/diode/led-2.sym
 share/gEDA/sym/diode/led-3.sym
 share/gEDA/sym/diode/mbr1545ct-1.sym
+share/gEDA/sym/diode/sa52-11-1.sym
+share/gEDA/sym/diode/sc52-11-1.sym
 share/gEDA/sym/diode/smda05-1.sym
 share/gEDA/sym/diode/zener-1.sym
 share/gEDA/sym/diode/zener-2.sym
@@ -1286,12 +1375,72 @@ share/gEDA/sym/transistor/2N3904-1.sym
 share/gEDA/sym/transistor/2N5245-1.sym
 share/gEDA/sym/transistor/2N5911-1.sym
 share/gEDA/sym/transistor/2S2K3-1.sym
+share/gEDA/sym/transistor/BC547-1.sym
+share/gEDA/sym/transistor/BC557-1.sym
 share/gEDA/sym/transistor/IRF1010N-1.sym
 share/gEDA/sym/transistor/IRLZ24N-1.sym
 share/gEDA/sym/transistor/ULN2003-1.sym
 share/gEDA/sym/transistor/ULN2801A-1.sym
 share/gEDA/sym/transistor/dgnmos-1.sym
 share/gEDA/sym/transistor/mosfet-with-diode-1.sym
+share/gEDA/sym/switcap/switcap-analysis-1.sym
+share/gEDA/sym/switcap/switcap-capacitor-1.sym
+share/gEDA/sym/switcap/switcap-clock-1.sym
+share/gEDA/sym/switcap/switcap-options-1.sym
+share/gEDA/sym/switcap/switcap-switch-1.sym
+share/gEDA/sym/switcap/switcap-timing-1.sym
+share/gEDA/sym/switcap/switcap-title-1.sym
+share/gEDA/sym/switcap/switcap-vcvs-1.sym
+share/gEDA/sym/switcap/switcap-vcvs-2.sym
+share/gEDA/sym/switcap/switcap-vcvs-3.sym
+share/gEDA/sym/switcap/switcap-vsrc-1.sym
+share/gEDA/sym/cascade/cascade-amp-1.sym
+share/gEDA/sym/cascade/cascade-defaults-1.sym
+share/gEDA/sym/cascade/cascade-defaults-2.sym
+share/gEDA/sym/cascade/cascade-filter-1.sym
+share/gEDA/sym/cascade/cascade-mixer-1.sym
+share/gEDA/sym/cascade/cascade-source-1.sym
+share/gEDA/sym/cascade/cascade-source-2.sym
+share/gEDA/sym/cascade/cascade-transformer-1.sym
+share/gEDA/sym/asic/cap-0.sym
+share/gEDA/sym/asic/cap-1.sym
+share/gEDA/sym/asic/cap-2.sym
+share/gEDA/sym/asic/cap-3.sym
+share/gEDA/sym/asic/diode.sym
+share/gEDA/sym/asic/nmos.sym
+share/gEDA/sym/asic/pmos.sym
+share/gEDA/sym/asic/res-0.sym
+share/gEDA/sym/asic/res-1.sym
+share/gEDA/sym/asic/res-2.sym
+share/gEDA/sym/gnetman/capacitor-1.sym
+share/gEDA/sym/gnetman/ccvs-1.sym
+share/gEDA/sym/gnetman/clkinv.sym
+share/gEDA/sym/gnetman/cvstitle.sym
+share/gEDA/sym/gnetman/dffr.sym
+share/gEDA/sym/gnetman/idc-1.sym
+share/gEDA/sym/gnetman/in.sym
+share/gEDA/sym/gnetman/inductor-1.sym
+share/gEDA/sym/gnetman/inv.sym
+share/gEDA/sym/gnetman/io.sym
+share/gEDA/sym/gnetman/lat.sym
+share/gEDA/sym/gnetman/latr.sym
+share/gEDA/sym/gnetman/nand2.sym
+share/gEDA/sym/gnetman/nand3.sym
+share/gEDA/sym/gnetman/nmos.sym
+share/gEDA/sym/gnetman/nmos4.sym
+share/gEDA/sym/gnetman/nor2.sym
+share/gEDA/sym/gnetman/out.sym
+share/gEDA/sym/gnetman/passtrans.sym
+share/gEDA/sym/gnetman/pmos.sym
+share/gEDA/sym/gnetman/pmos4.sym
+share/gEDA/sym/gnetman/resistor-1.sym
+share/gEDA/sym/gnetman/vccs-1.sym
+share/gEDA/sym/gnetman/vcvs-1.sym
+share/gEDA/sym/gnetman/vdc-1.sym
+share/gEDA/sym/gnetman/vdd.sym
+share/gEDA/sym/gnetman/vpulse-1.sym
+share/gEDA/sym/gnetman/vpwl-1.sym
+share/gEDA/sym/gnetman/vss.sym
 share/gEDA/system-commonrc
 @dirrm share/doc/geda-doc
 @dirrm share/gEDA/sym/4000
@@ -1331,4 +1480,9 @@ share/gEDA/system-commonrc
 @dirrm share/gEDA/sym/power
 @dirrm share/gEDA/sym/philips
 @dirrm share/gEDA/sym/transistor
+@dirrm share/gEDA/sym/switcap
+@dirrm share/gEDA/sym/cascade
+@dirrm share/gEDA/sym/asic
+@dirrm share/gEDA/sym/gnetman
 @dirrm share/gEDA/sym
+@unexec rmdir %D/share/gEDA 2>/dev/null || true
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index e6b41bbfaf45..f6cdfb4a6e18 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gsymcheck
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,13 +16,11 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA symbol checking utility
 
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+BUILD_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
 USE_LIBTOOL=	yes
-
-AUTOCONF=	autoconf
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -31,6 +28,5 @@ CONFIGURE_ARGS=	--enable-gdgeda
 INSTALLS_SHLIB=	yes
 
 MAN1=		gsymcheck.1
-PLIST_FILES=	bin/gsymcheck
 
 .include <bsd.port.mk>
diff --git a/cad/geda-symcheck/distinfo b/cad/geda-symcheck/distinfo
index 940aeb94bc71..f8a178f6caf5 100644
--- a/cad/geda-symcheck/distinfo
+++ b/cad/geda-symcheck/distinfo
@@ -1 +1 @@
-MD5 (geda-gsymcheck-20030223.tar.gz) = 7b585987ef7eedab16a2420b067aa1f6
+MD5 (geda-gsymcheck-20040111.tar.gz) = 869fee36c0edcd9beb904e208d9a782a
diff --git a/cad/geda-symcheck/pkg-plist b/cad/geda-symcheck/pkg-plist
new file mode 100644
index 000000000000..8dce2be362e9
--- /dev/null
+++ b/cad/geda-symcheck/pkg-plist
@@ -0,0 +1,4 @@
+bin/gsymcheck
+share/doc/geda-doc/man/gsymcheck.html
+share/gEDA/system-gsymcheckrc
+@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 893f74707640..f908329a9abf 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geda-utils
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,13 +15,13 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA utilities
 
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
 USE_LIBTOOL=	yes
 USE_GETOPT_LONG=yes
-AUTOCONF=	autoconf
+USE_GMAKE=	yes
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index b510f6592dc4..1b518772148f 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1 +1 @@
-MD5 (geda-utils-20030223.tar.gz) = c886498994d74b549e60b3071f67728c
+MD5 (geda-utils-20040111.tar.gz) = 3fac8212be7f362db2dd4d6a8806d58f
diff --git a/cad/geda-utils/pkg-plist b/cad/geda-utils/pkg-plist
index 6b15e312c1f3..d3055a2286b5 100644
--- a/cad/geda-utils/pkg-plist
+++ b/cad/geda-utils/pkg-plist
@@ -3,9 +3,18 @@ bin/smash_megafile
 bin/convert_sym
 bin/sarlacc_schem
 bin/olib
+bin/gsch2pcb
 bin/gschlas
 bin/sarlacc_sym
 bin/gschupdate
 bin/gsymupdate
 bin/gschemdoc
 bin/refdes_renum
+bin/tragesym
+bin/pads_backannotate
+bin/garchive
+share/doc/geda-doc/readmes/README.gsch2pcb
+share/doc/geda-doc/readmes/README.olib
+share/doc/geda-doc/readmes/README.tragesym
+share/gEDA/system-gschlasrc
+@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index e7bb19a65992..ecf66d76f765 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geda
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -16,14 +15,13 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	The "meta-port" for gEDA
 
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols \
+BUILD_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols \
 		gschem:${PORTSDIR}/cad/gschem \
 		gnetlist:${PORTSDIR}/cad/gnetlist \
 		gmk_sym:${PORTSDIR}/cad/geda-utils \
 		gsymcheck:${PORTSDIR}/cad/geda-symcheck
-
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile \
-		geda.18:${PORTSDIR}/cad/libgeda
+		geda.20:${PORTSDIR}/cad/libgeda
 
 NO_BUILD=	yes
 
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 6dc4b6b0b079..5490996a9e51 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,15 +16,11 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
 USE_LIBTOOL=	yes
-
-GNU_CONFIGURE=	yes
-AUTOCONF=	autoconf
-
 USE_GNOME=	gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index d83a471d54f3..f355d8975266 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1 +1 @@
-MD5 (geda-gnetlist-20030223.tar.gz) = 0d8d72ec7765ee9e6aa9706392812bc9
+MD5 (geda-gnetlist-20040111.tar.gz) = 9bbeb64aea9455468d5aef16685a03de
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
index 7dac45e34e35..be3668c70939 100644
--- a/cad/gnetlist/pkg-plist
+++ b/cad/gnetlist/pkg-plist
@@ -1,3 +1,47 @@
 bin/gnetlist
-bin/gschem2pcb
 bin/mk_verilog_syms
+bin/sw2asc
+bin/gschem2pcb
+share/doc/geda-doc/readmes/vams_mode.txt
+share/doc/geda-doc/readmes/syntax_architecture.txt
+share/doc/geda-doc/readmes/syntax_entity.txt
+share/doc/geda-doc/readmes/README.bom
+share/doc/geda-doc/readmes/README.pcb
+share/doc/geda-doc/readmes/README.switcap
+share/doc/geda-doc/readmes/README.verilog
+share/doc/geda-doc/readmes/README.vhdl
+share/doc/geda-doc/man/gnetlist.html
+share/gEDA/system-gnetlistrc
+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-bae.scm
+share/gEDA/scheme/gnet-protelII.scm
+share/gEDA/scheme/gnet-bom2.scm
+share/gEDA/scheme/gnet-gossip.scm
+share/gEDA/scheme/gnet-drc.scm
+share/gEDA/scheme/gnet-vams.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-redac.scm
+@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
+@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index dd24ae2393ee..a1b32cd5e91a 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -6,33 +6,28 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
 		http://www.tinkerbox.org/projects/files/gEDA/
-
-DISTNAME=       geda-${PORTNAME}-${PORTVERSION}
+DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools
 
-BUILD_DEPENDS=	gesym-config:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.18:${PORTSDIR}/cad/libgeda \
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
 USE_LIBTOOL=	yes
-
-GNU_CONFIGURE=	yes
-AUTOCONF=	autoconf
-
 USE_GNOME=	gtk12
 CONFIGURE_ARGS=	--enable-gdgeda
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
+INFO=		gschemdoc
 MAN1=		gschem.1
 
 .include <bsd.port.mk>
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index cbb96c2ee697..8e0b89c00ea6 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1 +1 @@
-MD5 (geda-gschem-20030223.tar.gz) = f0cb62fb9c9d403fd0c46d2231a109c4
+MD5 (geda-gschem-20040111.tar.gz) = 1826f8615615129883ab01d766877323
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
index eed63043cf4b..9c25552e041c 100644
--- a/cad/gschem/pkg-plist
+++ b/cad/gschem/pkg-plist
@@ -1,33 +1,35 @@
 bin/gschem
-@unexec install-info --delete %D/info/gschemdoc.info %D/info/dir
-info/gschemdoc.info
-info/gschemdoc.info-1
-info/gschemdoc.info-2
-info/gschemdoc.info-3
-info/gschemdoc.info-4
-info/gschemdoc.info-5
-info/gschemdoc.info-6
-info/gschemdoc.info-7
-info/gschemdoc.info-8
-info/gschemdoc.info-9
-info/gschemdoc.info-10
-info/gschemdoc.info-11
-info/gschemdoc.info-12
-info/gschemdoc.info-13
-info/gschemdoc.info-14
-info/gschemdoc.info-15
-info/gschemdoc.info-16
-info/gschemdoc.info-17
-info/gschemdoc.info-18
-info/gschemdoc.info-19
-@exec install-info %D/info/gschemdoc.info %D/info/dir
+share/doc/geda-doc/man/gschem.html
+share/gEDA/system-gschemrc
+share/gEDA/gschem-gtkrc
+share/gEDA/gschem-lightbg
+share/gEDA/gschem-darkbg
+share/gEDA/scheme/auto-uref.scm
+share/gEDA/scheme/generate_netlist.scm
+share/gEDA/scheme/gschem.scm
+share/gEDA/scheme/list-keys.scm
+share/gEDA/scheme/print-NB-attribs.scm
+share/gEDA/bitmap/gschem-bus.xpm
+share/gEDA/bitmap/gschem-comp.xpm
+share/gEDA/bitmap/gschem-net.xpm
+share/gEDA/bitmap/gschem-new.xpm
+share/gEDA/bitmap/gschem-open.xpm
+share/gEDA/bitmap/gschem-redo.xpm
+share/gEDA/bitmap/gschem-save.xpm
+share/gEDA/bitmap/gschem-select.xpm
+share/gEDA/bitmap/gschem-undo.xpm
+share/gEDA/bitmap/gschem-edit.xpm
+share/gEDA/bitmap/gschem-text.xpm
+share/gEDA/bitmap/gschem-copy.xpm
+share/gEDA/bitmap/gschem-move.xpm
+share/gEDA/bitmap/gschem-delete.xpm
+share/gEDA/bitmap/gschem-rotate.xpm
+share/gEDA/bitmap/gschem-mirror.xpm
 share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
 share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
 share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
 share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
 share/locale/ru/LC_MESSAGES/geda-gschem.mo
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/de_DE/LC_MESSAGES
-@dirrm share/locale/nl_NL/LC_MESSAGES
-@dirrm share/locale/ja_JP/LC_MESSAGES
-@dirrm share/locale/ru/LC_MESSAGES
+@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrm share/gEDA/bitmap
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 0ff1602b94d2..61377b4721ed 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgeda
-PORTVERSION=	20030223
-PORTREVISION=	1
+PORTVERSION=	20040111
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,16 +15,17 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA tools base utility library
 
-LIB_DEPENDS=	gdgeda.5:${PORTSDIR}/graphics/libgdgeda \
+LIB_DEPENDS=	gdgeda.6:${PORTSDIR}/graphics/libgdgeda \
 		guile.15:${PORTSDIR}/lang/guile
 
-USE_LIBTOOL=		yes
-#USE_AUTOCONF_VER=	253
-
-USE_GNOME=	gtk12
+USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gtk12 gnomehack
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-gdgeda
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+INFO=		libgedadoc
+
 .include <bsd.port.mk>
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
index c5d1e2245b13..4857898420ab 100644
--- a/cad/libgeda/distinfo
+++ b/cad/libgeda/distinfo
@@ -1 +1 @@
-MD5 (libgeda-20030223.tar.gz) = aa018d7cfe16bfd8cc535d3f37ed776e
+MD5 (libgeda-20040111.tar.gz) = e0f644647e16786de1af907cd847d492
diff --git a/cad/libgeda/pkg-plist b/cad/libgeda/pkg-plist
index 2622beebce81..42b85bbe1161 100644
--- a/cad/libgeda/pkg-plist
+++ b/cad/libgeda/pkg-plist
@@ -1,4 +1,3 @@
-bin/libgeda-config
 include/libgeda/colors.h
 include/libgeda/defines.h
 include/libgeda/funcs.h
@@ -7,26 +6,9 @@ include/libgeda/o_types.h
 include/libgeda/prototype.h
 include/libgeda/struct.h
 include/libgeda/libgeda.h
-@unexec install-info --delete %D/info/libgedadoc.info %D/info/dir
-info/libgedadoc.info
-info/libgedadoc.info-1
-info/libgedadoc.info-2
-info/libgedadoc.info-3
-info/libgedadoc.info-4
-info/libgedadoc.info-5
-info/libgedadoc.info-6
-info/libgedadoc.info-7
-info/libgedadoc.info-8
-info/libgedadoc.info-9
-info/libgedadoc.info-10
-info/libgedadoc.info-11
-info/libgedadoc.info-12
-info/libgedadoc.info-13
-info/libgedadoc.info-14
-@exec install-info %D/info/libgedadoc.info %D/info/dir
-lib/libgeda.so.18
+lib/libgeda.so.20
 lib/libgeda.so
 lib/libgeda.la
 lib/libgeda.a
+libdata/pkgconfig/libgeda.pc
 @dirrm include/libgeda
-@dirrm include