wsbsd: Remove hugs, mysql++, wdm, wmcpuload

https://svnweb.freebsd.org/changeset/ports/534093

8 files changed, 10 insertions, 64 deletions

diff --git a/wsarch/wsarch.pkg b/wsarch/wsarch.pkg
index 7a3646f..48c64b0 100644
--- a/wsarch/wsarch.pkg
+++ b/wsarch/wsarch.pkg
@@ -434,6 +434,7 @@
 // WindowMaker
 #define  PCLOCK                   pclock
 #define  WINDOWMAKER              windowmaker
+#define  WMCPULOAD                wmcpuload
 #define  WMCALCLOCK               wmcalclock
 #define  WMTIMER                  wmtimer
 #define  TEMPERATURE_APP          temperature.app
@@ -448,5 +449,6 @@
 #define  VNCSERVER                tigervnc
 #define  XVFB                     xorg-server-xvfb
 #define  ENLIGHTENMENT            enlightenment
+#define  WDM                      wdm
 #define  XEPHYR                   xorg-server-xephyr
 #define  LXDE                     lxde
diff --git a/wsbsd.files/patches/databases_mysql++3.patch b/wsbsd.files/patches/databases_mysql++3.patch
deleted file mode 100644
index 0c508ed..0000000
--- a/wsbsd.files/patches/databases_mysql++3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: databases/mysql++3/Makefile
-===================================================================
---- databases/mysql++3/Makefile	(revision 531763)
-+++ databases/mysql++3/Makefile	(working copy)
-@@ -11,10 +11,6 @@
- MAINTAINER=	dudu@dudu.ro
- COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
- 
--BROKEN=		unfetchable
--DEPRECATED=	Broken for more than 6 months
--EXPIRATION_DATE=	2020-05-05
--
- USES=		gmake mysql
- GNU_CONFIGURE=	yes
- CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check
diff --git a/wsbsd.files/patches/lang_hugs.patch b/wsbsd.files/patches/lang_hugs.patch
deleted file mode 100644
index f0cab4a..0000000
--- a/wsbsd.files/patches/lang_hugs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: lang/hugs/Makefile
-===================================================================
---- lang/hugs/Makefile	(revision 531763)
-+++ lang/hugs/Makefile	(working copy)
-@@ -11,10 +11,6 @@
- MAINTAINER=	haskell@FreeBSD.org
- COMMENT=	Interpreter for the functional programming language Haskell 98
- 
--BROKEN=		unfetchable
--DEPRECATED=	Broken for more than 6 months
--EXPIRATION_DATE=	2020-05-05
--
- BROKEN_armv6=		fails to compile: cppinput.c: invalid preprocessing directive \#!
- BROKEN_armv7=		fails to compile: cppinput.c: invalid preprocessing directive \#!
- 
diff --git a/wsbsd.files/patches/sysutils_wmcpuload.patch b/wsbsd.files/patches/sysutils_wmcpuload.patch
deleted file mode 100644
index b20fdc5..0000000
--- a/wsbsd.files/patches/sysutils_wmcpuload.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sysutils/wmcpuload/Makefile
-===================================================================
---- sysutils/wmcpuload/Makefile	(revision 531763)
-+++ sysutils/wmcpuload/Makefile	(working copy)
-@@ -10,10 +10,6 @@
- MAINTAINER=	xride@FreeBSD.org
- COMMENT=	"lcd" dockapp for windowmaker, which displays the current cpuload
- 
--BROKEN=		unfetchable
--DEPRECATED=	Broken for more than 6 months
--EXPIRATION_DATE=	2020-05-05
--
- USES=		tar:bzip2 xorg
- USE_XORG=	xpm
- GNU_CONFIGURE=	yes
diff --git a/wsbsd.files/patches/x11_wdm.patch b/wsbsd.files/patches/x11_wdm.patch
deleted file mode 100644
index 2bc8bac..0000000
--- a/wsbsd.files/patches/x11_wdm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: x11/wdm/Makefile
-===================================================================
---- x11/wdm/Makefile	(revision 531763)
-+++ x11/wdm/Makefile	(working copy)
-@@ -17,10 +17,6 @@
- MAINTAINER=	xride@FreeBSD.org
- COMMENT=	WINGs Display Manager; an xdm replacement
- 
--BROKEN=		unfetchable
--DEPRECATED=	Broken for more than 6 months
--EXPIRATION_DATE=	2020-05-05
--
- LIB_DEPENDS=	libWINGs.so:x11-wm/windowmaker
- 
- NOT_FOR_ARCHS=	sparc64
diff --git a/wsbsd/wsbsd.pkg b/wsbsd/wsbsd.pkg
index 81d1aeb..d8c3fe8 100644
--- a/wsbsd/wsbsd.pkg
+++ b/wsbsd/wsbsd.pkg
@@ -160,7 +160,7 @@
 #define XGRAPH              xgraph
 
 // Haskell
