7 files changed, 18 insertions, 76 deletions

diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index bac6a8339690..e7f5f0dda1ad 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -7,13 +7,15 @@
 
 PORTNAME=	X11-xft
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Bindings to the Xft, Xrender and Freetype for Haskell programs
 
-USE_HACKAGE=	utf8-string>=0.1 X11>=1.2.1
+LICENSE=	LGPL21
+
+USE_CABAL=	utf8-string>=0.1 X11>=1.2.1
 USE_XORG=	xft xrender
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11/hs-X11-xft/pkg-plist b/x11/hs-X11-xft/pkg-plist
deleted file mode 100644
index 02bdbd2b0846..000000000000
--- a/x11/hs-X11-xft/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 667f7730b11b..5dd613093777 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -6,13 +6,16 @@
 
 PORTNAME=	X11
 PORTVERSION=	1.5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
+USE_CABAL=	syb
 USE_XORG=	x11 xext sm
 
 OPTIONS=	XINERAMA "Build with Xinerama support" off
diff --git a/x11/hs-X11/pkg-plist b/x11/hs-X11/pkg-plist
deleted file mode 100644
index 1744ca61519c..000000000000
--- a/x11/hs-X11/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Cursor.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index f2547f51e397..7d9b254a1065 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -5,20 +5,22 @@
 # $FreeBSD$
 
 PORTNAME=	xmobar
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A minimalistic text based status bar
 
-USE_HACKAGE=	X11>=1.3.0
+LICENSE=	BSD
+
+USE_CABAL=	mtl parsec stm X11>=1.3.0
 USE_XORG=	x11
 
 EXECUTABLE=	xmobar
 STANDALONE=	yes
 
 PORTDATA=		*
-INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${DATADIR}
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${DATADIR}
 
 OPTIONS=	XFT   "Use Xft to render text (UTF-8 support included)" off \
 		UTF8  "UTF-8 support" on \
@@ -32,7 +34,7 @@ CONFIGURE_ARGS+=	--flags="-with_inotify -with_iwlib"
 
 .if defined(WITH_XFT)
 CONFIGURE_ARGS+=	--flags="with_xft"
-USE_HACKAGE+=		utf8-string X11-xft>=0.2
+USE_CABAL+=		utf8-string X11-xft>=0.2
 .else
 CONFIGURE_ARGS+=	--flags="-with_xft"
 .endif
@@ -40,7 +42,7 @@ CONFIGURE_ARGS+=	--flags="-with_xft"
 .if defined(WITH_UTF8)
 CONFIGURE_ARGS+=	--flags="with_utf8"
 .if !defined(WITH_XFT)
-USE_HACKAGE+=		utf8-string
+USE_CABAL+=		utf8-string
 .endif
 .else
 CONFIGURE_ARGS+=	--flags="-with_utf8"
@@ -48,7 +50,7 @@ CONFIGURE_ARGS+=	--flags="-with_utf8"
 
 .if defined(WITH_MPD)
 CONFIGURE_ARGS+=	--flags="with_mpd"
-USE_HACKAGE+=		libmpd
+USE_CABAL+=		libmpd
 .else
 CONFIGURE_ARGS+=	--flags="-with_mpd"
 .endif
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 6b3657508f3d..2255f62bfedf 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmobar-0.11.1.tar.gz) = 753b755b96852008bbbf8c79933d9ebb87554bf7e562888e8d6fb5b8320a6a73
-SIZE (cabal/xmobar-0.11.1.tar.gz) = 45872
+SHA256 (cabal/xmobar-0.12.tar.gz) = 633b7985dbaebd58864f591ea7ff8b44f5a69b4e3d0a592df01daf8fe11a5d31
+SIZE (cabal/xmobar-0.12.tar.gz) = 52630
diff --git a/x11/hs-xmobar/pkg-plist b/x11/hs-xmobar/pkg-plist
deleted file mode 100644
index f4b7e0083752..000000000000
--- a/x11/hs-xmobar/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-bin/xmobar
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%