aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--misc/dahdi/Makefile3
-rw-r--r--misc/dahdi/files/patch-tools-dahdi_monitor.c10
-rw-r--r--misc/dahdi/files/patch-tools-menuselect-Makefile11
3 files changed, 23 insertions, 1 deletions
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index 2a73c79eba36..51458758e420 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dahdi
PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc
MASTER_SITES= LOCAL/fjoe
DISTNAME= ${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
@@ -23,6 +23,7 @@ CONFIGURE_ENV= WGET=/usr/bin/fetch
WRKSRC= ${WRKDIR}/${DISTNAME}/tools
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
USE_LDCONFIG= yes
+MAKE_ENV= HOST_CC=${CC}
CONFLICTS= zaptel-[0-9]*
diff --git a/misc/dahdi/files/patch-tools-dahdi_monitor.c b/misc/dahdi/files/patch-tools-dahdi_monitor.c
new file mode 100644
index 000000000000..86e70b0e40d8
--- /dev/null
+++ b/misc/dahdi/files/patch-tools-dahdi_monitor.c
@@ -0,0 +1,10 @@
+--- tools/dahdi_monitor.c.orig 2016-10-04 19:57:19.085982000 +0000
++++ tools/dahdi_monitor.c 2016-10-04 19:57:34.349843000 +0000
+@@ -368,6 +368,7 @@
+
+ chan = atoi(argv[1]);
+
++ optind = 2;
+ while ((opt = getopt(argc, argv, "vmol:f:r:t:s:F:R:T:S:")) != -1) {
+ switch (opt) {
+ case '?':
diff --git a/misc/dahdi/files/patch-tools-menuselect-Makefile b/misc/dahdi/files/patch-tools-menuselect-Makefile
new file mode 100644
index 000000000000..7c5d3589e847
--- /dev/null
+++ b/misc/dahdi/files/patch-tools-menuselect-Makefile
@@ -0,0 +1,11 @@
+--- tools/menuselect/Makefile.orig 2016-10-04 19:53:16.199527000 +0000
++++ tools/menuselect/Makefile 2016-10-04 19:53:31.943912000 +0000
+@@ -64,7 +64,7 @@
+ $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h
+
+ makeopts autoconfig.h: autoconfig.h.in makeopts.in
+- @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
++ @./configure $(CONFIGURE_SILENT) CC=${CC} LD= AR= CFLAGS=
+
+ $(ALL_TGTS): mxml/libmxml.a
+