3 files changed, 35 insertions, 27 deletions

diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index c946659eca12..29df308ed6cc 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -6,53 +6,61 @@
 #
 
 PORTNAME=	wmfs
-DISTVERSION=	201008
+DISTVERSION=	201011
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://dl.wmfs.info/
+MASTER_SITES=	http://wmfs.info/attachments/download/15/ \
+		http://cloud.github.com/downloads/philpep/wmfs/
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A floating and tiling Window Manager From Scratch
 
+LICENCE=	BSD
+
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_GNOME=	pkgconfig
-USE_CMAKE=	yes
 USE_XORG=	x11 xft xpm
+HAS_CONFIGURE=	yes
 
 MAN1=	${PORTNAME}.1
 MANCOMPRESSED=	yes
 
 PLIST_FILES=	bin/wmfs \
 		etc/xdg/wmfs/wmfsrc \
-		share/xsessions/wmfs.desktop \
-		%%DOCSDIR%%/TODO \
-		%%DOCSDIR%%/README \
-		%%DOCSDIR%%/wmfsrc
-PLIST_DIRS=	%%DOCSDIR%% etc/xdg/wmfs etc/xdg share/xsessions
+		share/xsessions/wmfs.desktop
+
+PLIST_DIRS=	etc/xdg/wmfs etc/xdg share/xsessions
 
-OPTIONS=	IMLIB2 "Enable Imlib2 support" on
+OPTIONS=	XRANDR "Enable xrandr support" on \
+		XINERAMA "Enable xinerama support" on \
+		IMLIB "Enable Imlib2 support" on
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_IMLIB2)
-USE_EFL+=	imlib2
+CONFIGURE_ARGS=	--prefix ${PREFIX} \
+			--man-prefix ${MANPREFIX}/man \
+			--xdg-config-dir ${PREFIX}/etc/xdg
+
+.if defined(WITH_XRANDR)
+USE_XORG+=	xrandr
+.else
+CONFIGURE_ARGS+=	--without-xrandr
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|share/$${PROJECT_NAME})|${DOCSDIR})|g' \
-		-e 's|$${PREFIX}/share/man|/$${PREFIX}/man|g' \
-		-e 's|$${SYSCONFDIR}/xdg|${PREFIX}/etc/xdg|g'  ${WRKSRC}/CMakeLists.txt
+.if defined(WITH_XINERAMA)
+USE_XORG+=	xinerama
+.else
+CONFIGURE_ARGS+=	--without-xinerama
+.endif
 
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmfs ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}/TODO
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/wmfsrc ${DOCSDIR}/wmfsrc
+.if defined(WITH_IMLIB)
+USE_EFL+=	imlib2
+.else
+CONFIGURE_ARGS+=	--without-imlib2
 .endif
 
+post-install:
 	@${CAT} ${PKGMESSAGE} | ${SED} "s|PREFIX|${PREFIX}|g" \
-		${PKGDIR}/pkg-message
+	${PKGDIR}/pkg-message
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/wmfs/distinfo b/x11-wm/wmfs/distinfo
index 36d4f40fac75..7dda1ac6a20b 100644
--- a/x11-wm/wmfs/distinfo
+++ b/x11-wm/wmfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmfs-201008.tar.gz) = 22e3eb09d862ed347802bbd9b5df7f1e
-SHA256 (wmfs-201008.tar.gz) = 8f0936bf04a1c0250bbe82cba4b86abb7b10fa8cc23587409da14908a88d35b9
-SIZE (wmfs-201008.tar.gz) = 72498
+MD5 (wmfs-201011.tar.gz) = cf46782e5404f2cb98242580e5ddcd5e
+SHA256 (wmfs-201011.tar.gz) = 85d3c77a267608c3c736f3a23032119bda3328f3571d5d3064e99bcea55e69e5
+SIZE (wmfs-201011.tar.gz) = 85765
diff --git a/x11-wm/wmfs/pkg-message b/x11-wm/wmfs/pkg-message
index ad728daca47d..e5437c65a3e8 100644
--- a/x11-wm/wmfs/pkg-message
+++ b/x11-wm/wmfs/pkg-message
@@ -2,7 +2,7 @@
 wmfs has been installed.
 
 A default wmfsrc has been installed to:
- PREFIX/share/doc/wmfs/wmfsrc
+ PREFIX/etc/xdg/wmfs/wmfsrc
 Copy it to ~/.config/wmfs/ and modify it.
 
 ##########################################