ports/136373: [patch] x11-wm/xmonad-contrib - Xft & UTF-8 support

[Pavel Plesov]

>Number:         136373
>Category:       ports
>Synopsis:       [patch] x11-wm/xmonad-contrib - Xft & UTF-8 support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 06 11:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Pavel Plesov
>Release:        FreeBSD 7.2-STABLE
>Organization:
>Environment:
FreeBSD 7.2-STABLE #17: Mon Jun 29 18:24:56 MSD 2009     amd64
>Description:
Patch to add support of Xft & UTF-8 to x11-wm/xmonad-contrib port.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- /usr/ports/x11-wm/xmonad-contrib/Makefile-orig	2009-07-06 14:42:35.000000000 +0400
+++ /usr/ports/x11-wm/xmonad-contrib/Makefile	2009-07-06 14:54:03.000000000 +0400
@@ -31,6 +31,22 @@
 		PORTVERSION=${PORTVERSION} \
 		SUBDIR=${SUBDIR}
 
+OPTIONS=	XFT "Enable Xft support for fonts" Off	\
+		UTF8 "Enable UTF-8 support" Off
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
+
+.if defined(WITH_XFT)
+CONFIGURE_ARGS+=	--flags="with_xft"
+BUILD_DEPENDS+=		hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc	\
+			hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
+.elif defined(WITH_UTF8)
+CONFIGURE_ARGS+=	--flags="with_utf8"
+BUILD_DEPENDS+=		hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
+.endif
+
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
 .else
@@ -39,7 +55,7 @@
 .endif
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS}
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
@@ -51,4 +67,4 @@
 	cd ${WRKSRC} && ${CABALCMD} install
 	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: