3 files changed, 38 insertions, 20 deletions

diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile
index 5faea29a13ca..4c87883daff9 100644
--- a/cad/linuxcnc-devel/Makefile
+++ b/cad/linuxcnc-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linuxcnc
 PORTVERSION=	20170708
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
@@ -12,10 +12,6 @@ COMMENT=	Open Source CNC machine controller
 
 LICENSE=	GPLv2
 
-BROKEN=		wrong DEPENDS
-DEPRECATED=	Broken for more than 5 months
-EXPIRATION_DATE=	2018-08-20
-
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
 		${PY_BOOST} \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -28,13 +24,13 @@ RUN_DEPENDS=	bash:shells/bash \
 		bwidget>=1.4:x11-toolkits/bwidget \
 		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext \
-		${LOCALBASE}/lib/Img/libtkimg1.4.6.so:graphics/libimg
+		${LOCALBASE}/lib/Img/libtkimg1.4.7.so:graphics/libimg
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-# Workaround for a clang crash on 12-CURRENT.
-BUILD_DEPENDS+=	clang38:lang/clang38
-CC=		clang38
-CXX=		clang++38
+## Workaround for a clang crash on 12-CURRENT.
+#BUILD_DEPENDS+=	clang38:lang/clang38
+#CC=		clang38
+#CXX=		clang++38
 
 NO_PACKAGE=	Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
 
@@ -46,7 +42,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-realtime=uspace --enable-non-distributable=yes \
 		CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \
-		--with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD}
+		--with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} \
+		--with-boost-python=boost_python27
 MAKE_ENV=	BUILD_VERBOSE=1
 USES=		autoreconf gettext gmake ncurses pkgconfig python:2.7 readline shebangfix tk
 USE_GL=		gl glu
@@ -62,8 +59,8 @@ post-patch:
 			-e 's|#!.*/bin/bash|#!${LOCALBASE}/bin/bash|' \
 			-e 's|#!.*/usr/bin/tclsh|#!${LOCALBASE}/bin/tclsh8.6|' \
 			-e 's|#!.*/usr/bin/wish|#!${LOCALBASE}/bin/wish8.6|' \
-			-e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2|' \
-			-e 's|#!.*/usr/bin/python|#!/usr/bin/env python2|' \
+			-e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2.7|' \
+			-e 's|#!.*/usr/bin/python|#!/usr/bin/env python2.7|' \
 			-e 's|lib/tcltk|lib/tcllib|'
 
 .include <bsd.port.mk>
diff --git a/cad/linuxcnc-devel/files/patch-src_Makefile b/cad/linuxcnc-devel/files/patch-src_Makefile
index 19eebc379d33..d414626d2974 100644
--- a/cad/linuxcnc-devel/files/patch-src_Makefile
+++ b/cad/linuxcnc-devel/files/patch-src_Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2017-07-08 02:09:02.000000000 +0100
-+++ src/Makefile	2017-07-06 12:52:07.633525000 +0100
+--- src/Makefile.orig	2017-07-08 22:25:35.000000000 +0100
++++ src/Makefile	2018-07-23 15:16:25.939787000 +0100
 @@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies)
  endif
  
@@ -24,15 +24,24 @@
  endif
  
  # Rules to make .o (object) files
-@@ -501,7 +503,7 @@ $(patsubst %,../include/%,$(wildcard *.hh)): ../includ
+@@ -499,12 +501,12 @@ $(patsubst %,../include/%,$(wildcard *.h)): ../include
+ $(patsubst %,../include/%,$(wildcard *.hh)): ../include/%.hh: %.hh
+ 	$(Q)-cp $^ $@
  
- DIR=install -d -m 0755 -o root
- FILE=install -m 0644 -o root
+-DIR=install -d -m 0755 -o root
+-FILE=install -m 0644 -o root
 -TREE=cp -dR
++DIR=install -d -m 0755
++FILE=install -m 0644
 +TREE=cp -R
  CONFIGFILE=install -m 0644
- EXE=install -m 0755 -o root
- SETUID=install -m 4755 -o root
+-EXE=install -m 0755 -o root
+-SETUID=install -m 4755 -o root
++EXE=install -m 0755
++SETUID=install -m 4755
+ GLOB=$(wildcard $(1))
+ 
+ ifeq ($(RUN_IN_PLACE),yes)
 @@ -549,7 +551,7 @@ install-dirs:
  		$(DESTDIR)$(sysconfdir)/linuxcnc $(DESTDIR)$(bindir) \
  		$(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \
diff --git a/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c b/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c
new file mode 100644
index 000000000000..ff6e741709e0
--- /dev/null
+++ b/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c
@@ -0,0 +1,12 @@
+--- src/libnml/os_intf/_sem.c.orig	2018-07-07 04:16:26.398676000 +0100
++++ src/libnml/os_intf/_sem.c	2018-07-07 04:16:54.402946000 +0100
+@@ -30,6 +30,9 @@
+    on Linux System V semaphores will be used instead.
+ */
+ 
++#ifdef	__FreeBSD__
++#define _WANT_SEMUN
++#endif
+ #include <sys/sem.h>		/* struct sembuf */
+ #include <math.h>		/* fmod() */
+ #include <signal.h>