Remove expired ports, all Python-2.7-only:

2020-02-17 audio/decibel-audio-player: Old, uses EOLed python27
2020-02-17 audio/soundconverter: Old, uses EOLed python27
2020-02-19 cad/linuxcnc-devel: Broken, uses EOLed python27
2020-02-19 databases/monetdb: Broken, uses EOLed python27
2020-02-19 databases/py-cql: Broken, uses EOLed python27
2020-02-18 databases/zodb3: Old, uses EOLed python27
2020-02-17 deskutils/gourmet: Old, uses EOLed python27
2020-02-18 devel/py-Products.PlacelessTranslationService: Old, uses EOLed python27
2020-02-18 devel/py-Products.ZopeVersionControl: Old, uses EOLed python27
2020-02-18 devel/py-Products.statusmessages: Old, uses EOLed python27
2020-02-18 devel/py-collective.z3cform.datetimewidget: Old, uses EOLed python27
2020-02-20 devel/py-five.formlib: Old, uses EOLed python27
2020-02-18 devel/py-five.localsitemanager: Old, uses EOLed python27
2020-02-19 devel/py-notifier: Broken, uses EOLed python27
2020-02-18 devel/py-tempstorage: Old, uses EOLed python27
2020-02-19 devel/py-testgears: Broken, uses EOLed python27
2020-02-20 devel/py-z3c.caching: Old, uses EOLed python27
2020-02-18 devel/py-z3c.form: Old, uses EOLed python27
2020-02-18 devel/py-z3c.formwidget.query: Old, uses EOLed python27
2020-02-18 devel/py-zope.annotation: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.applicationcontrol: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.appsetup: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.broken: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.cache: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.component: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.container: Old, uses EOLed python27
2020-02-20 devel/py-zope.app.content: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.debug: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.dependable: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.error: Old, uses EOLed python27
2020-02-20 devel/py-zope.app.exception: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.file: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.folder: Old, uses EOLed python27
2020-02-20 devel/py-zope.app.form: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.generations: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.http: Old, uses EOLed python27
2020-02-20 devel/py-zope.app.pagetemplate: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.publication: Old, uses EOLed python27
2020-02-20 devel/py-zope.app.publisher: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.rotterdam: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.testing: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.zcmlfiles: Old, uses EOLed python27
2020-02-18 devel/py-zope.app.zopeappgenerations: Old, uses EOLed python27
2020-02-20 devel/py-zope.applicationcontrol: Old, uses EOLed python27
2020-02-20 devel/py-zope.browsermenu: Old, uses EOLed python27
2020-02-20 devel/py-zope.browserpage: Old, uses EOLed python27
2020-02-20 devel/py-zope.componentvocabulary: Old, uses EOLed python27
2020-02-18 devel/py-zope.container: Old, uses EOLed python27
2020-02-18 devel/py-zope.copypastemove: Old, uses EOLed python27
2020-02-20 devel/py-zope.dublincore: Old, uses EOLed python27
2020-02-18 devel/py-zope.error: Old, uses EOLed python27
2020-02-20 devel/py-zope.formlib: Old, uses EOLed python27
2020-02-18 devel/py-zope.minmax: Old, uses EOLed python27
2020-02-20 devel/py-zope.pagetemplate: Old, uses EOLed python27
2020-02-20 devel/py-zope.ptresource: Old, uses EOLed python27
2020-02-18 devel/py-zope.ramcache: Old, uses EOLed python27
2020-02-18 devel/py-zope.site: Old, uses EOLed python27
2020-02-20 devel/py-zope.viewlet: Old, uses EOLed python27
2020-02-19 games/gcompris: Broken, uses EOLed python27
2020-02-19 graphics/commons-utilities: Broken, uses EOLed python27
2020-02-19 graphics/py-chart: Broken, uses EOLed python27
2020-02-19 japanese/tegaki-recognize: Broken, uses EOLed python27
2020-02-20 mail/py-zope.sendmail: Old, uses EOLed python27
2020-02-19 mail/pysieved: Broken, uses EOLed python27
2020-02-19 math/ogdf: Broken, uses EOLed python27
2020-02-19 math/py-viper: Broken, uses EOLed python27
2020-02-19 misc/fbless: Broken, uses EOLed python27
2020-02-19 misc/pylize: Broken, uses EOLed python27
2020-02-19 net/py-ldaptor: Broken, uses EOLed python27
2020-02-19 net/tucan: Broken, uses EOLed python27
2020-02-19 news/hellanzb: Broken, uses EOLed python27
2020-02-19 science/coot: Broken, uses EOLed python27
2020-02-19 science/py-ScientificPython: Broken, uses EOLed python27
2020-02-19 security/py-cryptlib_py: Broken, uses EOLed python27
2020-02-18 security/py-zope.app.authentication: Old, uses EOLed python27
2020-02-18 security/py-zope.app.localpermission: Old, uses EOLed python27
2020-02-18 security/py-zope.app.principalannotation: Old, uses EOLed python27
2020-02-18 security/py-zope.app.security: Old, uses EOLed python27
2020-02-18 security/py-zope.app.securitypolicy: Old, uses EOLed python27
2020-02-20 security/py-zope.authentication: Old, uses EOLed python27
2020-02-20 security/py-zope.login: Old, uses EOLed python27
2020-02-18 security/py-zope.pluggableauth: Old, uses EOLed python27
2020-02-18 security/py-zope.principalannotation: Old, uses EOLed python27
2020-02-20 security/py-zope.principalregistry: Old, uses EOLed python27
2020-02-20 security/py-zope.security: Old, uses EOLed python27
2020-02-18 security/py-zope.securitypolicy: Old, uses EOLed python27
2020-02-18 security/py-zope.session: Old, uses EOLed python27
2020-02-17 sysutils/gnome-schedule: Old, uses EOLed python27
2020-02-19 sysutils/py-XenAPI: Broken, uses EOLed python27
2020-02-19 sysutils/py-freenas.cli: Broken, uses EOLed python27
2020-02-19 textproc/ecromedos: Broken, uses EOLed python27
2020-02-18 textproc/py-wicked: Old, uses EOLed python27
2020-02-18 textproc/py-zope.app.i18n: Old, uses EOLed python27
2020-02-19 www/planet: Broken, uses EOLed python27
2020-02-18 www/py-zope.app.wsgi: Old, uses EOLed python27
2020-02-19 www/trac-attachmentpolicy: Broken, uses EOLed python27
2020-02-19 www/trac-bzr: Broken, uses EOLed python27
2020-02-19 www/trac-childtickets: Broken, uses EOLed python27
2020-02-19 www/trac-gantt: Broken, uses EOLed python27
2020-02-19 www/trac-tracdragdrop: Broken, uses EOLed python27
2020-02-19 www/trac-watchlist: Broken, uses EOLed python27
2020-02-19 www/twill: Broken, uses EOLed python27
2020-02-19 x11/wbarconf: Broken, uses EOLed python27
2020-02-19 x11-wm/simple-ccsm: Broken, uses EOLed python27

