summaryrefslogtreecommitdiff
path: root/cad/gschem
diff options
context:
space:
mode:
Diffstat (limited to 'cad/gschem')
-rw-r--r--cad/gschem/Makefile8
-rw-r--r--cad/gschem/PLIST3
-rw-r--r--cad/gschem/distinfo15
-rw-r--r--cad/gschem/patches/patch-aa13
-rw-r--r--cad/gschem/patches/patch-ab21
-rw-r--r--cad/gschem/patches/patch-ac13
-rw-r--r--cad/gschem/patches/patch-ad13
-rw-r--r--cad/gschem/patches/patch-ae13
-rw-r--r--cad/gschem/patches/patch-af31
-rw-r--r--cad/gschem/patches/patch-ag22
-rw-r--r--cad/gschem/patches/patch-ah13
11 files changed, 143 insertions, 22 deletions
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 1e89ae6d7cf..48926c208ad 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/01/11 03:16:23 dmcmahill Exp $
#
DISTNAME= geda-gschem-${PKGVERSION}
PKGNAME= gschem-${PKGVERSION}
-PKGREVISION= 3
CATEGORIES= cad
-MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
- ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
- http://www.geda.seul.org/devel/${PKGVERSION}/ \
- http://www.geda.coelacanth.com/devel/${PKGVERSION}/
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://www.geda.seul.org/
@@ -23,6 +18,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
+USE_MAKEINFO= YES
INFO_FILES= gschemdoc.info
.include "../../cad/libgeda/buildlink3.mk"
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index 3a0d8c974c7..584e436ea1b 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/03/05 13:03:48 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/01/11 03:16:23 dmcmahill Exp $
bin/gschem
man/man1/gschem.1
share/doc/geda-doc/man/gschem.html
@@ -28,6 +28,7 @@ share/gEDA/scheme/list-keys.scm
share/gEDA/scheme/print-NB-attribs.scm
share/gEDA/system-gschemrc
${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/geda-gschem.mo
+${PKGLOCALEDIR}/locale/it_IT/LC_MESSAGES/geda-gschem.mo
${PKGLOCALEDIR}/locale/ja_JP/LC_MESSAGES/geda-gschem.mo
${PKGLOCALEDIR}/locale/nl_NL/LC_MESSAGES/geda-gschem.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/geda-gschem.mo
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo
index d2b7da0f7ca..da6132fe8f6 100644
--- a/cad/gschem/distinfo
+++ b/cad/gschem/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/03/05 13:03:48 dmcmahill Exp $
+$NetBSD: distinfo,v 1.11 2005/01/11 03:16:24 dmcmahill Exp $
-SHA1 (geda/geda-gschem-20040111.tar.gz) = 5a27a14ffd04821a2f262960b4992f181709cfee
-Size (geda/geda-gschem-20040111.tar.gz) = 1433206 bytes
-SHA1 (patch-ab) = b5806b57edd1d5ba3159c4f63a1b1c6678cedaec
+SHA1 (geda/geda-gschem-20041228.tar.gz) = d6223ea450f4ae5f4917c1209269febf89380e19
+Size (geda/geda-gschem-20041228.tar.gz) = 1464961 bytes
+SHA1 (patch-aa) = 2a5a099b01179113fa295a2bd6c6c3c48ad4ea45
+SHA1 (patch-ab) = fc16c5328139a3e0f650cf5eb4b22159aa8210e1
+SHA1 (patch-ac) = d433f3fcedb2d2917c2dff8e432158c7a44a36af
+SHA1 (patch-ad) = 1b7ad847f99a3b99a46ad22398cf257f74dfbef9
+SHA1 (patch-ae) = ea40638a0b9c606cce946c216d61f6dbf9813130
+SHA1 (patch-af) = 0ceda5f105bfec5c2c2fc0cc7932d2e37f99d43f
+SHA1 (patch-ag) = 434f25acf5b5f3bd25bf0dd1c28084a84d5dcbb2
+SHA1 (patch-ah) = 1e49e0ac986edacf760c1b74050b93db33942488
diff --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa
new file mode 100644
index 00000000000..bf82b41822f
--- /dev/null
+++ b/cad/gschem/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- noweb/g_key.nw.orig 2003-10-20 03:37:25.000000000 +0000
++++ noweb/g_key.nw
+@@ -154,7 +154,7 @@ SCM g_key_ ## name(void) \
+ return SCM_BOOL_T; \
+ }
+
+-DEFINE_G_KEY(file_new)
++DEFINE_G_KEY(gedafile_new)
+
+ DEFINE_G_KEY(file_new_window)
+
diff --git a/cad/gschem/patches/patch-ab b/cad/gschem/patches/patch-ab
index 2eb0f5d92da..54f15f297be 100644
--- a/cad/gschem/patches/patch-ab
+++ b/cad/gschem/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2003/07/09 14:46:00 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/11 03:16:24 dmcmahill Exp $
---- src/gschem.c.orig 2003-07-09 15:02:04.000000000 +0200
-+++ src/gschem.c 2003-07-09 15:02:41.000000000 +0200
-@@ -32,6 +32,9 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef ENABLE_NLS
-+#include <locale.h>
-+#endif
+--- src/g_key.c.orig 2004-12-29 04:08:32.000000000 +0000
++++ src/g_key.c
+@@ -110,7 +110,7 @@ SCM g_key_ ## name(void) \
+ return SCM_BOOL_T; \
+ }
- #include <libgeda/libgeda.h>
+-DEFINE_G_KEY(file_new)
++DEFINE_G_KEY(gedafile_new)
+
+ DEFINE_G_KEY(file_new_window)
diff --git a/cad/gschem/patches/patch-ac b/cad/gschem/patches/patch-ac
new file mode 100644
index 00000000000..49bb8e5f0e2
--- /dev/null
+++ b/cad/gschem/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- noweb/g_register.nw.orig 2004-12-29 02:00:39.000000000 +0000
++++ noweb/g_register.nw
+@@ -195,7 +195,7 @@ g_register_funcs(void)
+
+ /* keymapping callbacks */
+ gh_new_procedure0_0 ("file-new-window", g_key_file_new_window);
+- gh_new_procedure0_0 ("file-new", g_key_file_new);
++ gh_new_procedure0_0 ("file-new", g_key_gedafile_new);
+ gh_new_procedure0_0 ("file-open", g_key_file_open);
+ gh_new_procedure0_0 ("file-script", g_key_file_script);
+ gh_new_procedure0_0 ("file-save", g_key_file_save);
diff --git a/cad/gschem/patches/patch-ad b/cad/gschem/patches/patch-ad
new file mode 100644
index 00000000000..3e8491f478a
--- /dev/null
+++ b/cad/gschem/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- src/g_register.c.orig 2004-12-29 04:08:28.000000000 +0000
++++ src/g_register.c
+@@ -156,7 +156,7 @@ void g_register_funcs(void)
+
+ /* keymapping callbacks */
+ gh_new_procedure0_0("file-new-window", g_key_file_new_window);
+- gh_new_procedure0_0("file-new", g_key_file_new);
++ gh_new_procedure0_0("file-new", g_key_gedafile_new);
+ gh_new_procedure0_0("file-open", g_key_file_open);
+ gh_new_procedure0_0("file-script", g_key_file_script);
+ gh_new_procedure0_0("file-save", g_key_file_save);
diff --git a/cad/gschem/patches/patch-ae b/cad/gschem/patches/patch-ae
new file mode 100644
index 00000000000..66069914718
--- /dev/null
+++ b/cad/gschem/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- include/prototype.h.orig 2004-12-29 02:06:45.000000000 +0000
++++ include/prototype.h
+@@ -27,7 +27,7 @@ SCM g_set_attrib_value_x(SCM attrib_smob
+ /* g_key.c */
+ void set_window_current_key(TOPLEVEL *w_current);
+ void g_key_execute(int state, int keyval);
+-SCM g_key_file_new(void);
++SCM g_key_gedafile_new(void);
+ SCM g_key_file_new_window(void);
+ SCM g_key_file_open(void);
+ SCM g_key_file_script(void);
diff --git a/cad/gschem/patches/patch-af b/cad/gschem/patches/patch-af
new file mode 100644
index 00000000000..aa457b806a2
--- /dev/null
+++ b/cad/gschem/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.3 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- src/i_callbacks.c.orig 2004-12-29 04:08:37.000000000 +0000
++++ src/i_callbacks.c
+@@ -168,7 +168,7 @@ initiate_gschemdoc(const char *documenta
+ /* don't use the widget parameter on this function, or do some checking... */
+ /* since there is a call: widget = NULL, data = 0 (will be w_current hack) */
+ /* This should be renamed to page_new perhaps... */
+-DEFINE_I_CALLBACK(file_new)
++DEFINE_I_CALLBACK(gedafile_new)
+ {
+ TOPLEVEL *w_current = (TOPLEVEL *) data;
+ char *temp_filename;
+@@ -231,7 +231,7 @@ void i_callback_toolbar_file_new(GtkWidg
+ if (!w_current->window)
+ return;
+
+- i_callback_file_new((TOPLEVEL *) data, 0, NULL);
++ i_callback_gedafile_new((TOPLEVEL *) data, 0, NULL);
+ }
+
+
+@@ -264,7 +264,7 @@ DEFINE_I_CALLBACK(file_new_window)
+ w_current->series_name, w_current->num_untitled);
+ } else {
+ /* TODO: shouldn't this part do the same thing as
+- * what's equivalent in i_callback_file_new()? This is
++ * what's equivalent in i_callback_gedafile_new()? This is
+ * not nice to user. */
+ fprintf(stderr, _("Cannot obtain the current directory!\n"));
+ }
diff --git a/cad/gschem/patches/patch-ag b/cad/gschem/patches/patch-ag
new file mode 100644
index 00000000000..1ed00629320
--- /dev/null
+++ b/cad/gschem/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- src/x_fileselect.c.orig 2004-12-29 04:09:21.000000000 +0000
++++ src/x_fileselect.c
+@@ -628,7 +628,7 @@ void x_fileselect_saveas_close(GtkWidget
+
+ if (f_current->filesel_type == SAVEAS_NEW) {
+ w_current->page_current->CHANGED = 0;
+- i_callback_file_new(w_current, 0, NULL);
++ i_callback_gedafile_new(w_current, 0, NULL);
+ }
+ #endif
+
+@@ -681,7 +681,7 @@ void x_fileselect_saveas(GtkWidget * w,
+ } else if (f_current->filesel_type == SAVEAS_OPEN) {
+ i_callback_file_open(w_current, 0, NULL);
+ } else if (f_current->filesel_type == SAVEAS_NEW) {
+- i_callback_file_new(w_current, 0, NULL);
++ i_callback_gedafile_new(w_current, 0, NULL);
+ } else if (f_current->filesel_type == SAVEAS_CLOSE) {
+ i_callback_page_close(w_current, 0, NULL);
+ }
diff --git a/cad/gschem/patches/patch-ah b/cad/gschem/patches/patch-ah
new file mode 100644
index 00000000000..f066de0c7e9
--- /dev/null
+++ b/cad/gschem/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/01/11 03:16:24 dmcmahill Exp $
+
+--- src/x_pagesel.c.orig 2004-12-29 04:09:14.000000000 +0000
++++ src/x_pagesel.c
+@@ -131,7 +131,7 @@ gint save_page(GtkWidget * gtklist, TOPL
+ #line 225 "../noweb/x_pagesel.nw"
+ gint file_new(GtkWidget * gtklist, TOPLEVEL * w_current)
+ {
+- i_callback_file_new(w_current, 0, NULL);
++ i_callback_gedafile_new(w_current, 0, NULL);
+
+ return (0);
+ }