10 files changed, 114 insertions, 12 deletions
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index b9f46811f47..82fcc82ca1a 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.37 2004/10/15 14:50:05 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/01/11 03:16:22 dmcmahill Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
-PKGREVISION=	2
 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/
 COMMENT=	Toolset for automating electronic design
 
+DEPENDS+=	gattrib-${PKGVERSION}{,nb[0-9]*}:../../cad/gattrib
 DEPENDS+=	gschem-${PKGVERSION}{,nb[0-9]*}:../../cad/gschem
 DEPENDS+=	gnetlist-${PKGVERSION}{,nb[0-9]*}:../../cad/gnetlist
 DEPENDS+=	gsymcheck-${PKGVERSION}{,nb[0-9]*}:../../cad/gsymcheck
diff --git a/cad/geda/Makefile.common b/cad/geda/Makefile.common
index d87b0e0fef1..1ad13c8d40b 100644
--- a/cad/geda/Makefile.common
+++ b/cad/geda/Makefile.common
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2004/03/05 13:03:47 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/01/11 03:16:22 dmcmahill Exp $
 #
 
 DIST_SUBDIR=	geda
-PKGVERSION=	20040111
+PKGVERSION=	20041228
+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}/
diff --git a/cad/geda/PLIST b/cad/geda/PLIST
index 264fb6252bc..0002cefff20 100644
--- a/cad/geda/PLIST
+++ b/cad/geda/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/05 13:03:47 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/11 03:16:22 dmcmahill Exp $
 bin/geda
+bin/graphman
 bin/raw2gw
+${PKGLOCALEDIR}/locale/fr_FR/LC_MESSAGES/geda.mo
+${PKGLOCALEDIR}/locale/it_IT/LC_MESSAGES/geda.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/geda.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/geda.mo
diff --git a/cad/geda/distinfo b/cad/geda/distinfo
index 636e1f149b5..2e7f922888e 100644
--- a/cad/geda/distinfo
+++ b/cad/geda/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.3 2004/03/05 13:03:47 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2005/01/11 03:16:22 dmcmahill Exp $
 
-SHA1 (geda/geda-20040111.tar.gz) = cfa387e046658c9a39eb976c2792b00663f24ce2
-Size (geda/geda-20040111.tar.gz) = 329653 bytes
+SHA1 (geda/geda-20041228.tar.gz) = 6755093bcffddc785d311139caf6f838070c60ff
+Size (geda/geda-20041228.tar.gz) = 390623 bytes
 SHA1 (patch-aa) = 27f6766661153845e8333d4f83a1b2fbc42b70d1
+SHA1 (patch-ab) = ca6c6c341fe3407b16d13efc154c2a9f93198c58
+SHA1 (patch-ac) = 3e9c0fcbfc8027eb08bf30d7bc646a31bbee34d8
+SHA1 (patch-ad) = 69caeab10a89574e0dec1be78b57573073da6559
+SHA1 (patch-ae) = dde71f448a9af6fc04745d411f74a4efba39889e
+SHA1 (patch-af) = 50ccb1f6a9afb18f80caabbac4b7da99e99908c5
+SHA1 (patch-ag) = 036e971d75bb1c3632444afe68897060c928fd48
diff --git a/cad/geda/patches/patch-ab b/cad/geda/patches/patch-ab
new file mode 100644
index 00000000000..b894f40f0ba
--- /dev/null
+++ b/cad/geda/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- graphman/callbacks.c.orig	2004-08-31 02:57:44.000000000 +0000
++++ graphman/callbacks.c
+@@ -19,7 +19,11 @@
+ /*******************************************************************************/
+ 
+ #ifdef HAVE_CONFIG_H
+-#  include <config.h>
++#  include "../config.h"
++#endif
++
++#ifdef HAVE_UNISTD_H
++#  include <unistd.h>
+ #endif
+ 
+ #include <gtk/gtk.h>
+@@ -28,6 +32,7 @@
+ #include "global.h"
+ #include "graph.h"
+ #include "interface.h"
++#include "libstring.h"
+ #include "support.h"
+ #include "value.h"
+ 
diff --git a/cad/geda/patches/patch-ac b/cad/geda/patches/patch-ac
new file mode 100644
index 00000000000..4c87ff3cc3c
--- /dev/null
+++ b/cad/geda/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- src/doc.c.orig	2003-12-11 08:44:17.000000000 +0000
++++ src/doc.c
+@@ -38,6 +38,7 @@
+ #include "filetool.h"
+ #include "global.h"
+ #include "m_action.h"
++#include "m_project.h"
+ #include "msgbox.h"
+ #include "project.h"
+ #include "support.h"
diff --git a/cad/geda/patches/patch-ad b/cad/geda/patches/patch-ad
new file mode 100644
index 00000000000..b667793aae7
--- /dev/null
+++ b/cad/geda/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- src/callbacks.c.orig	2003-12-09 08:03:14.000000000 +0000
++++ src/callbacks.c
+@@ -39,4 +39,5 @@
+ gboolean on_MainWindow_delete_event(GtkWidget *pWidget, GdkEvent *pEvent, gpointer pUserData)
+ {
+ 	ProjectExit_MenuActivation(GTK_MENU_ITEM(pWidget), pUserData);
++	return 0;
+ }
diff --git a/cad/geda/patches/patch-ae b/cad/geda/patches/patch-ae
new file mode 100644
index 00000000000..13e9f5c6949
--- /dev/null
+++ b/cad/geda/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- graphman/libstring.c.orig	2004-08-30 21:02:42.000000000 +0000
++++ graphman/libstring.c
+@@ -18,6 +18,7 @@
+ /*                                                                             */
+ /*******************************************************************************/
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "libstring.h"
diff --git a/cad/geda/patches/patch-af b/cad/geda/patches/patch-af
new file mode 100644
index 00000000000..c9ddec009a4
--- /dev/null
+++ b/cad/geda/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- graphman/main.c.orig	2004-08-31 02:57:45.000000000 +0000
++++ graphman/main.c
+@@ -19,7 +19,7 @@
+ /*******************************************************************************/
+ 
+ #ifdef HAVE_CONFIG_H
+-#  include <config.h>
++#  include <../config.h>
+ #endif
+ 
+ #include <gtk/gtk.h>
+@@ -34,6 +34,7 @@
+ #include "interface.h"
+ #include "libstring.h"
+ #include "support.h"
++#include "value.h"
+ 
+ 
+ 
diff --git a/cad/geda/patches/patch-ag b/cad/geda/patches/patch-ag
new file mode 100644
index 00000000000..6a4b44d604d
--- /dev/null
+++ b/cad/geda/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/01/11 03:16:22 dmcmahill Exp $
+
+--- graphman/config.c.orig	2004-08-30 21:02:42.000000000 +0000
++++ graphman/config.c
+@@ -272,7 +272,7 @@ static int ConfigReadLine(char *szLine)
+ 
+ *******************************************************************************/
+ 
+-static cSeparator = ',';
++static char cSeparator = ',';
+ 
+ 
+ static BOOL IsSeparator(const char c)