ports/152577: [PATCH] x11-wm/wmfs update to 201011

[Philippe Pepiot]

>Number:         152577
>Category:       ports
>Synopsis:       [PATCH] x11-wm/wmfs update to 201011
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 25 19:40:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Philippe Pepiot
>Release:        FreeBSD 8.1-RELEASE-p1 amd64
>Organization:
>Environment:
System: FreeBSD aldo.philpep.org 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #5: Thu Nov 18 22:23:34 CET 2010 root at aldo.philpep.org:/usr/obj/usr/src/sys/ALDO amd64


	
>Description:
	Update to 201011

	- cmake no longer used by wmfs (shell script configure, nothing to do with GNU configure, and Makefile)
	- add options
	- add mirror
	- remove README and TODO from docs (useless informations)

	Note to maintainer: I can maintain this port if you want, I'm one of the developer of wmfs and also a proudly FreeBSD user :)
>How-To-Repeat:
	
>Fix:

	

--- wmfs.patch begins here ---
diff -ru wmfs.old/Makefile wmfs/Makefile
--- wmfs.old/Makefile	2010-11-25 15:53:33.447252377 +0100
+++ wmfs/Makefile	2010-11-25 20:22:40.664013166 +0100
@@ -6,52 +6,60 @@
 #
 
 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 at 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
 
diff -ru wmfs.old/distinfo wmfs/distinfo
--- wmfs.old/distinfo	2010-11-25 15:53:33.447252377 +0100
+++ wmfs/distinfo	2010-11-25 17:04:05.061450830 +0100
@@ -1,3 +1,2 @@
-MD5 (wmfs-201008.tar.gz) = 22e3eb09d862ed347802bbd9b5df7f1e
-SHA256 (wmfs-201008.tar.gz) = 8f0936bf04a1c0250bbe82cba4b86abb7b10fa8cc23587409da14908a88d35b9
-SIZE (wmfs-201008.tar.gz) = 72498
+SHA256 (wmfs-201011.tar.gz) = 85d3c77a267608c3c736f3a23032119bda3328f3571d5d3064e99bcea55e69e5
+SIZE (wmfs-201011.tar.gz) = 85765
diff -ru wmfs.old/pkg-message wmfs/pkg-message
--- wmfs.old/pkg-message	2010-11-25 15:53:33.464252024 +0100
+++ wmfs/pkg-message	2010-11-25 20:12:49.463339337 +0100
@@ -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.
 
 ##########################################
--- wmfs.patch ends here ---


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