libgeda is a a base library common to all the gEDA tools

Submitted by:	bruno.schwander@technologist.com

9 files changed, 231 insertions, 0 deletions

diff --git a/cad/Makefile b/cad/Makefile
index b2eff5c74861..2d6475785532 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += irsim
     SUBDIR += iverilog
     SUBDIR += kaskade
+    SUBDIR += libgeda
     SUBDIR += magic
     SUBDIR += mars
     SUBDIR += oregano
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
new file mode 100644
index 000000000000..4a3f5b1936fa
--- /dev/null
+++ b/cad/libgeda/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	geda
+# Date created:			4 April 2001
+# Whom:				bruno schwander <bruno@tinkerbox.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libgeda
+PORTVERSION=	20010304
+CATEGORIES=	cad
+MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/20010304/ \
+		http://geda.seul.org/devel/20010304/ \
+		http://www.tinkerbox.org/projects/files/gEDA/
+
+MAINTAINER=	bruno@tinkerbox.org
+
+LIB_DEPENDS=	gdgeda.4:${PORTSDIR}/graphics/libgdgeda
+
+USE_LIBTOOL=	yes
+USE_AUTOCONF=	yes
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-gdgeda
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+WRKSRC=		${WRKDIR}/libgeda
+
+.include <bsd.port.mk>
diff --git a/cad/libgeda/distinfo b/cad/libgeda/distinfo
new file mode 100644
index 000000000000..fc469fcb7d60
--- /dev/null
+++ b/cad/libgeda/distinfo
@@ -0,0 +1 @@
+MD5 (libgeda-20010304.tar.gz) = c7848e74d09c20b039e03930091665f9
diff --git a/cad/libgeda/files/patch-aa b/cad/libgeda/files/patch-aa
new file mode 100644
index 000000000000..64660158dfe1
--- /dev/null
+++ b/cad/libgeda/files/patch-aa
@@ -0,0 +1,77 @@
+--- configure.in.orig	Sun Mar  4 23:38:32 2001
++++ configure.in	Sat Mar 10 21:32:04 2001
+@@ -167,7 +167,7 @@
+ dnl CFLAGS="$CFLAGS $CFEXTRA `$GTK_CONFIG --cflags`"
+ 
+ CFLAGS="`$GTK_CONFIG --cflags` $CFLAGS $CFEXTRA"
+-LDFLAGS="$LDEXTRA `$GTK_CONFIG --libs` -lgtk -lgdk -lglib $LDFLAGS -lm"
++LDFLAGS="$LDEXTRA `$GTK_CONFIG --libs` $LDFLAGS -lm"
+ 
+ AC_MSG_CHECKING([for the rest of gtk])
+ AC_TRY_COMPILE(
+@@ -208,34 +208,31 @@
+          libgdgeda_cflags=`$LIBGDGEDACONFIG --cflags`
+          GD_EXTRA="$libgdgeda_cflags $libgdgeda_ldflags -lm"
+          X_CFLAGS="$libgdgeda_cflags `$GTK_CONFIG --cflags`"
+-fi
+ 
+-AC_CHECK_LIB(gdgeda, gdImageColorAllocate, GDGEDA_LIB="-lgdgeda", GDGEDA_LIB=no, $GD_EXTRA)
+ 
+-if test $GDGEDA_LIB = no; then
+-        GDGEDA_LIB=""
+-else
+-        if test "$no_gdgeda" = "yes"; then
+-                echo found libgdgeda, but disabling gdgeda
+-                GDGEDA_LIB=""
+-         	libgdgeda_ldflags=""
+-         	libgdgeda_cflags=""
+-        else
+-                AC_CHECK_LIB(z, uncompress, Z_LIB="-lz", Z_LIB=no)
+-                if test $Z_LIB = no; then
+-                        AC_MSG_ERROR(Cannot find libz (zlib), be sure to install zlib; it is required for libgdgeda)
+-		fi
+-		
++	AC_CHECK_LIB(z, uncompress, Z_LIB="-lz", Z_LIB=no)
++	if test $Z_LIB = no; then
++		AC_MSG_ERROR(Cannot find libz (zlib), be sure to install zlib; it is required for libgdgeda)
++	else
+ 		PNG_EXTRA="-lz -lm"
+-                AC_CHECK_LIB(png, png_read_init, PNG_LIB="-lpng", PNG_LIB=no, $PNG_EXTRA)
+-                if test $PNG_LIB = no; then
+-                        AC_MSG_ERROR(Cannot find libpng, be sure to install png; it is required for libgdgeda)
+-                fi
+-
+-                AC_DEFINE(HAS_LIBZ)
+-                AC_DEFINE(HAS_LIBPNG)
+-                AC_DEFINE(HAS_LIBGDGEDA)
+-        fi
++		AC_CHECK_LIB(png, png_read_init, PNG_LIB="-lpng", PNG_LIB=no, $PNG_EXTRA)
++	        if test $PNG_LIB = no; then
++        		AC_MSG_ERROR(Cannot find libpng, be sure to install png; it is required for libgdgeda)
++        	else
++			GD_EXTRA="-lpng"
++			AC_CHECK_LIB(gdgeda, gdImageColorAllocate, GDGEDA_LIB="-lgdgeda", GDGEDA_LIB=no, $GD_EXTRA)
++
++			if test $GDGEDA_LIB = no; then
++		        	GDGEDA_LIB=""	
++	        	 	libgdgeda_ldflags=""
++	        	 	libgdgeda_cflags=""
++			else
++	        	        AC_DEFINE(HAS_LIBZ)
++		                AC_DEFINE(HAS_LIBPNG)
++	        	        AC_DEFINE(HAS_LIBGDGEDA)
++			fi
++		fi
++	fi
+ fi
+ 
+ if ! test "$CYGWIN"x = x; then
+@@ -306,6 +303,8 @@
+ AC_SUBST(GTK)
+ AC_SUBST(GDK)
+ AC_SUBST(GLIB)
++AC_SUBST(libgdgeda_ldflags)
++AC_SUBST(libgdgeda_cflags)
+ 
+ AC_OUTPUT([ 
+ 	Makefile 
diff --git a/cad/libgeda/files/patch-ab b/cad/libgeda/files/patch-ab
new file mode 100644
index 000000000000..fb321d92b247
--- /dev/null
+++ b/cad/libgeda/files/patch-ab
@@ -0,0 +1,85 @@
+*** src/s_cue_20010304.c	Mon Mar  5 21:11:17 2001
+--- src/s_cue.c	Mon Mar  5 21:11:24 2001
+***************
+*** 63,68 ****
+--- 63,69 ----
+      fprintf(fp, "%d %d fbox\n", offset2, offset2);
+  }
+  
++ 
+  void s_cue_postscript_fillcircle(TOPLEVEL * w_current, FILE * fp, int x,
+  				 int y)
+  {
+***************
+*** 77,82 ****
+--- 78,86 ----
+      fprintf(fp, "fill\n");
+  }
+  
++ 
++ #ifdef HAS_LIBGDGEDA
++ 
+  void s_cue_image_fillbox(TOPLEVEL * w_current, OBJECT * object, int world_x,
+  			 int world_y)
+  {
+***************
+*** 131,136 ****
+--- 135,143 ----
+  
+  }
+  
++ #endif
++ 
++ 
+  void s_cue_output_all(TOPLEVEL * w_current, OBJECT * head, FILE * fp,
+  		      int type)
+  {
+***************
+*** 206,221 ****
+--- 213,232 ----
+  	    if (count < 1) {	/* Didn't find anything connected there */
+  		if (output_type == POSTSCRIPT) {
+  		    s_cue_postscript_fillbox(w_current, fp, x, y);
++ #ifdef HAS_LIBGDGEDA
+  		} else if (output_type == PNG) {
+  		    s_cue_image_fillbox(w_current, object, x, y);
++ #endif
+  		}
+  
+  
+  	    } else if (count >= 2) {
+  		if (output_type == POSTSCRIPT) {
+  		    s_cue_postscript_fillcircle(w_current, fp, x, y);
++ #ifdef HAS_LIBGDGEDA
+  		} else if (output_type == PNG) {
+  		    s_cue_image_fillcircle(w_current, x, y);
++ #endif
+  		}
+  	    }
+  	}
+***************
+*** 224,231 ****
+--- 235,244 ----
+      case (CONN_MIDPOINT):
+  	if (output_type == POSTSCRIPT) {
+  	    s_cue_postscript_fillcircle(w_current, fp, x, y);
++ #ifdef HAS_LIBGDGEDA
+  	} else if (output_type == PNG) {
+  	    s_cue_image_fillcircle(w_current, x, y);
++ #endif
+  	}
+      }
+  
+***************
+*** 250,257 ****
+--- 263,272 ----
+  	    y = conn->y;
+  	    if (output_type == POSTSCRIPT) {
+  		s_cue_postscript_fillcircle(w_current, fp, x, y);
++ #ifdef HAS_LIBGDGEDA
+  	    } else if (output_type == PNG) {
+  		s_cue_image_fillcircle(w_current, x, y);
++ #endif
+  	    }
+  	    break;
+  	}
diff --git a/cad/libgeda/files/patch-ac b/cad/libgeda/files/patch-ac
new file mode 100644
index 000000000000..d925cab18783
--- /dev/null
+++ b/cad/libgeda/files/patch-ac
@@ -0,0 +1,21 @@
+--- libgeda-config.in.orig	Sat May 29 20:13:37 1999
++++ libgeda-config.in	Sat Mar 10 21:32:04 2001
+@@ -3,8 +3,8 @@
+ # This script is based on gtk-config from gtk+ 1.2.x
+ # Adapted for use in gEDA by Ales V. Hvezda
+ 
+-libgeda_libs="@libgeda_libs@"
+-libgeda_cflags="@libgeda_cflags@"
++libgeda_libs="@libgdgeda_ldflags@"
++libgeda_cflags="@libgdgeda_cflags@"
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+@@ -82,6 +82,6 @@
+ 
+ if test "$echo_libs" = "yes"; then
+ 	libdirs=-L${exec_prefix}/lib
+-	echo ${libdirs} -lgeda 
++	echo ${libdirs} -lgeda ${libgeda_libs}
+ fi      
+ 
diff --git a/cad/libgeda/pkg-comment b/cad/libgeda/pkg-comment
new file mode 100644
index 000000000000..b4c69a065b59
--- /dev/null
+++ b/cad/libgeda/pkg-comment
@@ -0,0 +1 @@
+gEDA tools base utility library
diff --git a/cad/libgeda/pkg-descr b/cad/libgeda/pkg-descr
new file mode 100644
index 000000000000..0d345b905cc7
--- /dev/null
+++ b/cad/libgeda/pkg-descr
@@ -0,0 +1,3 @@
+libgeda is a a base library common to all the gEDA tools
+
+WWW: http://www.geda.seul.org
diff --git a/cad/libgeda/pkg-plist b/cad/libgeda/pkg-plist
new file mode 100644
index 000000000000..6490f74b8878
--- /dev/null
+++ b/cad/libgeda/pkg-plist
@@ -0,0 +1,14 @@
+bin/libgeda-config
+include/libgeda/colors.h
+include/libgeda/defines.h
+include/libgeda/funcs.h
+include/libgeda/globals.h
+include/libgeda/o_types.h
+include/libgeda/pcb_struct.h
+include/libgeda/prototype.h
+include/libgeda/struct.h
+include/libgeda/libgeda.h
+lib/libgeda.so.12
+lib/libgeda.so
+lib/libgeda.a
+@dirrm include/libgeda