- Update to 20060906

- Change my email

6 files changed, 40 insertions, 56 deletions

diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index 3144d81764e8..6e6dce3d7098 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gschem
-PORTVERSION=	20060123
-PORTREVISION=	1
+PORTVERSION=	20060906
+PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 		http://geda.seul.org/devel/${PORTVERSION}/ \
@@ -15,22 +15,22 @@ MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PORTVERSION}/ \
 PKGNAMEPREFIX=	geda-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The gEDA's electronic schematic capture tool
 
 RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
-LIB_DEPENDS=	geda.25:${PORTSDIR}/cad/libgeda
+LIB_DEPENDS=	geda.26:${PORTSDIR}/cad/libgeda
 
 DOCSDIR=	${PREFIX}/share/doc/geda
 DATADIR=	${PREFIX}/share/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR}
+CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR} \
+		--mandir=${PREFIX}/man --infodir=${PREFIX}/info
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-INFO=		gschemdoc
 MAN1=		gschem.1
 
 .if !defined(WITHOUT_NLS)
@@ -47,4 +47,9 @@ PLIST_SUB+=	NLS="@comment "
 BROKEN=		does not compile on 4.x
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \
+		${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/cad/geda-gschem/distinfo b/cad/geda-gschem/distinfo
index de0329adc9b5..805693a00513 100644
--- a/cad/geda-gschem/distinfo
+++ b/cad/geda-gschem/distinfo
@@ -1,3 +1,3 @@
-MD5 (geda-gschem-20060123.tar.gz) = 0fdae931cc2ca22611a1a5f8dc1ca690
-SHA256 (geda-gschem-20060123.tar.gz) = 96724c4957a34801f0d148ccf31cc493ef8d0dd48eec5a0f92ec292c9f7ef3e8
-SIZE (geda-gschem-20060123.tar.gz) = 1652829
+MD5 (geda-gschem-20060906.tar.gz) = 8f224c572f30162928a9141b352c7558
+SHA256 (geda-gschem-20060906.tar.gz) = f48d802191898738dc11177b1eb1611da1f0b92b42028119329c77e6df4cb812
+SIZE (geda-gschem-20060906.tar.gz) = 1002074
diff --git a/cad/geda-gschem/files/patch-Makefile.in b/cad/geda-gschem/files/patch-Makefile.in
deleted file mode 100644
index 786eb2e46d13..000000000000
--- a/cad/geda-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/geda-gschem/files/patch-configure b/cad/geda-gschem/files/patch-configure
deleted file mode 100644
index 54fae9d07e4c..000000000000
--- a/cad/geda-gschem/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jul 13 14:11:39 2006
-+++ configure	Thu Jul 13 14:11:52 2006
-@@ -7923,7 +7923,7 @@
- # gEDA/gaf specific setup start
- #
- 
--DATADIR=gEDA
-+DATADIR=geda
- GEDADATADIR=$datadir/$DATADIR
- 
- if eval "test x$opt_rcdir = x"; then
diff --git a/cad/geda-gschem/files/patch-src_x_menus.c b/cad/geda-gschem/files/patch-src_x_menus.c
index 726dc21c2ae2..53b38b4741cf 100644
--- a/cad/geda-gschem/files/patch-src_x_menus.c
+++ b/cad/geda-gschem/files/patch-src_x_menus.c
@@ -1,14 +1,14 @@
---- src/x_menus.c.orig	Thu Jul 13 14:21:07 2006
-+++ src/x_menus.c	Thu Jul 13 14:21:49 2006
-@@ -284,9 +284,11 @@
-    */
-   item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<popup>",
- 				      accel_group);
+--- src/x_menus.c.orig	Sun Aug  6 20:18:09 2006
++++ src/x_menus.c	Tue Oct 10 03:24:55 2006
+@@ -241,7 +241,11 @@
+ static gchar* gettext_fn(const gchar *path,
+ 			 gpointer func_data __attribute__((unused)))
+ {
 +#if defined(ENABLE_NLS)
-   gtk_item_factory_set_translate_func(item_factory,
- 				      (GtkTranslateFunc) gettext,
- 				      NULL, NULL);
+ 	return gettext(path);
++#else
++	return path;
 +#endif
-   /* This function creates the pop-up menu itself & attaches it to the
-      GtkItemFactory. Pass the item factory,
-      the number of items in the array, the array itself, and any
+ }
+ 
+ GtkWidget *get_main_popup(TOPLEVEL *w_current)
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index d8968cbf5f1b..5b23a7333551 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -1,5 +1,4 @@
 bin/gschem
-%%DOCSDIR%%/man/gschem.html
 %%DATADIR%%/bitmap/gschem-bus.xpm
 %%DATADIR%%/bitmap/gschem-comp.xpm
 %%DATADIR%%/bitmap/gschem-copy.xpm
@@ -20,11 +19,15 @@ bin/gschem
 %%DATADIR%%/gschem-darkbg
 %%DATADIR%%/gschem-gtkrc
 %%DATADIR%%/gschem-lightbg
+%%DATADIR%%/scheme/auto-place-attribs.scm
 %%DATADIR%%/scheme/auto-uref.scm
 %%DATADIR%%/scheme/generate_netlist.scm
 %%DATADIR%%/scheme/gschem.scm
+%%DATADIR%%/scheme/image.scm
 %%DATADIR%%/scheme/list-keys.scm
+%%DATADIR%%/scheme/pcb.scm
 %%DATADIR%%/scheme/print-NB-attribs.scm
+%%DATADIR%%/scheme/print.scm
 %%DATADIR%%/system-gschemrc
 %%NLS%%share/locale/de_DE/LC_MESSAGES/geda-gschem.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
@@ -34,18 +37,16 @@ bin/gschem
 %%NLS%%share/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
 %%NLS%%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
+%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl_NL
+%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja_JP
+%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it_IT
+%%NLS%%@dirrmtry share/locale/fr_FR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr_FR
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
 @dirrmtry %%DATADIR%%/scheme
 @dirrmtry %%DATADIR%%/bitmap
 @dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%/man
-@dirrmtry %%DOCSDIR%%