make it buildable

fix last submit/commit

Submitted by: bsd, maintainer

5 files changed, 0 insertions, 341 deletions

diff --git a/cad/geda-gschem/files/patch-aa b/cad/geda-gschem/files/patch-aa
deleted file mode 100644
index 3e4ab7790ec5..000000000000
--- a/cad/geda-gschem/files/patch-aa
+++ /dev/null
@@ -1,79 +0,0 @@
---- /usr/ports/cad/gschem/work/gschem/configure.in	Mon Mar  5 00:45:50 2001
-+++ configure.in	Thu Mar  8 19:04:23 2001
-@@ -142,44 +142,41 @@
- # search for libgdgeda-config
- AC_PATH_PROG(LIBGDGEDACONFIG, libgdgeda-config, no, ${PATH})
- 
--if test $LIBGDGEDACONFIG = "no"; then
-+if test $LIBGDGEDACONFIG = "no" -o no_gdgeda = yes; then
-+	 GDGEDA_LIB=""
-          libgdgeda_ldflags=""
-          libgdgeda_cflags=""
- else
-          libgdgeda_ldflags=`$LIBGDGEDACONFIG --libs`
-          libgdgeda_cflags=`$LIBGDGEDACONFIG --cflags`
-          GD_EXTRA="$libgdgeda_cflags $libgdgeda_ldflags -lm"
--fi
--
--AC_CHECK_LIB(gdgeda, gdImageColorAllocate, GDGEDA_LIB="-lgdgeda", GDGEDA_LIB=no, $GD_EXTRA)
--
-+         X_CFLAGS="$libgdgeda_cflags"
- 
--
--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, zlibVersion, 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
-+                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
- 
- # search for gtkextra-config
-@@ -240,7 +237,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(
diff --git a/cad/gschem/files/patch-aa b/cad/gschem/files/patch-aa
deleted file mode 100644
index 3e4ab7790ec5..000000000000
--- a/cad/gschem/files/patch-aa
+++ /dev/null
@@ -1,79 +0,0 @@
---- /usr/ports/cad/gschem/work/gschem/configure.in	Mon Mar  5 00:45:50 2001
-+++ configure.in	Thu Mar  8 19:04:23 2001
-@@ -142,44 +142,41 @@
- # search for libgdgeda-config
- AC_PATH_PROG(LIBGDGEDACONFIG, libgdgeda-config, no, ${PATH})
- 
--if test $LIBGDGEDACONFIG = "no"; then
-+if test $LIBGDGEDACONFIG = "no" -o no_gdgeda = yes; then
-+	 GDGEDA_LIB=""
-          libgdgeda_ldflags=""
-          libgdgeda_cflags=""
- else
-          libgdgeda_ldflags=`$LIBGDGEDACONFIG --libs`
-          libgdgeda_cflags=`$LIBGDGEDACONFIG --cflags`
-          GD_EXTRA="$libgdgeda_cflags $libgdgeda_ldflags -lm"
--fi
--
--AC_CHECK_LIB(gdgeda, gdImageColorAllocate, GDGEDA_LIB="-lgdgeda", GDGEDA_LIB=no, $GD_EXTRA)
--
-+         X_CFLAGS="$libgdgeda_cflags"
- 
--
--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, zlibVersion, 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
-+                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
- 
- # search for gtkextra-config
-@@ -240,7 +237,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(
diff --git a/cad/libgeda/files/patch-aa b/cad/libgeda/files/patch-aa
deleted file mode 100644
index 64660158dfe1..000000000000
--- a/cad/libgeda/files/patch-aa
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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
deleted file mode 100644
index fb321d92b247..000000000000
--- a/cad/libgeda/files/patch-ab
+++ /dev/null
@@ -1,85 +0,0 @@
-*** 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
deleted file mode 100644
index d925cab18783..000000000000
--- a/cad/libgeda/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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      
-