Remove Haskell binding for old wxGTK versions, which doesn't work with

modern GHC anyway.

14 files changed, 0 insertions, 424 deletions

diff --git a/x11/wxhaskell/DEINSTALL b/x11/wxhaskell/DEINSTALL
deleted file mode 100644
index 0d8ff59f049..00000000000
--- a/x11/wxhaskell/DEINSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2013/12/14 08:26:30 dholland Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	ghc-pkg unregister wx
-	ghc-pkg unregister wxcore
-	;;
-esac
diff --git a/x11/wxhaskell/DESCR b/x11/wxhaskell/DESCR
deleted file mode 100644
index 3fbd50b908a..00000000000
--- a/x11/wxhaskell/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-wxHaskell is a portable and native GUI library for Haskell.
-The goal of the project is to provide an industrial strength GUI
-library for Haskell, but without the burden of developing (and
-maintaining) one ourselves.
-
-wxHaskell is therefore built on top of wxWidgets - a comprehensive C++
-library that is portable across all major GUI platforms; including
-GTK, Windows, X11, and MacOS X. Furthermore, it is a mature library
-that supports a wide range of widgets with the native look-and-feel,
-and it has a very active community.
-
-Since the core interface is generated automatically from the wxEiffel
-binding, about 90% of the wxWidgets functionality is already
-supported, excluding more "exotic" widgets like dockable windows. Most
-work is currently directed into writing a Haskellized version of the
-wxWidgets API. The library currently supports Windows, GTK (Linux) and
-MacOS X.
diff --git a/x11/wxhaskell/INSTALL b/x11/wxhaskell/INSTALL
deleted file mode 100644
index 359ba74a4ac..00000000000
--- a/x11/wxhaskell/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2013/12/14 08:26:30 dholland Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	ghc-pkg register ${PREFIX}/lib/wxcore.pkg
-	ghc-pkg register ${PREFIX}/lib/wx.pkg
-	;;
-esac
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
deleted file mode 100644
index a3a34685a6f..00000000000
--- a/x11/wxhaskell/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.53 2015/04/25 14:25:20 tnn Exp $
-
-DISTNAME=	wxhaskell-src-0.9.4
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	35
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
-EXTRACT_SUFX=	.zip
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://haskell.org/haskellwiki/WxHaskell
-COMMENT=	Haskell wxGTK bindings
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-MAKE_JOBS_SAFE=		no
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
-MAKE_FILE=		makefile
-MAKE_FLAGS+=		X11BASE=${X11BASE:Q}
-
-# I don't know where that number comes from, but it changes sometimes.
-PLIST_SUBST+=		GTKVERSION=2.6.3
-CHECK_FILES_SKIP+=	lib/ghc-6.4.1/package.conf.old
-
-post-extract:
-	${SED} < ${FILESDIR}/fixup.sh > ${WRKSRC}/fixup.sh \
-		-e s,@WRKSRC@,${WRKSRC:Q},g
-
-pre-configure:
-	cd ${WRKSRC} && ./configure --prefix=${PREFIX} --with-opengl
-
-INSTALL_TARGET=	install-files
-
-.include "../../lang/ghc7/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/wxGTK26/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxhaskell/PLIST b/x11/wxhaskell/PLIST
deleted file mode 100644
index 19c96eac53f..00000000000
--- a/x11/wxhaskell/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:25:09 joerg Exp $
-lib/imports/Graphics/UI/WX.hi
-lib/imports/Graphics/UI/WX/Attributes.hi
-lib/imports/Graphics/UI/WX/Classes.hi
-lib/imports/Graphics/UI/WX/Controls.hi
-lib/imports/Graphics/UI/WX/Dialogs.hi
-lib/imports/Graphics/UI/WX/Draw.hi
-lib/imports/Graphics/UI/WX/Events.hi
-lib/imports/Graphics/UI/WX/Frame.hi
-lib/imports/Graphics/UI/WX/Layout.hi
-lib/imports/Graphics/UI/WX/Media.hi
-lib/imports/Graphics/UI/WX/Menu.hi
-lib/imports/Graphics/UI/WX/Timer.hi
-lib/imports/Graphics/UI/WX/Types.hi
-lib/imports/Graphics/UI/WX/Variable.hi
-lib/imports/Graphics/UI/WX/Window.hi
-lib/imports/Graphics/UI/WXCore.hi
-lib/imports/Graphics/UI/WXCore/Controls.hi
-lib/imports/Graphics/UI/WXCore/Db.hi
-lib/imports/Graphics/UI/WXCore/Defines.hi
-lib/imports/Graphics/UI/WXCore/Dialogs.hi
-lib/imports/Graphics/UI/WXCore/Draw.hi
-lib/imports/Graphics/UI/WXCore/Events.hi
-lib/imports/Graphics/UI/WXCore/Frame.hi
-lib/imports/Graphics/UI/WXCore/Image.hi
-lib/imports/Graphics/UI/WXCore/IntMap.hi
-lib/imports/Graphics/UI/WXCore/Layout.hi
-lib/imports/Graphics/UI/WXCore/OpenGL.hi
-lib/imports/Graphics/UI/WXCore/Print.hi
-lib/imports/Graphics/UI/WXCore/Process.hi
-lib/imports/Graphics/UI/WXCore/Types.hi
-lib/imports/Graphics/UI/WXCore/WxcClassInfo.hi
-lib/imports/Graphics/UI/WXCore/WxcClassTypes.hi
-lib/imports/Graphics/UI/WXCore/WxcClasses.hi
-lib/imports/Graphics/UI/WXCore/WxcClassesAL.hi
-lib/imports/Graphics/UI/WXCore/WxcClassesMZ.hi
-lib/imports/Graphics/UI/WXCore/WxcDefs.hi
-lib/imports/Graphics/UI/WXCore/WxcObject.hi
-lib/imports/Graphics/UI/WXCore/WxcTypes.hi
-lib/libwx.a
-lib/libwxc-gtk${GTKVERSION}-${PKGVERSION}.so
-lib/libwxcore.a
-lib/libwxcore0.a
-lib/libwxcore1.a
-lib/libwxcore2.a
-lib/wx.o
-lib/wx.pkg
-lib/wxcore.o
-lib/wxcore.pkg
-lib/wxcore0.o
-lib/wxcore1.o
-lib/wxcore2.o
-@unexec %D/bin/ghc-pkg -r wxcore
-@unexec %D/bin/ghc-pkg -r wx
diff --git a/x11/wxhaskell/distinfo b/x11/wxhaskell/distinfo
deleted file mode 100644
index 193b43cfbe9..00000000000
--- a/x11/wxhaskell/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.7 2015/02/20 23:39:31 joerg Exp $
-
-SHA1 (wxhaskell-src-0.9.4.zip) = 6133991fb1e6c76a3b5b2bf175277ce56c2adad3
-RMD160 (wxhaskell-src-0.9.4.zip) = 70c386cb2451509dbd5bca652435bab35b808ed1
-Size (wxhaskell-src-0.9.4.zip) = 569954 bytes
-SHA1 (patch-aa) = 8d19820883faa8cc4d5605547ab80ba24f4a709a
-SHA1 (patch-ab) = 6d2b08d6fd476839f480be73d699423ea97f20b1
-SHA1 (patch-wxc_src_ewxw_eljcolour.cpp) = ded5b65de343f6e254f0c5375acad34f07463cb9
-SHA1 (patch-wxc_src_ewxw_eljtoolbar.cpp) = d2104d69ec2380fe27800dd353bd91a44025e2b4
-SHA1 (patch-wxc_src_extra.cpp) = 29774dfe0f9dbaac5aaa99471299961d1f466e8d
-SHA1 (patch-wxc_src_image.cpp) = 3964efd0c63af94ceab08cbabf257004dddc168c
-SHA1 (patch-wxc_src_treectrl.cpp) = 3099efda7f2f08f87ac20e411b2076926cda9f0e
diff --git a/x11/wxhaskell/files/fixup.sh b/x11/wxhaskell/files/fixup.sh
deleted file mode 100644
index ea883894b46..00000000000
--- a/x11/wxhaskell/files/fixup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Hack to fix up the Haskell package system bits.
-#
-
-# Remove nonexistent depends from wxcore.pkg. 
-mv config/wxcore.pkg config/wxcore.pkg.orig
-sed < config/wxcore.pkg.orig \
-	-e "/depends/s/,lang//;/depends/s/,concurrent//" \
-	> config/wxcore.pkg
-
-# Create a temporary package database to import wxcore through while
-# building wx. Otherwise it doesn't work.
-echo '[]' > tmp-pkgdb
-mkdir -p out/wx/imports
-sed < config/wxcore.pkg \
-	-e "s,.{wxhlibdir},@WRKSRC@/out/wx," \
-	| ghc-pkg -f tmp-pkgdb register -
-
-
-# And since we appear to *also* need to include from the output
-# directory, make a version of it that doesn't show wxcore; otherwise
-# ghc reads wxcore through the include path instead of its package
-# system, and then fails.
-
-mkdir -p out2/wx/imports/Graphics/UI/
-ln -sf ../../../../../out/wx/imports/Graphics/UI/WX \
-                     out2/wx/imports/Graphics/UI/WX
diff --git a/x11/wxhaskell/patches/patch-aa b/x11/wxhaskell/patches/patch-aa
deleted file mode 100644
index bca9b112709..00000000000
--- a/x11/wxhaskell/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2015/02/20 23:39:31 joerg Exp $
-
-- Add an extra arg to compile-hs so we can control whether -i is passed.
-This is needed for building wxcore but not wx.
-
-- Add the version to the wxcore package name. XXX: it is hardcoded,
-which is bad, but it's likely that the next update to this package
-will remove most of this patch.
-
-- Run fixup.sh to create a dummy package installation to make ghc
-happy importing wxcore interfaces while building wx.
-
-- Add X11BASE to the include path.
-
---- makefile.orig	2005-04-29 09:31:37.000000000 +0000
-+++ makefile
-@@ -424,7 +424,7 @@ $(WXD-EXE): $(WXD-OBJS)
- 
- # create an object file from source files.
- $(WXD-OBJS): $(WXD-OUTDIR)/%.o: $(WXD-SRCDIR)/%.hs
--	@$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-SRCDIR))
-+	@$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-SRCDIR),-i$(WXD-OUTDIR))
- 
- # automatically include all dependency information.
- -include $(WXD-DEPS)
-@@ -471,11 +471,12 @@ WXCORE-NONGEN-HS=$(filter-out $(WXCORE-G
- 
- WXCORE-BINS	=$(WXCORE-HIS) $(WXCORE-LIBS)
- WXCORE-DOCS	=$(filter-out $(WXCORE-SRCDIR)/$(WXCORE-HPATH)/IntMap.hs,$(WXCORE-HS))
--WXCORE-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WXCORE)
-+WXCORE-HCFLAGS	=$(HCFLAGS) -fvia-C -package-name $(WXCORE)-0.9.4
- 
- 
- # build main library
- wxcore: wxc wxd wxcore-dirs $(WXCORE-LIBS)
-+	sh fixup.sh
- 
- wxcore-dirs:
- 	@$(call ensure-dirs-of-files,$(WXCORE-OBJS))
-@@ -553,7 +554,7 @@ $(WXCORE-CORE-C-LIB): $(WXCORE-CORE-C-OB
- 
- # create an object file from source files.
- $(WXCORE-CORE-A-OBJS) $(WXCORE-CORE-B-OBJS) $(WXCORE-CORE-C-OBJS) $(WXCORE-OBJS): $(WXCORE-IMPORTSDIR)/%.o: $(WXCORE-SRCDIR)/%.hs
--	@$(call compile-hs,$@,$<,$(WXCORE-HCFLAGS) -Iwxc/include,$(WXCORE-IMPORTSDIR),$(WXCORE-HSDIRS) )
-+	@$(call compile-hs,$@,$<,$(WXCORE-HCFLAGS) -Iwxc/include,$(WXCORE-IMPORTSDIR),$(WXCORE-HSDIRS),-i$(WXCORE-IMPORTSDIR) )
- 
- $(WXCORE-STUB-OBJS): $(WXCORE-IMPORTSDIR)/%_stub.o: $(WXCORE-SRCDIR)/%.hs
- 	$(HC) -c $(basename $@).c
-@@ -626,7 +627,7 @@ $(WX-LIB): $(WX-OBJS)
- 
- # create an object file from source files.
- $(WX-OBJS): $(WX-IMPORTSDIR)/%.o: $(WX-SRCDIR)/%.hs
--	@$(call compile-hs,$@,$<,$(WX-HCFLAGS) -i$(WXCORE-IMPORTSDIR),$(WX-IMPORTSDIR),$(WX-HSDIRS))
-+	@$(call compile-hs,$@,$<,$(WX-HCFLAGS) -package-conf tmp-pkgdb -package wxcore,$(WX-IMPORTSDIR),$(WX-HSDIRS),-i$(patsubst out/%,out2/%,$(WX-IMPORTSDIR)))
- 
- # automatically include all dependency information.
- -include $(WX-DEPS)
-@@ -651,7 +652,7 @@ WXC-LIB		=$(WXC-OUTDIR)/$(LIB)$(WXC-LIBN
- WXC-OBJS	=$(call make-objs, $(WXC-OUTDIR), $(WXC-SOURCES))
- WXC-DEPS	=$(call make-deps, $(WXC-OUTDIR), $(WXC-SOURCES))
- WXC-LIBS	=$(WXWIN-LIBS)
--WXC-CXXFLAGS	=$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR)
-+WXC-CXXFLAGS	=$(WXWIN-CXXFLAGS) -I$(WXC-INCDIR) -I$(X11BASE)/include -fPIC
- 
- 
- wxc: wxc-dirs $(WXC-LIB)
-@@ -711,7 +712,7 @@ endif
- 
- # dynamic link library on unix: generates single .so file
- $(basename $(WXC-LIB)).so: $(WXC-OBJS)
--	$(CXX) -shared -o $@ $^ $(WXC-LIBS) -Wl --soname=$(SHARED-PREFIX)$(notdir $@)
-+	$(CXX) -shared -o $@ $^ $(WXC-LIBS) -Wl,--soname=$(SHARED-PREFIX)$(notdir $@)
- 
- # dynamic link library on macOSX: generates single .so file
- $(basename $(WXC-LIB)).dylib: $(WXC-OBJS)
diff --git a/x11/wxhaskell/patches/patch-ab b/x11/wxhaskell/patches/patch-ab
deleted file mode 100644
index ff4062cd1cc..00000000000
--- a/x11/wxhaskell/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2013/12/14 08:26:30 dholland Exp $
-
-- Add an extra arg to compile-hs so we can control whether -i is passed.
-This is needed for building wxcore but not wx.
-
---- makefile.lib.orig	2005-04-29 10:32:51.000000000 +0000
-+++ makefile.lib	2013-12-14 04:26:31.000000000 +0000
-@@ -137,14 +137,14 @@ else
- silent-move-stubs =$(call silent-move-file,$(basename $(2))_stub.h,$(dir $(1))) && \
- 		   $(call silent-move-file,$(basename $(2))_stub.c,$(dir $(1))) 
- 
--make-hs-obj     =$(call run-with-echo,$(HC) -c $(2) -o $(1) -i$(4) -odir $(4) -hidir $(4) $(3))
-+make-hs-obj     =$(call run-with-echo,$(HC) -c $(2) -o $(1) $(5) -odir $(4) -hidir $(4) $(3))
- 
- # make-hs-deps(<output .o>,<input .hs>,<compile flags>,<top output directory>,<hs directories>)
- make-hs-deps	=$(HC) $(2) $(3) -odir $(4) -hidir $(4) $(5) -M -optdep-f -optdep$(basename $(1)).d.in && \
- 		 sed -e 's|\.hi|\.o|g' $(basename $(1)).d.in | grep '^$(1)' > $(basename $(1)).d 
- 
--# compile-hs(<output .o>,<input .hs>,<compile flags>,<top output directory>,<hs directories>)
--compile-hs      =$(call make-hs-obj,$(1),$(2),$(3),$(4)) && \
-+# compile-hs(<output .o>,<input .hs>,<compile flags>,<top output directory>,<hs directories>,<-i top output directory if any>)
-+compile-hs      =$(call make-hs-obj,$(1),$(2),$(3),$(4),$(6)) && \
- 		 $(call silent-move-stubs,$(1),$(2)) && \
- 		 $(call make-hs-deps,$(1),$(2),$(3),$(4),$(5))
- 
diff --git a/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljcolour.cpp b/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljcolour.cpp
deleted file mode 100644
index 103face75cb..00000000000
--- a/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljcolour.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-wxc_src_ewxw_eljcolour.cpp,v 1.1 2015/02/20 23:39:31 joerg Exp $
-
---- wxc/src/ewxw/eljcolour.cpp.orig	2015-02-20 23:00:58.000000000 +0000
-+++ wxc/src/ewxw/eljcolour.cpp
-@@ -93,7 +93,7 @@ EWXWEXPORT(void, wxColour_SetByName)(voi
- 
- EWXWEXPORT(int, wxColour_ValidName)(void* _name)
- {
--	return (int) wxTheColourDatabase->FindColour ((char*)_name);
-+	return (int)(intptr_t) wxTheColourDatabase->FindColour ((char*)_name);
- }
- 
- }
diff --git a/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljtoolbar.cpp b/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljtoolbar.cpp
deleted file mode 100644
index cb09a2f6b6c..00000000000
--- a/x11/wxhaskell/patches/patch-wxc_src_ewxw_eljtoolbar.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-wxc_src_ewxw_eljtoolbar.cpp,v 1.1 2015/02/20 23:39:31 joerg Exp $
-
---- wxc/src/ewxw/eljtoolbar.cpp.orig	2015-02-20 23:10:53.000000000 +0000
-+++ wxc/src/ewxw/eljtoolbar.cpp
-@@ -15,7 +15,7 @@ EWXWEXPORT(void, wxToolBar_Delete) (void
- 
- EWXWEXPORT(int, wxToolBar_AddControl) (void* _obj, void* ctrl)
- {
--	return (int)((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl);
-+	return (int)(intptr_t)((wxToolBar*)_obj)->AddControl ((wxControl*)ctrl);
- }
- 
- EWXWEXPORT(void, wxToolBar_AddSeparator) (void* _obj)
diff --git a/x11/wxhaskell/patches/patch-wxc_src_extra.cpp b/x11/wxhaskell/patches/patch-wxc_src_extra.cpp
deleted file mode 100644
index f58c1396cc4..00000000000
--- a/x11/wxhaskell/patches/patch-wxc_src_extra.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-wxc_src_extra.cpp,v 1.1 2015/02/20 23:39:31 joerg Exp $
-
---- wxc/src/extra.cpp.orig	2015-02-20 22:48:26.000000000 +0000
-+++ wxc/src/extra.cpp
-@@ -221,7 +221,7 @@ void wxInputSink::Start()
- 
- int wxInputSink::GetId()
- {
--  return (int)m_input;
-+  return (int)(intptr_t)m_input;
- }
- 
- wxThread::ExitCode wxInputSink::Entry()
-@@ -2256,47 +2256,47 @@ EWXWEXPORT(void*,wxLog_GetTimestamp)(voi
- 
- EWXWEXPORT(void,LogError)(void* _msg)
- {
--        wxLogError((char*)_msg);
-+        wxLogError("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogFatalError)(void* _msg)
- {
--        wxLogFatalError((char*)_msg);
-+        wxLogFatalError("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogWarning)(void* _msg)
- {
--        wxLogWarning((char*)_msg);
-+        wxLogWarning("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogMessage)(void* _msg)
- {
--        wxLogMessage((char*)_msg);
-+        wxLogMessage("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogVerbose)(void* _msg)
- {
--        wxLogVerbose((char*)_msg);
-+        wxLogVerbose("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogStatus)(void* _msg)
- {
--        wxLogStatus((char*)_msg);
-+        wxLogStatus("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogSysError)(void* _msg)
- {
--        wxLogSysError((char*)_msg);
-+        wxLogSysError("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogDebug)(void* _msg)
- {
--        wxLogDebug((char*)_msg);
-+        wxLogDebug("%s", (char*)_msg);
- }
- 
- EWXWEXPORT(void,LogTrace)(void* mask, void* _msg)
- {
--        wxLogTrace((char*) mask, (char*)_msg);
-+        wxLogTrace("%s", (char*) mask, (char*)_msg);
- }
- 
- /*-----------------------------------------------------------------------------
diff --git a/x11/wxhaskell/patches/patch-wxc_src_image.cpp b/x11/wxhaskell/patches/patch-wxc_src_image.cpp
deleted file mode 100644
index 1abf93e53f7..00000000000
--- a/x11/wxhaskell/patches/patch-wxc_src_image.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-wxc_src_image.cpp,v 1.1 2015/02/20 23:39:31 joerg Exp $
-
---- wxc/src/image.cpp.orig	2015-02-20 22:58:51.000000000 +0000
-+++ wxc/src/image.cpp
-@@ -60,9 +60,9 @@ EWXWEXPORT(int, wxcGetPixelRGB)( unsigne
- 
- EWXWEXPORT(void, wxcSetPixelRowRGB)( unsigned char* buffer, int width, int x, int y, int rgb0, int rgb1, int count )
- {
--  int r0  = ((rgb0 >> 16) && 0xFF);
--  int g0  = ((rgb0 >>  8) && 0xFF);
--  int b0  = (rgb0 && 0xFF);
-+  int r0  = ((rgb0 >> 16) & 0xFF);
-+  int g0  = ((rgb0 >>  8) & 0xFF);
-+  int b0  = (rgb0 & 0xFF);
-   int start = 3*(width*y+x);
-   int i;
-   
-@@ -76,9 +76,9 @@ EWXWEXPORT(void, wxcSetPixelRowRGB)( uns
-   }
-   else {  
-     /* do linear interpolation of the color */
--    int r1  = ((rgb1 >> 16) && 0xFF);
--    int g1  = ((rgb1 >>  8) && 0xFF);
--    int b1  = (rgb1 && 0xFF);
-+    int r1  = ((rgb1 >> 16) & 0xFF);
-+    int g1  = ((rgb1 >>  8) & 0xFF);
-+    int b1  = (rgb1 & 0xFF);
- 
-     int rd  = ((r1 - r0) << 16) / (count-1);
-     int gd  = ((g1 - g0) << 16) / (count-1);
-@@ -102,9 +102,9 @@ EWXWEXPORT(void, wxcSetPixelRowRGB)( uns
- EWXWEXPORT(void, wxcInitPixelsRGB)( unsigned char* buffer, int width, int height, int rgb )
- {
-   int count        = width*height*3;
--  unsigned char r  = ((rgb >> 16) && 0xFF);
--  unsigned char g  = ((rgb >>  8) && 0xFF);
--  unsigned char b  = rgb && 0xFF;
-+  unsigned char r  = ((rgb >> 16) & 0xFF);
-+  unsigned char g  = ((rgb >>  8) & 0xFF);
-+  unsigned char b  = rgb & 0xFF;
-   int i;
- 
-   if (r==g && g==b) {
diff --git a/x11/wxhaskell/patches/patch-wxc_src_treectrl.cpp b/x11/wxhaskell/patches/patch-wxc_src_treectrl.cpp
deleted file mode 100644
index bc1c5897353..00000000000
--- a/x11/wxhaskell/patches/patch-wxc_src_treectrl.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-wxc_src_treectrl.cpp,v 1.1 2015/02/20 23:39:31 joerg Exp $
-
---- wxc/src/treectrl.cpp.orig	2015-02-20 22:58:12.000000000 +0000
-+++ wxc/src/treectrl.cpp
-@@ -310,9 +310,9 @@ EWXWEXPORT(int, wxTreeCtrl_GetSelections
- 			*(((wxTreeItemId**)selections)[i]) = sel[i];
-             */
- 	    #if wxCHECK_VERSION(2,5,0)
--            selections[i] = (int)(((wxTreeItemId*)sel[i])->m_pItem);
-+            selections[i] = (int)(intptr_t)(((wxTreeItemId*)sel[i])->m_pItem);
-             #else
--	    selections[i] = (int)(sel[i].m_pItem);
-+	    selections[i] = (int)(intptr_t)(sel[i].m_pItem);
- 	    #endif
- 	  }
- 	}