Fix a few runtime issues.

2 files changed, 49 insertions, 47 deletions

diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile
index b3c9fe517a86..87fe14da625e 100644
--- a/cad/linuxcnc-devel/Makefile
+++ b/cad/linuxcnc-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	linuxcnc
 PORTVERSION=	20170708
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
@@ -59,7 +60,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/python|#!${LOCALBASE}/bin/env python2|' \
-			-e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2|'
+			-e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2|' \
+			-e 's|#!.*/usr/bin/python|#!/usr/bin/env python2|' \
+			-e 's|lib/tcltk|lib/tcllib|'
 
 .include <bsd.port.mk>
diff --git a/cad/linuxcnc-devel/pkg-plist b/cad/linuxcnc-devel/pkg-plist
index 27c08e712365..881f3d2727a9 100644
--- a/cad/linuxcnc-devel/pkg-plist
+++ b/cad/linuxcnc-devel/pkg-plist
@@ -356,51 +356,51 @@ lib/linuxcnc/modules/xhc_hb04_util.so
 lib/linuxcnc/modules/xor2.so
 lib/linuxcnc/modules/xyzac-trt-kins.so
 lib/linuxcnc/modules/xyzbc-trt-kins.so
-lib/tcltk/linuxcnc/bin/emccalib.tcl
-lib/tcltk/linuxcnc/bin/emcdebug.tcl
-lib/tcltk/linuxcnc/bin/emctesting.tcl
-lib/tcltk/linuxcnc/bin/emctuning.tcl
-lib/tcltk/linuxcnc/bin/genedit.tcl
-lib/tcltk/linuxcnc/bin/halconfig.tcl
-lib/tcltk/linuxcnc/bin/halshow.tcl
-lib/tcltk/linuxcnc/bin/pickconfig.tcl
-lib/tcltk/linuxcnc/bin/popimage
-lib/tcltk/linuxcnc/bin/tkbackplot.tcl
-lib/tcltk/linuxcnc/hal.so
-lib/tcltk/linuxcnc/linuxcnc.so
-lib/tcltk/linuxcnc/linuxcnc.tcl
-lib/tcltk/linuxcnc/msgs/de.msg
-lib/tcltk/linuxcnc/msgs/es.msg
-lib/tcltk/linuxcnc/msgs/fi.msg
-lib/tcltk/linuxcnc/msgs/fr.msg
-lib/tcltk/linuxcnc/msgs/hu.msg
-lib/tcltk/linuxcnc/msgs/it.msg
-lib/tcltk/linuxcnc/msgs/ja.msg
-lib/tcltk/linuxcnc/msgs/pl.msg
-lib/tcltk/linuxcnc/msgs/pt_BR.msg
-lib/tcltk/linuxcnc/msgs/pt_br.msg
-lib/tcltk/linuxcnc/msgs/ro.msg
-lib/tcltk/linuxcnc/msgs/ru.msg
-lib/tcltk/linuxcnc/msgs/sk.msg
-lib/tcltk/linuxcnc/msgs/sr.msg
-lib/tcltk/linuxcnc/msgs/sv.msg
-lib/tcltk/linuxcnc/msgs/zh_CN.msg
-lib/tcltk/linuxcnc/msgs/zh_HK.msg
-lib/tcltk/linuxcnc/msgs/zh_TW.msg
-lib/tcltk/linuxcnc/msgs/zh_cn.msg
-lib/tcltk/linuxcnc/msgs/zh_hk.msg
-lib/tcltk/linuxcnc/msgs/zh_tw.msg
-lib/tcltk/linuxcnc/ngcgui.tcl
-lib/tcltk/linuxcnc/ngcgui_app.tcl
-lib/tcltk/linuxcnc/ngcgui_ttt.tcl
-lib/tcltk/linuxcnc/pkgIndex.tcl
-lib/tcltk/linuxcnc/scripts/Set_Coordinates.tcl
-lib/tcltk/linuxcnc/scripts/balloon.tcl
-lib/tcltk/linuxcnc/scripts/emchelp.tcl
-lib/tcltk/linuxcnc/show_errors.tcl
-lib/tcltk/linuxcnc/tklinuxcnc.tcl
-lib/tcltk/linuxcnc/tooledit.tcl
-lib/tcltk/linuxcnc/twopass.tcl
+lib/tcllib/linuxcnc/bin/emccalib.tcl
+lib/tcllib/linuxcnc/bin/emcdebug.tcl
+lib/tcllib/linuxcnc/bin/emctesting.tcl
+lib/tcllib/linuxcnc/bin/emctuning.tcl
+lib/tcllib/linuxcnc/bin/genedit.tcl
+lib/tcllib/linuxcnc/bin/halconfig.tcl
+lib/tcllib/linuxcnc/bin/halshow.tcl
+lib/tcllib/linuxcnc/bin/pickconfig.tcl
+lib/tcllib/linuxcnc/bin/popimage
+lib/tcllib/linuxcnc/bin/tkbackplot.tcl
+lib/tcllib/linuxcnc/hal.so
+lib/tcllib/linuxcnc/linuxcnc.so
+lib/tcllib/linuxcnc/linuxcnc.tcl
+lib/tcllib/linuxcnc/msgs/de.msg
+lib/tcllib/linuxcnc/msgs/es.msg
+lib/tcllib/linuxcnc/msgs/fi.msg
+lib/tcllib/linuxcnc/msgs/fr.msg
+lib/tcllib/linuxcnc/msgs/hu.msg
+lib/tcllib/linuxcnc/msgs/it.msg
+lib/tcllib/linuxcnc/msgs/ja.msg
+lib/tcllib/linuxcnc/msgs/pl.msg
+lib/tcllib/linuxcnc/msgs/pt_BR.msg
+lib/tcllib/linuxcnc/msgs/pt_br.msg
+lib/tcllib/linuxcnc/msgs/ro.msg
+lib/tcllib/linuxcnc/msgs/ru.msg
+lib/tcllib/linuxcnc/msgs/sk.msg
+lib/tcllib/linuxcnc/msgs/sr.msg
+lib/tcllib/linuxcnc/msgs/sv.msg
+lib/tcllib/linuxcnc/msgs/zh_CN.msg
+lib/tcllib/linuxcnc/msgs/zh_HK.msg
+lib/tcllib/linuxcnc/msgs/zh_TW.msg
+lib/tcllib/linuxcnc/msgs/zh_cn.msg
+lib/tcllib/linuxcnc/msgs/zh_hk.msg
+lib/tcllib/linuxcnc/msgs/zh_tw.msg
+lib/tcllib/linuxcnc/ngcgui.tcl
+lib/tcllib/linuxcnc/ngcgui_app.tcl
+lib/tcllib/linuxcnc/ngcgui_ttt.tcl
+lib/tcllib/linuxcnc/pkgIndex.tcl
+lib/tcllib/linuxcnc/scripts/Set_Coordinates.tcl
+lib/tcllib/linuxcnc/scripts/balloon.tcl
+lib/tcllib/linuxcnc/scripts/emchelp.tcl
+lib/tcllib/linuxcnc/show_errors.tcl
+lib/tcllib/linuxcnc/tklinuxcnc.tcl
+lib/tcllib/linuxcnc/tooledit.tcl
+lib/tcllib/linuxcnc/twopass.tcl
 man/man1/axis-remote.1.gz
 man/man1/axis.1.gz
 man/man1/elbpcom.1.gz