svn commit: r372806 - in head/cad/geda: . files

[John Marino]

Author: marino
Date: Wed Nov 19 19:17:06 2014
New Revision: 372806
URL: https://svnweb.freebsd.org/changeset/ports/372806
QAT: https://qat.redports.org/buildarchive/r372806/

Log:
  cad/geda: fix gsch2pcb utility by using gnu M4
  
  PR:		195155
  Submitted by:	Tobias Rehbein

Added:
  head/cad/geda/files/patch-utils__src__gsch2pcb.c   (contents, props changed)
Modified:
  head/cad/geda/Makefile
  head/cad/geda/pkg-plist

Modified: head/cad/geda/Makefile
==============================================================================
--- head/cad/geda/Makefile	Wed Nov 19 19:07:47 2014	(r372805)
+++ head/cad/geda/Makefile	Wed Nov 19 19:17:06 2014	(r372806)
@@ -17,7 +17,8 @@ LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libstroke.so:${PORTSDIR}/devel/libstroke \
 		libguile.so:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk\
+		m4>=1.4.11:${PORTSDIR}/devel/m4
 
 USES=		desktop-file-utils gettext gmake libtool pathfix perl5 \
 		pkgconfig python:run shared-mime-info shebangfix
@@ -29,6 +30,7 @@ SHEBANG_FILES=	examples/lightning_detect
 USE_GNOME=	gtk20
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
 CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

Added: head/cad/geda/files/patch-utils__src__gsch2pcb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/geda/files/patch-utils__src__gsch2pcb.c	Wed Nov 19 19:17:06 2014	(r372806)
@@ -0,0 +1,18 @@
+--- utils/src/gsch2pcb.c.orig	2013-08-18 08:44:47.000000000 +0200
++++ utils/src/gsch2pcb.c	2014-11-18 18:53:20.303642614 +0100
+@@ -1397,13 +1397,13 @@
+   pcbdata_path = g_getenv ("PCBDATA");  /* do not free return value */
+   if (pcbdata_path != NULL) {
+     /* If PCBDATA is set, use the value */
+-    m4_pcbdir = g_strconcat (pcbdata_path, "/pcb/m4", NULL);
++    m4_pcbdir = g_strconcat (pcbdata_path, "/m4", NULL);
+   } else {
+     /* Use the default value passed in from the configure script
+      * instead of trying to hard code a value which is very
+      * likely wrong
+      */
+-    m4_pcbdir = g_strconcat (PCBDATADIR, "/pcb/m4", NULL);
++    m4_pcbdir = g_strconcat (PCBDATADIR, "/m4", NULL);
+   }
+ 
+   default_m4_pcbdir = g_strdup (m4_pcbdir);

Modified: head/cad/geda/pkg-plist
==============================================================================
--- head/cad/geda/pkg-plist	Wed Nov 19 19:07:47 2014	(r372805)
+++ head/cad/geda/pkg-plist	Wed Nov 19 19:17:06 2014	(r372806)
@@ -2341,3 +2341,4 @@ share/mime/application/x-geda-gsch2pcb-p
 share/mime/application/x-geda-schematic.xml
 share/mime/application/x-geda-symbol.xml
 share/mime/packages/libgeda.xml
+ at dir %%DATADIR%%/sym/local