18 files changed, 71 insertions, 60 deletions

diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index b518ba2c3520..078df578ada9 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,15 +17,13 @@ MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools
 
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--enable-gdgeda
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 INFO=		gschemdoc
 MAN1=		gschem.1
diff --git a/cad/geda-gschem/distinfo b/cad/geda-gschem/distinfo
index 8e0b89c00ea6..e165820d90e6 100644
--- a/cad/geda-gschem/distinfo
+++ b/cad/geda-gschem/distinfo
@@ -1 +1,2 @@
-MD5 (geda-gschem-20040111.tar.gz) = 1826f8615615129883ab01d766877323
+MD5 (geda-gschem-20050313.tar.gz) = 3c7caa75677dfdb03c7428076f1d1226
+SIZE (geda-gschem-20050313.tar.gz) = 1586084
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 4e4fedeace30..17420ca23f13 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -25,11 +25,15 @@ 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/gEDA/bitmap/gschem-warning.png
 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
+share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
+share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
+share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
 @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
@@ -39,3 +43,7 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 @unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
 @unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
+@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index d16c3e7201e1..081a0fc57b9f 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,16 +16,13 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-gdgeda
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnetlist.1
 
diff --git a/cad/geda-netlist/distinfo b/cad/geda-netlist/distinfo
index f355d8975266..6bc2ad04f8e6 100644
--- a/cad/geda-netlist/distinfo
+++ b/cad/geda-netlist/distinfo
@@ -1 +1,2 @@
-MD5 (geda-gnetlist-20040111.tar.gz) = 9bbeb64aea9455468d5aef16685a03de
+MD5 (geda-gnetlist-20050313.tar.gz) = 0d7f0c0feecdbbc1eb8d4ba174551051
+SIZE (geda-gnetlist-20050313.tar.gz) = 317092
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index be3668c70939..6405c6ee6f8f 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnetlist
 bin/mk_verilog_syms
 bin/sw2asc
-bin/gschem2pcb
+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
@@ -10,6 +10,8 @@ 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/readmes/README.sysc
+share/doc/geda-doc/readmes/README.eagle
 share/doc/geda-doc/man/gnetlist.html
 share/gEDA/system-gnetlistrc
 share/gEDA/scheme/gnet-PCB.scm
@@ -42,6 +44,8 @@ share/gEDA/scheme/gnet-gsch2pcb.scm
 share/gEDA/scheme/gnet-futurenet2.scm
 share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-redac.scm
+share/gEDA/scheme/gnet-systemc.scm
+share/gEDA/scheme/gnet-eagle.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-symcheck/Makefile b/cad/geda-symcheck/Makefile
index 08a35c14cd7d..ce10f84cf1f5 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gsymcheck
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,16 +16,13 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA symbol checking utility
 
-BUILD_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-gdgeda
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gsymcheck.1
 
diff --git a/cad/geda-symcheck/distinfo b/cad/geda-symcheck/distinfo
index f8a178f6caf5..7cdda590414f 100644
--- a/cad/geda-symcheck/distinfo
+++ b/cad/geda-symcheck/distinfo
@@ -1 +1,2 @@
-MD5 (geda-gsymcheck-20040111.tar.gz) = 869fee36c0edcd9beb904e208d9a782a
+MD5 (geda-gsymcheck-20050313.tar.gz) = 12d94d1a75867fbde883027099e1d6a2
+SIZE (geda-gsymcheck-20050313.tar.gz) = 131689
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index d28c7657c2d5..b41c4c64bae8 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geda-utils
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,16 +16,12 @@ MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA utilities
 
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 
-USE_LIBTOOL_VER=	13
-USE_GETOPT_LONG=yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-gdgeda
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/cad/geda-utils/distinfo b/cad/geda-utils/distinfo
index 1b518772148f..256cc87697ce 100644
--- a/cad/geda-utils/distinfo
+++ b/cad/geda-utils/distinfo
@@ -1 +1,2 @@
-MD5 (geda-utils-20040111.tar.gz) = 3fac8212be7f362db2dd4d6a8806d58f
+MD5 (geda-utils-20050313.tar.gz) = fbdc7676027a6547f54308b88851395d
+SIZE (geda-utils-20050313.tar.gz) = 247507
diff --git a/cad/geda-utils/pkg-plist b/cad/geda-utils/pkg-plist
index d3055a2286b5..674da1e9471a 100644
--- a/cad/geda-utils/pkg-plist
+++ b/cad/geda-utils/pkg-plist
@@ -1,3 +1,4 @@
+bin/gsymfix.pl
 bin/gmk_sym
 bin/smash_megafile
 bin/convert_sym
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index f76346787611..fe8574df016b 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geda
-PORTVERSION=	20040111
-PORTREVISION=	1
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -21,8 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols \
 		gnetlist:${PORTSDIR}/cad/gnetlist \
 		gmk_sym:${PORTSDIR}/cad/geda-utils \
 		gsymcheck:${PORTSDIR}/cad/geda-symcheck
-LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile \
-		geda.20:${PORTSDIR}/cad/libgeda
 
 NO_BUILD=	yes
 
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index d16c3e7201e1..081a0fc57b9f 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnetlist
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -16,16 +16,13 @@ DISTNAME=	geda-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools, netlister
 
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
 
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-gdgeda
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnetlist.1
 
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
index f355d8975266..6bc2ad04f8e6 100644
--- a/cad/gnetlist/distinfo
+++ b/cad/gnetlist/distinfo
@@ -1 +1,2 @@
-MD5 (geda-gnetlist-20040111.tar.gz) = 9bbeb64aea9455468d5aef16685a03de
+MD5 (geda-gnetlist-20050313.tar.gz) = 0d7f0c0feecdbbc1eb8d4ba174551051
+SIZE (geda-gnetlist-20050313.tar.gz) = 317092
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
index be3668c70939..6405c6ee6f8f 100644
--- a/cad/gnetlist/pkg-plist
+++ b/cad/gnetlist/pkg-plist
@@ -1,7 +1,7 @@
 bin/gnetlist
 bin/mk_verilog_syms
 bin/sw2asc
-bin/gschem2pcb
+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
@@ -10,6 +10,8 @@ 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/readmes/README.sysc
+share/doc/geda-doc/readmes/README.eagle
 share/doc/geda-doc/man/gnetlist.html
 share/gEDA/system-gnetlistrc
 share/gEDA/scheme/gnet-PCB.scm
@@ -42,6 +44,8 @@ share/gEDA/scheme/gnet-gsch2pcb.scm
 share/gEDA/scheme/gnet-futurenet2.scm
 share/gEDA/scheme/gnet-cascade.scm
 share/gEDA/scheme/gnet-redac.scm
+share/gEDA/scheme/gnet-systemc.scm
+share/gEDA/scheme/gnet-eagle.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 b518ba2c3520..078df578ada9 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20040111
+PORTVERSION=	20050313
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -17,15 +17,13 @@ MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools
 
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.20:${PORTSDIR}/cad/libgeda \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
 
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--enable-gdgeda
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 INFO=		gschemdoc
 MAN1=		gschem.1
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index 8e0b89c00ea6..e165820d90e6 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1 +1,2 @@
-MD5 (geda-gschem-20040111.tar.gz) = 1826f8615615129883ab01d766877323
+MD5 (geda-gschem-20050313.tar.gz) = 3c7caa75677dfdb03c7428076f1d1226
+SIZE (geda-gschem-20050313.tar.gz) = 1586084
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
index 4e4fedeace30..17420ca23f13 100644
--- a/cad/gschem/pkg-plist
+++ b/cad/gschem/pkg-plist
@@ -25,11 +25,15 @@ 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/gEDA/bitmap/gschem-warning.png
 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
+share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
+share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
+share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
 @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
@@ -39,3 +43,7 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 @unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
 @unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
+@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true