diff options
| author | John Marino <marino@FreeBSD.org> | 2014-11-19 19:17:06 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-11-19 19:17:06 +0000 |
| commit | bae8c9cbe961c8b239cc15f4640a70b86527facd (patch) | |
| tree | 7eff2fac1af1d79a29f1133d78dca4ebf99be866 /cad/geda | |
| parent | 2d6dc3b8242798591b9b9189129b671341454211 (diff) | |
| download | ports-bae8c9cbe961c8b239cc15f4640a70b86527facd.tar.gz ports-bae8c9cbe961c8b239cc15f4640a70b86527facd.zip | |
cad/geda: fix gsch2pcb utility by using gnu M4
PR: 195155
Submitted by: Tobias Rehbein
Notes
Notes:
svn path=/head/; revision=372806
Diffstat (limited to 'cad/geda')
| -rw-r--r-- | cad/geda/Makefile | 4 | ||||
| -rw-r--r-- | cad/geda/files/patch-utils__src__gsch2pcb.c | 18 | ||||
| -rw-r--r-- | cad/geda/pkg-plist | 1 |
3 files changed, 22 insertions, 1 deletions
diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 19f8f72735f1..a5b2563ca12e 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -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_detector/bom libgeda/docs/*.dox \ 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 diff --git a/cad/geda/files/patch-utils__src__gsch2pcb.c b/cad/geda/files/patch-utils__src__gsch2pcb.c new file mode 100644 index 000000000000..635b826091f0 --- /dev/null +++ b/cad/geda/files/patch-utils__src__gsch2pcb.c @@ -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); diff --git a/cad/geda/pkg-plist b/cad/geda/pkg-plist index d931bcfa12bf..4b4d368f4a46 100644 --- a/cad/geda/pkg-plist +++ b/cad/geda/pkg-plist @@ -2341,3 +2341,4 @@ share/mime/application/x-geda-gsch2pcb-project.xml share/mime/application/x-geda-schematic.xml share/mime/application/x-geda-symbol.xml share/mime/packages/libgeda.xml +@dir %%DATADIR%%/sym/local |