11 files changed, 2 insertions, 210 deletions

diff --git a/cad/Makefile b/cad/Makefile
index 980c0877bf5a..f5d7164bacd0 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -23,16 +23,16 @@
     SUBDIR += geda-docs
     SUBDIR += geda-examples
     SUBDIR += geda-gattrib
+    SUBDIR += geda-gschem
+    SUBDIR += geda-netlist
     SUBDIR += geda-projectmanager
     SUBDIR += geda-symbols
     SUBDIR += geda-symcheck
     SUBDIR += geda-utils
     SUBDIR += gerbv
     SUBDIR += gmsh
-    SUBDIR += gnetlist
     SUBDIR += gnucap
     SUBDIR += gplcver
-    SUBDIR += gschem
     SUBDIR += gtkwave
     SUBDIR += gwave
     SUBDIR += impact
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
deleted file mode 100644
index 0b13514befb5..000000000000
--- a/cad/gnetlist/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	gnetlist
-# Date created:			4 April 2001
-# Whom:				bruno schwander <bruno@tinkerbox.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnetlist
-PORTVERSION=	20060123
-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}
-
-MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	gEDA electronic schematic capture tools, netlister
-
-LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
-RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		gnetlist.1
-
-.include <bsd.port.mk>
diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo
deleted file mode 100644
index 0901f5faa070..000000000000
--- a/cad/gnetlist/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 244c25799ecf..000000000000
--- a/cad/gnetlist/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-descr b/cad/gnetlist/pkg-descr
deleted file mode 100644
index 226afeb7253c..000000000000
--- a/cad/gnetlist/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-gnetlist is a tool create netlist from a gschem electronic circuits schematic.
-
-WWW: http://www.geda.seul.org
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
deleted file mode 100644
index 92d98afda06a..000000000000
--- a/cad/gnetlist/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-bin/gnetlist
-bin/mk_verilog_syms
-bin/sch2eaglepos.sh
-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/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-PCBboard.scm
-share/gEDA/scheme/gnet-allegro.scm
-share/gEDA/scheme/gnet-bae.scm
-share/gEDA/scheme/gnet-bom.scm
-share/gEDA/scheme/gnet-bom2.scm
-share/gEDA/scheme/gnet-cascade.scm
-share/gEDA/scheme/gnet-drc.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-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-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/doc/geda-doc
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
deleted file mode 100644
index 303d33db1354..000000000000
--- a/cad/gschem/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	geda
-# Date created:			4 April 2001
-# Whom:				bruno schwander <bruno@tinkerbox.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gschem
-PORTVERSION=	20060123
-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}
-
-MAINTAINER=	ssedov@mbsd.msk.ru
-COMMENT=	gEDA electronic schematic capture tools
-
-RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
-
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--enable-gdgeda
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-INFO=		gschemdoc
-MAN1=		gschem.1
-
-.include <bsd.port.mk>
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
deleted file mode 100644
index de0329adc9b5..000000000000
--- a/cad/gschem/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (geda-gschem-20060123.tar.gz) = 0fdae931cc2ca22611a1a5f8dc1ca690
-SHA256 (geda-gschem-20060123.tar.gz) = 96724c4957a34801f0d148ccf31cc493ef8d0dd48eec5a0f92ec292c9f7ef3e8
-SIZE (geda-gschem-20060123.tar.gz) = 1652829
diff --git a/cad/gschem/files/patch-Makefile.in b/cad/gschem/files/patch-Makefile.in
deleted file mode 100644
index 786eb2e46d13..000000000000
--- a/cad/gschem/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue Jan 24 07:03:18 2006
-+++ src/Makefile.in	Mon Jun 26 02:32:31 2006
-@@ -346,7 +346,7 @@
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- gschem$(EXEEXT): $(gschem_OBJECTS) $(gschem_DEPENDENCIES) 
- 	@rm -f gschem$(EXEEXT)
--	$(LINK) $(gschem_LDFLAGS) $(gschem_OBJECTS) $(gschem_LDADD) $(LIBS)
-+	$(LINK) $(gschem_LDFLAGS) -lgeda $(gschem_OBJECTS) $(gschem_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT) core *.core
diff --git a/cad/gschem/pkg-descr b/cad/gschem/pkg-descr
deleted file mode 100644
index f39c7051dc48..000000000000
--- a/cad/gschem/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-gschem is a tool to capture/draw electronic circuits schematics.
-
-WWW: http://www.geda.seul.org
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
deleted file mode 100644
index aac5bef372cc..000000000000
--- a/cad/gschem/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-bin/gschem
-share/doc/geda-doc/man/gschem.html
-share/gEDA/bitmap/gschem-bus.xpm
-share/gEDA/bitmap/gschem-comp.xpm
-share/gEDA/bitmap/gschem-copy.xpm
-share/gEDA/bitmap/gschem-delete.xpm
-share/gEDA/bitmap/gschem-edit.xpm
-share/gEDA/bitmap/gschem-mirror.xpm
-share/gEDA/bitmap/gschem-move.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-rotate.xpm
-share/gEDA/bitmap/gschem-save.xpm
-share/gEDA/bitmap/gschem-select.xpm
-share/gEDA/bitmap/gschem-text.xpm
-share/gEDA/bitmap/gschem-undo.xpm
-share/gEDA/bitmap/gschem-warning.png
-share/gEDA/gschem-darkbg
-share/gEDA/gschem-gtkrc
-share/gEDA/gschem-lightbg
-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/system-gschemrc
-share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
-share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
-share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
-share/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
-share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
-share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
-share/locale/ru/LC_MESSAGES/geda-gschem.mo
-@dirrmtry share/locale/nl_NL/LC_MESSAGES
-@dirrmtry share/locale/nl_NL
-@dirrmtry share/locale/ja_JP/LC_MESSAGES
-@dirrmtry share/locale/ja_JP
-@dirrmtry share/locale/it_IT/LC_MESSAGES
-@dirrmtry share/locale/it_IT
-@dirrmtry share/locale/fr_FR/LC_MESSAGES
-@dirrmtry share/locale/fr_FR
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/gEDA/scheme
-@dirrmtry share/gEDA/bitmap
-@dirrmtry share/gEDA
-@dirrmtry share/doc/geda-doc/man
-@dirrmtry share/doc/geda-doc