27 files changed, 0 insertions, 714 deletions

diff --git a/cad/linuxcnc-devel/files/patch-scripts_hal-histogram b/cad/linuxcnc-devel/files/patch-scripts_hal-histogram
deleted file mode 100644
index 43bf8e9da584..000000000000
--- a/cad/linuxcnc-devel/files/patch-scripts_hal-histogram
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/hal-histogram.orig	2016-06-25 02:19:12 UTC
-+++ scripts/hal-histogram
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- 
- # For usage: hal-histogram --help
- 
diff --git a/cad/linuxcnc-devel/files/patch-scripts_latency-histogram b/cad/linuxcnc-devel/files/patch-scripts_latency-histogram
deleted file mode 100644
index f157629dab67..000000000000
--- a/cad/linuxcnc-devel/files/patch-scripts_latency-histogram
+++ /dev/null
@@ -1,90 +0,0 @@
---- scripts/latency-histogram.orig	2016-06-25 02:19:12 UTC
-+++ scripts/latency-histogram
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- #
- 
- # Usage:
-@@ -51,7 +51,7 @@ package require Tclx
- proc set_defaults {} {
-   set ::LH(start) [clock seconds]
-   # don't include glxgears, error suffices
--  program_check {halrun halcmd lsmod pgrep pkill hostname}
-+  program_check {halrun halcmd pgrep pkill hostname}
-   if {[string first rtai [string tolower $::tcl_platform(osVersion)]] >=0} {
-     set ::LH(rtai) rtai
-     set ::LH(realtime) [exec linuxcnc_var REALTIME]
-@@ -234,25 +234,25 @@ $display \
- } ;# other_info
- 
- proc processor_info {} {
--  set cmdline [exec cat /proc/cmdline]
--  set idx [string first isolcpus $cmdline]
--  if {$idx < 0} {
-+#  set cmdline [exec cat /proc/cmdline]
-+#  set idx [string first isolcpus $cmdline]
-+#  if {$idx < 0} {
-     set isolcpus no_isolcpus
--  } else {
--    set tmp [string range $cmdline $idx end]
--    set tmp "$tmp " ;# add trailing blank
--    set isolcpus [string range $tmp 0 [expr -1 + [string first " " $tmp]]]
--  }
--  set fd [open /proc/cpuinfo]
--  while {![eof $fd]} {
--    gets $fd newline
--    set s [split $newline :]
--    set key [string trim [lindex $s 0]]
--    set key [string map "\" \" _" $key]
--    set v [lindex $s 1]
--    set procinfo($key) $v
--  }
--  close $fd
-+#  } else {
-+#    set tmp [string range $cmdline $idx end]
-+#    set tmp "$tmp " ;# add trailing blank
-+#    set isolcpus [string range $tmp 0 [expr -1 + [string first " " $tmp]]]
-+#  }
-+#  set fd [open /proc/cpuinfo]
-+#  while {![eof $fd]} {
-+#    gets $fd newline
-+#    set s [split $newline :]
-+#    set key [string trim [lindex $s 0]]
-+#    set key [string map "\" \" _" $key]
-+#    set v [lindex $s 1]
-+#    set procinfo($key) $v
-+#  }
-+#  close $fd
- 
-   set cores "1_core"
-   catch {set cores "$procinfo(cpu_cores) cores"};# item may not exist
-@@ -297,17 +297,17 @@ proc load_packages {} {
-     exit 1
-   }
- 
--  if [info exists ::LH(rtai)] {
--    if [catch {exec lsmod | grep rtai} msg] {
--      # puts ok_to_start_rtai
--    } else {
--      popup "RTAI is already running, (try: \$ halrun -U)"
--      exit 1
--    }
--    exec $::LH(realtime) start &
--    progress "Delay for realtime startup"
--    after 1000 ;# wait to load Hal package
--  }
-+#  if [info exists ::LH(rtai)] {
-+#    if [catch {exec | grep rtai} msg] {
-+#      # puts ok_to_start_rtai
-+#    } else {
-+#      popup "RTAI is already running, (try: \$ halrun -U)"
-+#      exit 1
-+#    }
-+#    exec $::LH(realtime) start &
-+#    progress "Delay for realtime startup"
-+#    after 1000 ;# wait to load Hal package
-+#  }
- 
-   # augment ::auto_path for special case:
-   # 1) RIP build (no install)
diff --git a/cad/linuxcnc-devel/files/patch-scripts_latency-plot b/cad/linuxcnc-devel/files/patch-scripts_latency-plot
deleted file mode 100644
index 45fa96155757..000000000000
--- a/cad/linuxcnc-devel/files/patch-scripts_latency-plot
+++ /dev/null
@@ -1,54 +0,0 @@
---- scripts/latency-plot.orig	2016-06-25 02:19:12 UTC
-+++ scripts/latency-plot
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- 
- # Notes:
- # notusing y axis title because it coredumps with X BadMatch with wish8.5
-@@ -161,15 +161,15 @@ proc init_hal_timedelta {} {
- } ;# init_hal_timedelta
- 
- proc check {} {
--  if {[string first rtai [exec lsmod]] < 0} {
--    #puts "ok -- no rtai modules currently loaded"
--  } else {
--    set msg "Cannot start with rtai modules loaded.\
--Stop all programs (linuxcnc) using realtime first and then run:\n\n\
--halrun -U\n"
--    popup $msg
--    exit 1
--  }
-+#  if {[string first rtai [exec lsmod]] < 0} {
-+#    #puts "ok -- no rtai modules currently loaded"
-+#  } else {
-+#    set msg "Cannot start with rtai modules loaded.\
-+#Stop all programs (linuxcnc) using realtime first and then run:\n\n\
-+#halrun -U\n"
-+#    popup $msg
-+#    exit 1
-+#  }
-   switch $::sc(data,source) {
-     hal_timedelta  {}
-     default {return -code error "init: unknown data,source: <$::sc(data,source)>"}
-@@ -179,13 +179,13 @@ halrun -U\n"
- proc mcheck {} {
-   # cautionary check on memory usage
-   # %mem "ratio of process's resident set size to the physical mem in percent"
--  set mempercent [eval exec ps --no-headers --pid $::sc(pid) -o %mem]
--  if {$mempercent > $::sc(mem,max,percent)} {
--    set msg "Memory used is ${mempercent}%, Exiting"
--    popup $msg
--    exit 1
--  }
--  after 10000 mcheck
-+#  set mempercent [eval exec ps --no-headers --pid $::sc(pid) -o %mem]
-+#  if {$mempercent > $::sc(mem,max,percent)} {
-+#    set msg "Memory used is ${mempercent}%, Exiting"
-+#    popup $msg
-+#    exit 1
-+#  }
-+#  after 10000 mcheck
- } ;# mcheck
- 
- proc start {} {
diff --git a/cad/linuxcnc-devel/files/patch-scripts_realtime.in b/cad/linuxcnc-devel/files/patch-scripts_realtime.in
deleted file mode 100644
index ba3b23815bbf..000000000000
--- a/cad/linuxcnc-devel/files/patch-scripts_realtime.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/realtime.in.orig	2016-06-25 02:19:12 UTC
-+++ scripts/realtime.in
-@@ -6,7 +6,7 @@
- 
- export LANG=C
- 
--PIDOF=@PIDOF@
-+HALCMD="halcmd"
- 
- CheckKernel() {
-     case "@KERNEL_VERS@" in
-@@ -104,7 +104,7 @@ CheckConfig(){
- CheckStatus(){
-     case $RTPREFIX in
-     uspace)
--        if [ -z "$($PIDOF rtapi_app)" ]; then
-+        if [ `$HALCMD -s show comp | wc -l` -eq 2 ]; then
-             exit 1
-         else
-             exit 0
-@@ -187,15 +187,14 @@ Unload(){
-         # wait 5 seconds for rtapi_app to die and be reaped by its parent
-         START=$SECONDS
-         while [ 5 -gt $((SECONDS-START)) ]; do
--            if ! ps -C rtapi_app > /dev/null 2> /dev/null; then
-+            if [ `$HALCMD -s show comp | wc -l` -eq 2 ]; then
-                 break
-             fi
-             sleep 0.1
-         done
--        if ps -C rtapi_app > /dev/null 2> /dev/null; then
-+        if [ `$HALCMD -s show comp | wc -l` -ne 2 ]; then
-             echo "ERROR: rtapi_app failed to die" 1>&2
-         fi
--
-         ipcrm -M 0x48414c32 2>/dev/null ;# HAL_KEY
-         ipcrm -M 0x90280A48 2>/dev/null ;# RTAPI_KEY
-         ipcrm -M 0x48484c34 2>/dev/null ;# UUID_KEY
diff --git a/cad/linuxcnc-devel/files/patch-scripts_sim__pin b/cad/linuxcnc-devel/files/patch-scripts_sim__pin
deleted file mode 100644
index 9dfaa413e150..000000000000
--- a/cad/linuxcnc-devel/files/patch-scripts_sim__pin
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/sim_pin.orig	2016-06-25 02:19:12 UTC
-+++ scripts/sim_pin
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- 
- if [catch {package require Hal} msg] {
-   puts "\nProblem: $msg"
diff --git a/cad/linuxcnc-devel/files/patch-src_Makefile b/cad/linuxcnc-devel/files/patch-src_Makefile
deleted file mode 100644
index d414626d2974..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_Makefile
+++ /dev/null
@@ -1,160 +0,0 @@
---- 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
- 
- # Each directory in $(INCLUDES) is passed as a -I directory when compiling.
--INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include
-+INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include -I/usr/local/include
- INCLUDE += -I$(INCLUDEPY)
- 
- # Compilation options.	Perhaps some of these should come from Makefile.inc? (CXXFLAGS now does)
-@@ -193,10 +193,12 @@ DEBUG := $(DEBUG) -g -Wall
- CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) $(EXTRA_DEBUG) -DULAPI -std=gnu99 -fgnu89-inline
- CXXFLAGS := $(INCLUDE) $(CXXFLAGS)   $(EXTRA_DEBUG) -DULAPI $(DEBUG) $(OPT) -Woverloaded-virtual
- 
-+UNAME_S := $(shell uname -s)
-+
- ifeq ($(RUN_IN_PLACE),yes)
--LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR)
-+LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR) -L/usr/local/lib -lintl
- else
--LDFLAGS := -Wl,-rpath-link,../lib
-+LDFLAGS := -Wl,-rpath-link,../lib -L/usr/local/lib -lintl
- endif
- 
- # Rules to make .o (object) files
-@@ -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
--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
-+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 \
- 		$(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \
--		$(DESTDIR)/etc/X11/app-defaults $(DESTDIR)$(tcldir)/bin \
-+		$(DESTDIR)$(prefix)/share/X11/app-defaults $(DESTDIR)$(tcldir)/bin \
- 		$(DESTDIR)$(tcldir)/scripts \
- 		$(DESTDIR)$(mandir)/man1 \
- 		$(DESTDIR)$(mandir)/man3 \
-@@ -605,14 +607,13 @@ install-kernel-indep: install-dirs
- 	$(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir)
- 	$(EXE) ../scripts/update_ini $(DESTDIR)$(bindir)
- 	$(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir)
--	cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir)
--	-ldconfig $(DESTDIR)$(libdir)
-+	cp $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir)
- 	$(FILE) $(HEADERS) $(DESTDIR)$(includedir)/linuxcnc/
- 	$(FILE) $(addprefix ../docs/,$(DOCS)) $(DESTDIR)$(docsdir)
- 	$(FILE) $(DOCS_HELP) $(DESTDIR)$(docsdir)
- 	$(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
- 	$(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir)
--	$(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults
-+	$(FILE) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults
- 	$(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc
- 	$(EXE) $(TCL) $(DESTDIR)$(tcldir)
- 	$(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir)
-@@ -720,6 +721,7 @@ endif
- # that's what kbuild seems to require
- 
- EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I$(BASEPWD)/libnml/linklist \
-+	-I/usr/local/include \
- 	-I$(BASEPWD)/libnml/cms -I$(BASEPWD)/libnml/rcs -I$(BASEPWD)/libnml/inifile \
- 	-I$(BASEPWD)/libnml/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \
- 	-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
-@@ -830,11 +832,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MATHSTUB)
- obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o
- hal_ppmc-objs := hal/drivers/hal_ppmc.o $(MATHSTUB)
- 
--obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
--ifeq ($(BUILD_SYS),uspace)
--obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o
--endif
--hostmot2-objs :=			  \
-+#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
-+#ifeq ($(BUILD_SYS),uspace)
-+#obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o
-+#endif
-+#hostmot2-objs :=			  \
-     hal/drivers/mesa-hostmot2/hostmot2.o  \
-     hal/drivers/mesa-hostmot2/ioport.o	  \
-     hal/drivers/mesa-hostmot2/encoder.o   \
-@@ -855,35 +857,35 @@ hostmot2-objs :=			  \
-     hal/drivers/mesa-hostmot2/raw.o	  \
-     hal/drivers/mesa-hostmot2/bitfile.o   \
-     $(MATHSTUB)
--hm2_7i90-objs :=			  \
-+#hm2_7i90-objs :=			  \
-     hal/drivers/mesa-hostmot2/hm2_7i90.o  \
-     hal/drivers/mesa-hostmot2/bitfile.o   \
-     $(MATHSTUB)
--hm2_7i43-objs :=			  \
-+#hm2_7i43-objs :=			  \
-     hal/drivers/mesa-hostmot2/hm2_7i43.o  \
-     hal/drivers/mesa-hostmot2/bitfile.o   \
-     $(MATHSTUB)
--hm2_pci-objs  :=			  \
-+#hm2_pci-objs  :=			  \
-     hal/drivers/mesa-hostmot2/hm2_pci.o   \
-     hal/drivers/mesa-hostmot2/bitfile.o   \
-     $(MATHSTUB)
--hm2_eth-objs  :=			  \
-+#hm2_eth-objs  :=			  \
-     hal/drivers/mesa-hostmot2/hm2_eth.o   \
-     $(MATHSTUB)
--hm2_spi-objs  :=			  \
-+#hm2_spi-objs  :=			  \
-     hal/drivers/mesa-hostmot2/hm2_spi.o   \
-     $(MATHSTUB)
--hm2_rpspi-objs  :=			  \
-+#hm2_rpspi-objs  :=			  \
-     hal/drivers/mesa-hostmot2/hm2_rpspi.o   \
-     $(MATHSTUB)
--hal_bb_gpio-objs  :=			  \
-+#hal_bb_gpio-objs  :=			  \
-     hal/drivers/hal_bb_gpio.o		  \
-     $(MATHSTUB)
--hm2_test-objs :=			  \
-+#hm2_test-objs :=			  \
-     hal/drivers/mesa-hostmot2/hm2_test.o  \
-     hal/drivers/mesa-hostmot2/bitfile.o   \
-     $(MATHSTUB)
--setsserial-objs :=			  \
-+#setsserial-objs :=			  \
-     hal/drivers/mesa-hostmot2/setsserial.o  \
-     $(MATHSTUB)
- 
-@@ -1083,13 +1085,13 @@ endif
- ../rtlib/rosekins$(MODULE_EXT): $(addprefix objects/rt,$(rosekins-objs))
- ../rtlib/scorbot-kins$(MODULE_EXT): $(addprefix objects/rt,$(scorbot-kins-objs))
- ../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs))
--../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs))
--../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs))
--../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs))
--../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs))
--../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs))
-+#../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs))
-+#../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs))
-+#../rtlib/hm2_pci$(MODULE_EXT): $(addprefix objects/rt,$(hm2_pci-objs))
-+#../rtlib/hm2_7i43$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i43-objs))
-+#../rtlib/hm2_7i90$(MODULE_EXT): $(addprefix objects/rt,$(hm2_7i90-objs))
- ../rtlib/setsserial$(MODULE_EXT): $(addprefix objects/rt,$(setsserial-objs))
--../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs))
-+#../rtlib/hal_parport$(MODULE_EXT): $(addprefix objects/rt,$(hal_parport-objs))
- ../rtlib/hal_ppmc$(MODULE_EXT): $(addprefix objects/rt,$(hal_ppmc-objs))
- ../rtlib/hm2_eth$(MODULE_EXT): $(addprefix objects/rt,$(hm2_eth-objs))
- ../rtlib/hm2_spi$(MODULE_EXT): $(addprefix objects/rt,$(hm2_spi-objs))
diff --git a/cad/linuxcnc-devel/files/patch-src_Makefile.inc.in b/cad/linuxcnc-devel/files/patch-src_Makefile.inc.in
deleted file mode 100644
index c8790059e24c..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_Makefile.inc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.inc.in.orig	2016-06-25 02:19:12 UTC
-+++ src/Makefile.inc.in
-@@ -62,7 +62,7 @@ LANGUAGES = @LANGUAGES@
- 
- #still needs discussion
- # do we really need these?
--initd_dir = /etc/init.d
-+initd_dir = ${prefix}/etc/rc.d
- docsdir = ${prefix}/share/doc/linuxcnc
- sampleconfsdir = ${prefix}/share/doc/linuxcnc/examples/sample-configs
- ncfilesdir = ${prefix}/share/linuxcnc/ncfiles
diff --git a/cad/linuxcnc-devel/files/patch-src_configure.in b/cad/linuxcnc-devel/files/patch-src_configure.in
deleted file mode 100644
index be882c71424e..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_configure.in
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/configure.in.orig	2019-12-26 21:08:10 UTC
-+++ src/configure.in
-@@ -711,7 +711,7 @@ else
-     esac
-     LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
-     EMC2_NCFILES_DIR=${prefix}/share/linuxcnc/ncfiles
--    REALTIME=/etc/init.d/realtime
-+    REALTIME=${prefix}/etc/rc.d/realtime
-     EMC2_IMAGE_DIR=$(fe "$datadir")/linuxcnc
-     HALLIB_DIR=${prefix}/share/linuxcnc/hallib
- fi
-@@ -787,16 +787,6 @@ if test "$BUILD_GTK" = "yes"; then
-     AC_MSG_RESULT(yes - $GTK_VER)
-     GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags`
-     GTK_LIBS=`pkg-config gtk+-2.0 --libs`
--    AC_MSG_CHECKING(for libgnomeprintui-2.2)
--    if pkg-config --exists libgnomeprintui-2.2; then
--      AC_MSG_RESULT(yes)
--      GTK_CFLAGS="$GTK_CFLAGS `pkg-config --cflags libgnomeprintui-2.2`"
--      GTK_LIBS="$GTK_LIBS `pkg-config --libs libgnomeprintui-2.2`"
--      HAVE_GNOMEPRINT=yes
--    else
--      AC_MSG_RESULT(no -- printing from classicladder will not be possible)
--      HAVE_GNOMEPRINT= 
--    fi
-   else
-     AC_MSG_RESULT(no)
-     AC_MSG_ERROR([GTK2 missing.  Install it or specify --disable-gtk to skip the parts of LinuxCNC that depend on GTK])
-@@ -853,25 +843,25 @@ then
-     AC_MSG_ERROR([awk not found])
- fi
- 
--AC_PATH_PROG(INSMOD, insmod, "none", $SPATH)
-+AC_PATH_PROG(INSMOD, false, "none", $SPATH)
- if test $INSMOD = "none"
- then
-     AC_MSG_ERROR([insmod not found])
- fi
- 
--AC_PATH_PROG(RMMOD, rmmod, "none", $SPATH)
-+AC_PATH_PROG(RMMOD, false, "none", $SPATH)
- if test $RMMOD = "none"
- then
-     AC_MSG_ERROR([rmmod not found])
- fi
- 
--AC_PATH_PROG(LSMOD, lsmod, "none", $SPATH)
-+AC_PATH_PROG(LSMOD, true, "none", $SPATH)
- if test $LSMOD = "none"
- then
-     AC_MSG_ERROR([lsmod not found])
- fi
- 
--AC_PATH_PROG(PIDOF, pidof, "none", $SPATH)
-+AC_PATH_PROGS(PIDOF, pidof pgrep, "none", $SPATH)
- if test $PIDOF = "none"
- then
-     AC_MSG_ERROR([pidof not found])
-@@ -1211,7 +1201,6 @@ extern int optreset;
-     [HAVE_OPTRESET=no])
- AC_MSG_RESULT($HAVE_OPTRESET)
- AC_SUBST([HAVE_OPTRESET])
--
- 
- 
- LIBS_hold=$LIBS
diff --git a/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc b/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc
deleted file mode 100644
index 2a890047c54b..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/emc/rs274ngc/rs274ngc_pre.cc.orig	2017-07-25 12:21:19.816453000 +0100
-+++ src/emc/rs274ngc/rs274ngc_pre.cc	2017-07-25 12:22:07.230714000 +0100
-@@ -1924,7 +1924,12 @@ int Interp::save_parameters(const char *filename,     
-   }
- 
-   fflush(outfile);
-+#ifdef __FreeBSD__
-+  /* No fdatasync(2) in FreeBSD 11.0. */
-+  fsync(fileno(outfile));
-+#else
-   fdatasync(fileno(outfile));
-+#endif
-   fclose(outfile);
-   std::string bakfile = std::string(filename)
-                             + RS274NGC_PARAMETER_FILE_BACKUP_SUFFIX;
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_components_Submakefile b/cad/linuxcnc-devel/files/patch-src_hal_components_Submakefile
deleted file mode 100644
index 55d8343bc98c..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_components_Submakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hal/components/Submakefile.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/components/Submakefile
-@@ -76,7 +76,7 @@ PYFLAGS := -L$(SITEPY) -lpthread $(LIBDL
- 
- ../bin/panelui: $(call TOOBJS, $(PYSAMPLERSRCS)) ../lib/liblinuxcnchal.so.0
- 	$(ECHO) Linking $(notdir $@)
--	$(Q)$(CC) -o $@ $^ $(PYFLAGS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(PYFLAGS)
- TARGETS += ../bin/panelui
- 
- hal/components/conv_float_s32.comp: hal/components/conv.comp.in hal/components/mkconv.sh hal/components/Submakefile
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__gm.c b/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__gm.c
deleted file mode 100644
index 473ecdc7681f..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__gm.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/hal/drivers/hal_gm.c.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/drivers/hal_gm.c
-@@ -1791,6 +1791,10 @@ stepgenControl(void *arg, long period, u
- 	  }
-   
- 	}
-+
-+	else {
-+		ref_vel = 90210; // XXX: 42 perhaps?
-+	}
-       //Check max velocity, max acceleration and output baudrate
-       
- 	//Check max velocity
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__parport.c b/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__parport.c
deleted file mode 100644
index 02aa7c0bd2fa..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__parport.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/hal/drivers/hal_parport.c.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/drivers/hal_parport.c
-@@ -116,6 +116,8 @@ MODULE_LICENSE("GPL");
- static char *cfg = "0x0278";	/* config string, default 1 output port at 278 */
- RTAPI_MP_STRING(cfg, "config string");
- 
-+#ifdef __linux__
-+
- /***********************************************************************
- *                STRUCTURES AND GLOBAL VARIABLES                       *
- ************************************************************************/
-@@ -743,3 +745,11 @@ static int export_output_pin(int portnum
- 		"parport.%d.pin-%02d-out-reset", portnum, pin);
-     return retval;
- }
-+#else
-+int rtapi_app_main(void)
-+{
-+	rtapi_print_msg(RTAPI_MSG_ERR, "PARPORT: !linux\n");
-+	return -1;
-+}
-+
-+#endif /* !__linux__ */
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__ppmc.c b/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__ppmc.c
deleted file mode 100644
index 7649b34debcc..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_drivers_hal__ppmc.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/hal/drivers/hal_ppmc.c.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/drivers/hal_ppmc.c
-@@ -81,6 +81,9 @@
- MODULE_AUTHOR("John Kasunich");
- MODULE_DESCRIPTION("HAL driver for Universal PWM Controller");
- MODULE_LICENSE("GPL");
-+
-+#ifdef __linux__
-+
- int port_addr[MAX_BUS] = { 0x378, [1 ... MAX_BUS-1] = -1 };
-     /* default, 1 bus at 0x0378 */
- hal_parport_t port_registration[MAX_BUS];
-@@ -2428,3 +2431,4 @@ static void WrtMore(unsigned char byte, 
-     return;
- }
- 
-+#endif
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_hal__lib.c b/cad/linuxcnc-devel/files/patch-src_hal_hal__lib.c
deleted file mode 100644
index 516526f290b9..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_hal__lib.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/hal/hal_lib.c.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/hal_lib.c
-@@ -2698,6 +2698,7 @@ void rtapi_app_exit(void)
- 	/* and delete it */
- 	free_thread_struct(thread);
-     }
-+    hal_data->base_period = 0;
-     /* release mutex */
-     rtapi_mutex_give(&(hal_data->mutex));
-     /* release RTAPI resources */
diff --git a/cad/linuxcnc-devel/files/patch-src_hal_utils_halcompile.g b/cad/linuxcnc-devel/files/patch-src_hal_utils_halcompile.g
deleted file mode 100644
index ead61d9a62a2..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_hal_utils_halcompile.g
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hal/utils/halcompile.g.orig	2016-06-25 02:19:12 UTC
-+++ src/hal/utils/halcompile.g
-@@ -709,7 +709,7 @@ def build_usr(tempdir, filename, mode, o
-         options.get("extra_link_args", ""))
-     print >>f, "include %s" % find_modinc()
-     f.close()
--    result = os.system("cd %s && make -S %s" % (tempdir, binname))
-+    result = os.system("cd %s && gmake -S %s" % (tempdir, binname))
-     if result != 0:
-         raise SystemExit, os.WEXITSTATUS(result) or 1
-     output = os.path.join(tempdir, binname)
-@@ -731,7 +731,7 @@ def build_rt(tempdir, filename, mode, or
-         target = "modules install"
-     else:
-         target = "modules"
--    result = os.system("cd %s && make -S %s" % (tempdir, target))
-+    result = os.system("cd %s && gmake -S %s" % (tempdir, target))
-     if result != 0:
-         raise SystemExit, os.WEXITSTATUS(result) or 1
-     if mode == COMPILE:
diff --git a/cad/linuxcnc-devel/files/patch-src_libnml_buffer_recvn.c b/cad/linuxcnc-devel/files/patch-src_libnml_buffer_recvn.c
deleted file mode 100644
index bc1849f057b7..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_libnml_buffer_recvn.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libnml/buffer/recvn.c.orig	2016-06-25 02:19:12 UTC
-+++ src/libnml/buffer/recvn.c
-@@ -186,7 +186,7 @@ int recvn(int fd, void *vptr, int n, int
- 		}
- 		nrecv = 0;
- 	    } else if (nrecv == 0) {
--		rcs_print_error("recvn: Premature EOF recieved.\n");
-+		rcs_print_error("recvn: Premature EOF received, errno %d, bytes to read %d, flags %x.\n", errno, bytes_to_read, flags);
- 		return (-2);
- 	    }
- 	}
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
deleted file mode 100644
index ff6e741709e0..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_libnml_os_intf__sem.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
diff --git a/cad/linuxcnc-devel/files/patch-src_po_git-merge-po b/cad/linuxcnc-devel/files/patch-src_po_git-merge-po
deleted file mode 100644
index dde076301567..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_po_git-merge-po
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/po/git-merge-po.orig	2016-06-25 02:19:12 UTC
-+++ src/po/git-merge-po
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Custom Git merge driver - merges PO files using msgcat(1)
- #
diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__io.h b/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__io.h
deleted file mode 100644
index 221bf260492a..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__io.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/rtapi/rtapi_io.h.orig	2016-06-25 02:19:12 UTC
-+++ src/rtapi/rtapi_io.h
-@@ -18,13 +18,14 @@
- 
- #include <rtapi.h>
- 
-+#ifdef __linux__
- #ifdef __KERNEL__
- #include <asm/io.h>
- #elif defined(__i386) || defined(__x86_64)
- #include <sys/io.h>
- #endif
- 
--#if defined(__i386) || defined(__x86_64)
-+#if (defined(__i386) || defined(__x86_64))
- #define rtapi_inb inb
- #define rtapi_inw inw
- #define rtapi_inl inl
-@@ -40,5 +41,6 @@
- #define rtapi_outw(x,y) ((void)0)
- #define rtapi_outl(x,y) ((void)0)
- #endif
-+#endif /* !__linux__ */
- 
- #endif
diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__math.h b/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__math.h
deleted file mode 100644
index 8ae719885db9..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__math.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/rtapi/rtapi_math.h.orig	2016-06-25 02:19:12 UTC
-+++ src/rtapi/rtapi_math.h
-@@ -79,7 +79,10 @@ extern __inline double fmin(double __y, 
- #endif
- 
- #else
-+#pragma push_macro("value")
-+#undef value
- #include <math.h>
-+#pragma pop_macro("value")
- #endif
- 
- #include "rtapi_byteorder.h"
diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__parport.h b/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__parport.h
deleted file mode 100644
index f84fd571c89d..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__parport.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/rtapi/rtapi_parport.h.orig	2016-06-25 02:19:12 UTC
-+++ src/rtapi/rtapi_parport.h
-@@ -16,6 +16,8 @@
- #ifndef RTAPI_PARPORT_H
- #define RTAPI_PARPORT_H
- 
-+#ifdef __linux__
-+
- #include <rtapi.h>
- #include <rtapi_io.h>
- #include <linux/parport.h>
-@@ -239,3 +241,4 @@ void rtapi_parport_release(rtapi_parport
- RTAPI_END_DECLS
- 
- #endif
-+#endif /* __linux__ */
diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__parport.cc b/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__parport.cc
deleted file mode 100644
index 798cd267d9d6..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__parport.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/rtapi/uspace_rtapi_parport.cc.orig	2016-06-25 02:19:12 UTC
-+++ src/rtapi/uspace_rtapi_parport.cc
-@@ -13,6 +13,7 @@
- //    You should have received a copy of the GNU General Public License
- //    along with this program; if not, write to the Free Software
- //    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+#ifdef __linux__
- #include <errno.h>
- #include <fcntl.h>
- #include <linux/ppdev.h>
-@@ -120,3 +121,4 @@ void rtapi_parport_release(rtapi_parport
-     close(port->fd);
-     port->fd = -1;
- }
-+#endif /* __linux__ */
diff --git a/cad/linuxcnc-devel/files/patch-tcl_ngcgui.tcl b/cad/linuxcnc-devel/files/patch-tcl_ngcgui.tcl
deleted file mode 100644
index f554e806e33d..000000000000
--- a/cad/linuxcnc-devel/files/patch-tcl_ngcgui.tcl
+++ /dev/null
@@ -1,8 +0,0 @@
---- tcl/ngcgui.tcl.orig	2016-06-25 02:19:12 UTC
-+++ tcl/ngcgui.tcl
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- 
- #-----------------------------------------------------------------------
- # ngcgui.tcl is a front-end gui that reads one or more single function
diff --git a/cad/linuxcnc-devel/files/patch-tcl_tooledit.tcl b/cad/linuxcnc-devel/files/patch-tcl_tooledit.tcl
deleted file mode 100644
index 3a32f1a82ab4..000000000000
--- a/cad/linuxcnc-devel/files/patch-tcl_tooledit.tcl
+++ /dev/null
@@ -1,25 +0,0 @@
---- tcl/tooledit.tcl.orig	2016-06-25 02:19:12 UTC
-+++ tcl/tooledit.tcl
-@@ -1,4 +1,4 @@
--#!/usr/bin/wish
-+#!/usr/bin/env wish8.6
- #
- # Copyright: 2009-2012
- # Author:    Dewey Garrett <dgarrett@panix.com>
-@@ -345,14 +345,14 @@ proc ::tooledit::watch {args} {
-   switch $args {
-     start {
-       set ::te(mtime) $mtime
--      set ::te(md5sum) [eval exec md5sum $::te(filename)]
-+      set ::te(md5sum) [eval exec md5 $::te(filename)]
-     }
-     stop  {return}
-     default {
-       if {$mtime > $::te(mtime)} {
-         set ::te(mtime) $mtime
-         set md5sum $::te(md5sum)
--        set ::te(md5sum) [eval exec md5sum $::te(filename)]
-+        set ::te(md5sum) [eval exec md5 $::te(filename)]
-         # no message if file contents unchanged
-         if {"$md5sum" != "$::te(md5sum)"} {
-           ::tooledit::message changed
diff --git a/cad/linuxcnc-devel/files/patch-tests_build_header-sanity_test.sh b/cad/linuxcnc-devel/files/patch-tests_build_header-sanity_test.sh
deleted file mode 100644
index 820499a31002..000000000000
--- a/cad/linuxcnc-devel/files/patch-tests_build_header-sanity_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
---- tests/build/header-sanity/test.sh.orig	2016-06-25 02:19:12 UTC
-+++ tests/build/header-sanity/test.sh
-@@ -5,12 +5,12 @@ for i in $HEADERS/*.h; do
-     case $i in
-     */rtapi_app.h) continue ;;
-     esac
--    gcc -DULAPI -I$HEADERS -E -x c $i > /dev/null
-+    cc -DULAPI -I$HEADERS -I/usr/local/include -E -x c $i > /dev/null
- done
- for i in $HEADERS/*.h $HEADERS/*.hh; do
-     case $i in
-     */rtapi_app.h) continue ;;
-     */interp_internal.hh) continue ;;
-     esac
--    g++ -DULAPI -I$HEADERS -E -x c++ $i > /dev/null
-+    c++ -DULAPI -I$HEADERS -I/usr/local/include -E -x c++ $i > /dev/null
- done
diff --git a/cad/linuxcnc-devel/files/patch-tests_build_ui_test.sh b/cad/linuxcnc-devel/files/patch-tests_build_ui_test.sh
deleted file mode 100644
index 4ace8b888219..000000000000
--- a/cad/linuxcnc-devel/files/patch-tests_build_ui_test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/build/ui/test.sh.orig	2016-06-25 02:19:12 UTC
-+++ tests/build/ui/test.sh
-@@ -1,6 +1,7 @@
- #!/bin/sh
- set -x
--g++ -I $EMC2_HOME/include \
-+c++ -I $EMC2_HOME/include \
-+    -I /usr/local/include \
-     nml-position-logger.cc \
-     -L $EMC2_HOME/lib -lnml -llinuxcnc \
-     -o /dev/null
diff --git a/cad/linuxcnc-devel/files/patch-tests_lowlevel_mutex_test.sh b/cad/linuxcnc-devel/files/patch-tests_lowlevel_mutex_test.sh
deleted file mode 100644
index fb9c2917df0a..000000000000
--- a/cad/linuxcnc-devel/files/patch-tests_lowlevel_mutex_test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
---- tests/lowlevel/mutex/test.sh.orig	2016-06-25 02:19:12 UTC
-+++ tests/lowlevel/mutex/test.sh
-@@ -1,5 +1,5 @@
- #!/bin/sh
--gcc -O -I ../../../include test.c -o test -DULAPI -std=gnu99 -pthread || exit 1
-+cc -O -I ../../../include test.c -o test -DULAPI -std=gnu99 -pthread || exit 1
- ./test; exitval=$?
- rm -f test
- exit $exitval