4 files changed, 44 insertions, 32 deletions

diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index 8d42a5b1a644..52e3d981bf5a 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gschem
-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}/ \
@@ -18,7 +17,7 @@ MAINTAINER=	bruno@tinkerbox.org
 COMMENT=	gEDA electronic schematic capture tools
 
 RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.23:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
diff --git a/cad/geda-gschem/distinfo b/cad/geda-gschem/distinfo
index a155278dda95..de0329adc9b5 100644
--- a/cad/geda-gschem/distinfo
+++ b/cad/geda-gschem/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gschem-20050313.tar.gz) = 3c7caa75677dfdb03c7428076f1d1226
-SHA256 (geda-gschem-20050313.tar.gz) = 2ecd31d71df44dd805e284cf805e6d42d21dcf7ad39a78bf5b4dc665c7fec096
-SIZE (geda-gschem-20050313.tar.gz) = 1586084
+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/geda-gschem/files/patch-Makefile.in b/cad/geda-gschem/files/patch-Makefile.in
new file mode 100644
index 000000000000..786eb2e46d13
--- /dev/null
+++ b/cad/geda-gschem/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index eb3ceb0522f0..aac5bef372cc 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -1,44 +1,39 @@
 bin/gschem
 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-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-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/gEDA/bitmap/gschem-undo.xpm
 share/gEDA/bitmap/gschem-warning.png
-share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
+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/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
-@dirrmtry share/doc/geda-doc/man
-@dirrmtry share/gEDA/scheme
-@dirrm share/gEDA/bitmap
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
+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
@@ -47,3 +42,10 @@ share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
 @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