- Update to 0.11

- Import OPTIONS
- Move sample configuration file from EXAMPLESDIR to DATADIR

8 files changed, 118 insertions, 28 deletions

diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 52d355deaf92..15ef501299d4 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmobar
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	x11 haskell
 PKGNAMEPREFIX=
 
@@ -19,21 +18,40 @@ USE_XORG=	x11
 EXECUTABLE=	xmobar
 STANDALONE=	yes
 
-PORTEXAMPLES=		*
-INSTALL_PORTEXAMPLES=	${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${EXAMPLESDIR}
+PORTDATA=		*
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${DATADIR}
 
-OPTIONS=	XFT "Enable Xft support for fonts" Off	\
-		UTF8 "Enable UTF-8 support" Off
+OPTIONS=	XFT   "Use Xft to render text (UTF-8 support included)" off \
+		UTF8  "UTF-8 support" on \
+		MPD   "mpd support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+# Disable Linux-only options
+CONFIGURE_ARGS+=	--flags="-with_inotify -with_iwlib"
 
 .if defined(WITH_XFT)
 CONFIGURE_ARGS+=	--flags="with_xft"
-USE_HACKAGE+=		X11-xft>=0.2
-.elif defined(WITH_UTF8)
+USE_HACKAGE+=		utf8-string X11-xft>=0.2
+.else
+CONFIGURE_ARGS+=	--flags="-with_xft"
+.endif
+
+.if defined(WITH_UTF8)
 CONFIGURE_ARGS+=	--flags="with_utf8"
+.if !defined(WITH_XFT)
 USE_HACKAGE+=		utf8-string
 .endif
+.else
+CONFIGURE_ARGS+=	--flags="-with_utf8"
+.endif
+
+.if defined(WITH_MPD)
+CONFIGURE_ARGS+=	--flags="with_mpd"
+USE_HACKAGE+=		libmpd
+.else
+CONFIGURE_ARGS+=	--flags="-with_mpd"
+.endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index bb56346eab9c..eb0c23a48a0b 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmobar-0.9.2.tar.gz) = 1177eef9f032256ccf370239a0703eab
-SHA256 (xmobar-0.9.2.tar.gz) = 361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66
-SIZE (xmobar-0.9.2.tar.gz) = 29334
+MD5 (xmobar-0.11.tar.gz) = 80edb2b7b7cba3d718ff1b6b637e4b4d
+SHA256 (xmobar-0.11.tar.gz) = 428d469f92314d11360502bbaf0f319be41575921b75759182f314987a59346d
+SIZE (xmobar-0.11.tar.gz) = 45822
diff --git a/x11/hs-xmobar/files/patch-StatFS.hsc b/x11/hs-xmobar/files/patch-StatFS.hsc
new file mode 100644
index 000000000000..d31623c00c5d
--- /dev/null
+++ b/x11/hs-xmobar/files/patch-StatFS.hsc
@@ -0,0 +1,27 @@
+--- ./StatFS.hsc.orig	2010-05-15 14:07:17.000000000 +0200
++++ ./StatFS.hsc	2010-05-16 16:27:52.000000000 +0200
+@@ -23,7 +23,12 @@
+ import Data.ByteString (useAsCString)
+ import Data.ByteString.Char8 (pack)
+ 
++#if defined (__FreeBSD__)
++# include <sys/param.h>
++# include <sys/mount.h>
++#else
+ #include <sys/vfs.h>
++#endif
+ 
+ data FileSystemStats = FileSystemStats {
+   fsStatBlockSize :: Integer
+@@ -42,7 +47,11 @@
+ 
+ data CStatfs
+ 
++#if defined(__FreeBSD__)
++foreign import ccall unsafe "sys/mount.h statfs"
++#else
+ foreign import ccall unsafe "sys/vfs.h statfs64"
++#endif
+   c_statfs :: CString -> Ptr CStatfs -> IO CInt
+ 
+ toI :: CLong -> Integer
diff --git a/x11/hs-xmobar/pkg-descr b/x11/hs-xmobar/pkg-descr
index 7bbb2995df55..5cf0dedd308f 100644
--- a/x11/hs-xmobar/pkg-descr
+++ b/x11/hs-xmobar/pkg-descr
@@ -1,5 +1,5 @@
 Xmobar is a minimalistic text based status bar. Inspired by the Ion3 status
 bar, it supports similar features, like dynamic color management, output
-templates, and extensibility through plugins. 
+templates, and extensibility through plugins.
 
 WWW: http://code.haskell.org/~arossato/xmobar
diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 52d355deaf92..15ef501299d4 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmobar
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	x11 haskell
 PKGNAMEPREFIX=
 
@@ -19,21 +18,40 @@ USE_XORG=	x11
 EXECUTABLE=	xmobar
 STANDALONE=	yes
 
-PORTEXAMPLES=		*
-INSTALL_PORTEXAMPLES=	${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${EXAMPLESDIR}
+PORTDATA=		*
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${DATADIR}
 
-OPTIONS=	XFT "Enable Xft support for fonts" Off	\
-		UTF8 "Enable UTF-8 support" Off
+OPTIONS=	XFT   "Use Xft to render text (UTF-8 support included)" off \
+		UTF8  "UTF-8 support" on \
+		MPD   "mpd support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+# Disable Linux-only options
+CONFIGURE_ARGS+=	--flags="-with_inotify -with_iwlib"
 
 .if defined(WITH_XFT)
 CONFIGURE_ARGS+=	--flags="with_xft"
-USE_HACKAGE+=		X11-xft>=0.2
-.elif defined(WITH_UTF8)
+USE_HACKAGE+=		utf8-string X11-xft>=0.2
+.else
+CONFIGURE_ARGS+=	--flags="-with_xft"
+.endif
+
+.if defined(WITH_UTF8)
 CONFIGURE_ARGS+=	--flags="with_utf8"
+.if !defined(WITH_XFT)
 USE_HACKAGE+=		utf8-string
 .endif
+.else
+CONFIGURE_ARGS+=	--flags="-with_utf8"
+.endif
+
+.if defined(WITH_MPD)
+CONFIGURE_ARGS+=	--flags="with_mpd"
+USE_HACKAGE+=		libmpd
+.else
+CONFIGURE_ARGS+=	--flags="-with_mpd"
+.endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xmobar/distinfo b/x11/xmobar/distinfo
index bb56346eab9c..eb0c23a48a0b 100644
--- a/x11/xmobar/distinfo
+++ b/x11/xmobar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmobar-0.9.2.tar.gz) = 1177eef9f032256ccf370239a0703eab
-SHA256 (xmobar-0.9.2.tar.gz) = 361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66
-SIZE (xmobar-0.9.2.tar.gz) = 29334
+MD5 (xmobar-0.11.tar.gz) = 80edb2b7b7cba3d718ff1b6b637e4b4d
+SHA256 (xmobar-0.11.tar.gz) = 428d469f92314d11360502bbaf0f319be41575921b75759182f314987a59346d
+SIZE (xmobar-0.11.tar.gz) = 45822
diff --git a/x11/xmobar/files/patch-StatFS.hsc b/x11/xmobar/files/patch-StatFS.hsc
new file mode 100644
index 000000000000..d31623c00c5d
--- /dev/null
+++ b/x11/xmobar/files/patch-StatFS.hsc
@@ -0,0 +1,27 @@
+--- ./StatFS.hsc.orig	2010-05-15 14:07:17.000000000 +0200
++++ ./StatFS.hsc	2010-05-16 16:27:52.000000000 +0200
+@@ -23,7 +23,12 @@
+ import Data.ByteString (useAsCString)
+ import Data.ByteString.Char8 (pack)
+ 
++#if defined (__FreeBSD__)
++# include <sys/param.h>
++# include <sys/mount.h>
++#else
+ #include <sys/vfs.h>
++#endif
+ 
+ data FileSystemStats = FileSystemStats {
+   fsStatBlockSize :: Integer
+@@ -42,7 +47,11 @@
+ 
+ data CStatfs
+ 
++#if defined(__FreeBSD__)
++foreign import ccall unsafe "sys/mount.h statfs"
++#else
+ foreign import ccall unsafe "sys/vfs.h statfs64"
++#endif
+   c_statfs :: CString -> Ptr CStatfs -> IO CInt
+ 
+ toI :: CLong -> Integer
diff --git a/x11/xmobar/pkg-descr b/x11/xmobar/pkg-descr
index 7bbb2995df55..5cf0dedd308f 100644
--- a/x11/xmobar/pkg-descr
+++ b/x11/xmobar/pkg-descr
@@ -1,5 +1,5 @@
 Xmobar is a minimalistic text based status bar. Inspired by the Ion3 status
 bar, it supports similar features, like dynamic color management, output
-templates, and extensibility through plugins. 
+templates, and extensibility through plugins.
 
 WWW: http://code.haskell.org/~arossato/xmobar