cad/geda: unbreak the port's build (specifically, linking)

Add missing -lgio-2.0 to several LDFLAGS which require it.
While here, fix the configure script to respect the passed
--with-libstroke=${LOCALBASE} correctly.

7 files changed, 68 insertions, 8 deletions

diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 5280ef26d6e4..73f9c68174e2 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -12,12 +12,6 @@ WWW=		http://www.gpleda.org/
 
 LICENSE=	GPLv2+
 
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN=		ld: error: ../src/.libs/libgeda.so: undefined reference to g_input_stream_get_type
-.endif
-DEPRECATED=	Broken with lld
-EXPIRATION_DATE=	2023-03-20
-
 LIB_DEPENDS=	libstroke.so:devel/libstroke \
 		libguile.so:lang/guile1
 RUN_DEPENDS=	gawk:lang/gawk\
@@ -35,8 +29,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-gaf
 DATADIR=	${PREFIX}/share/gEDA
 INFO=		geda-scheme
diff --git a/cad/geda/files/patch-configure b/cad/geda/files/patch-configure
index 6b0d73778f53..92a9ead263c7 100644
--- a/cad/geda/files/patch-configure
+++ b/cad/geda/files/patch-configure
@@ -9,3 +9,12 @@
    case "$host" in
      *-*-linux*)
        OS_LINUX=yes
+@@ -20127,7 +20127,7 @@ fi
+ 
+     # If a prefix to search was specified, then add the appropriate
+     # flags.
+-    if test "X$libstroke_use" = "X"; then
++    if test -n "$libstroke_prefix"; then
+       LIBSTROKE_LDFLAGS="-L$libstroke_prefix/lib"
+       LIBSTROKE_CFLAGS="-I$libstroke_prefix/include"
+     fi
diff --git a/cad/geda/files/patch-gnetlist_src_Makefile.in b/cad/geda/files/patch-gnetlist_src_Makefile.in
new file mode 100644
index 000000000000..825787a1726f
--- /dev/null
+++ b/cad/geda/files/patch-gnetlist_src_Makefile.in
@@ -0,0 +1,11 @@
+--- gnetlist/src/Makefile.in.orig	2013-09-25 21:55:31 UTC
++++ gnetlist/src/Makefile.in
+@@ -439,7 +439,7 @@ gnetlist_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I
+ gnetlist_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \
+ 	$(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+ 
+-gnetlist_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
++gnetlist_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
+ gnetlist_LDADD = $(top_builddir)/libgeda/src/libgeda.la
+ MOSTLYCLEANFILES = *.log *.ps core FILE *~
+ CLEANFILES = *.log *.ps core FILE *~
diff --git a/cad/geda/files/patch-gsymcheck_src_Makefile.in b/cad/geda/files/patch-gsymcheck_src_Makefile.in
new file mode 100644
index 000000000000..57aa7cfe4505
--- /dev/null
+++ b/cad/geda/files/patch-gsymcheck_src_Makefile.in
@@ -0,0 +1,11 @@
+--- gsymcheck/src/Makefile.in.orig	2013-09-25 21:55:33 UTC
++++ gsymcheck/src/Makefile.in
+@@ -428,7 +428,7 @@ gsymcheck_CPPFLAGS = -I$(top_srcdir)/libgeda/include -
+ gsymcheck_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \
+ 	$(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+ 
+-gsymcheck_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
++gsymcheck_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
+ gsymcheck_LDADD = $(top_builddir)/libgeda/src/libgeda.la
+ MOSTLYCLEANFILES = *.log *.ps core FILE *~
+ CLEANFILES = *.log *.ps core FILE *~
diff --git a/cad/geda/files/patch-libgeda_shell_Makefile.in b/cad/geda/files/patch-libgeda_shell_Makefile.in
new file mode 100644
index 000000000000..e7d44fa9b997
--- /dev/null
+++ b/cad/geda/files/patch-libgeda_shell_Makefile.in
@@ -0,0 +1,11 @@
+--- libgeda/shell/Makefile.in.orig	2013-09-25 21:55:33 UTC
++++ libgeda/shell/Makefile.in
+@@ -416,7 +416,7 @@ geda_shell_CFLAGS = \
+ 	$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \
+ 	$(GDK_PIXBUF_CFLAGS)
+ 
+-geda_shell_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
++geda_shell_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
+ geda_shell_LDADD = ../src/libgeda.la @LIBINTL@
+ 
+ # This is used to generate boilerplate for defining Scheme functions
diff --git a/cad/geda/files/patch-utils_gschlas_Makefile.in b/cad/geda/files/patch-utils_gschlas_Makefile.in
new file mode 100644
index 000000000000..347b23be5906
--- /dev/null
+++ b/cad/geda/files/patch-utils_gschlas_Makefile.in
@@ -0,0 +1,11 @@
+--- utils/gschlas/Makefile.in.orig	2013-09-25 21:55:34 UTC
++++ utils/gschlas/Makefile.in
+@@ -425,7 +425,7 @@ gschlas_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I$
+ gschlas_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS) $(GLIB_CFLAGS) \
+ 	$(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+ 
+-gschlas_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
++gschlas_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
+ gschlas_LDADD = $(top_builddir)/libgeda/src/libgeda.la
+ MOSTLYCLEANFILES = *.log *.ps core FILE *~
+ CLEANFILES = *.log *.ps core FILE *~
diff --git a/cad/geda/files/patch-utils_src_Makefile.in b/cad/geda/files/patch-utils_src_Makefile.in
new file mode 100644
index 000000000000..362cfc6a9708
--- /dev/null
+++ b/cad/geda/files/patch-utils_src_Makefile.in
@@ -0,0 +1,15 @@
+--- utils/src/Makefile.in.orig	2013-09-25 21:55:34 UTC
++++ utils/src/Makefile.in
+@@ -462,10 +462,10 @@ gsch2pcb_CPPFLAGS = \
+ 	-DPCBLIBPATH=\"$(PCBLIBPATH)\"
+ 
+ gsch2pcb_CFLAGS = $(GLIB_CFLAGS)
+-gsch2pcb_LDFLAGS = $(GLIB_LIBS)
++gsch2pcb_LDFLAGS = $(GLIB_LIBS) -lgio-2.0
+ sarlacc_schem_SOURCES = sarlacc_schem.c
+ sarlacc_schem_CFLAGS = $(GLIB_CFLAGS) $(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS)
+-sarlacc_schem_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
++sarlacc_schem_LDFLAGS = $(GLIB_LIBS) -lgio-2.0 $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
+ sarlacc_schem_LDADD = $(top_builddir)/libgeda/src/libgeda.la
+ AM_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLIGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/libgeda/include -I$(srcdir)/../include \