-#define HUGS                hugs98
+#define HUGS                NULL // Removed in r534093
 #define HASKELL_PLATFORM    hs-hashable hs-mtl hs-network hs-old-locale \
                             hs-old-time hs-random hs-transformers-compat \
                             hs-unordered-containers hs-alex hs-cabal-install \
@@ -189,7 +189,7 @@
 #define QT4_DEV             NULL // Removed in r495967
 #define QT5_DEV             qt5
 #define PERL_DEV            NULL // provided by default perl installation
-#define MYSQLXX_DEV         mysql++-mysql57
+#define MYSQLXX_DEV         NULL // Removed in r534093
 #define OPENMPI_DEV         openmpi
 #define GFLAGS_DEV          gflags
 #define BOOST_DEV           boost-all
@@ -424,6 +424,7 @@
 // WindowMaker
 #define PCLOCK              NULL // Removed in r514601
 #define WINDOWMAKER         windowmaker
+#define WMCPULOAD           NULL // Removed in r534093
 #define WMCALCLOCK          wmCalClock
 #define WMTIMER             wmtimer
 #define TEMPERATURE_APP     temperature.app
@@ -438,5 +439,6 @@
 #define VNCSERVER           tigervnc-server
 #define XVFB                xorg-vfbserver
 #define ENLIGHTENMENT       enlightenment
+#define WDM                 NULL // Removed in r534093
 #define XEPHYR              xephyr
 #define LXDE                lxde-meta
diff --git a/wscommon.h b/wscommon.h
index 0db5a53..1c5e7c8 100644
--- a/wscommon.h
+++ b/wscommon.h
@@ -419,7 +419,7 @@ JAVA_PLUGIN     // added by b01902062@csie.ntu.edu.tw
 // WindowMaker
 #ifdef WSPKG_WINDOWMAKER
 PCLOCK          WINDOWMAKER     wmbiff          wmweather+      wmnd
-wmcpuload       wmmemload       wmtop           WMCALCLOCK      wmclock
+WMCPULOAD       wmmemload       wmtop           WMCALCLOCK      wmclock
 wmclockmon      wmtime          WMTIMER         wmcliphist      TEMPERATURE_APP
 ASBUTTON
 #endif
@@ -431,7 +431,7 @@ afterstep       DESKTOP_BASE    fvwm            IM_SWITCH       mlterm
 MLTERM_TOOLS    RXVT            RXVT_ML         VNCSERVER       xchm
 xorg            xscreensaver    xterm           XVFB
 // freebsd local-217
-ENLIGHTENMENT   icewm           synergy         wdm             xfig
+ENLIGHTENMENT   icewm           synergy         WDM             xfig
 xlockmore
 // added by b01902062@csie.ntu.edu.tw
 fbpanel         obconf          openbox         XEPHYR          xrestop
diff --git a/wslinux/wslinux.pkg b/wslinux/wslinux.pkg
index 6160178..ab06125 100644
--- a/wslinux/wslinux.pkg
+++ b/wslinux/wslinux.pkg
@@ -440,6 +440,7 @@
 // WindowMaker
 #define PCLOCK              wmdate
 #define WINDOWMAKER         wmaker
+#define WMCPULOAD           wmcpuload
 #define WMCALCLOCK          wmcalclock
 #define WMTIMER             NULL // FIXME: not available from repository
 #define TEMPERATURE_APP     NULL // FIXME: not available from repository
@@ -455,5 +456,6 @@
                             tigervnc-scraping-server tigervnc-standalone-server
 #define XVFB                xvfb
 #define ENLIGHTENMENT       e17
+#define WDM                 wdm
 #define XEPHYR              xserver-xephyr
 #define LXDE                lxde