svn commit: r395959 - head/x11-wm/wmfs

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Sep  3 14:03:33 2015
New Revision: 395959
URL: https://svnweb.freebsd.org/changeset/ports/395959

Log:
  - Cleanup, update MASTER_SITES
  - Fix build with disabled options
  
  PR:		202860
  Submitted by:	tkato432 at yahoo.com

Modified:
  head/x11-wm/wmfs/Makefile
  head/x11-wm/wmfs/pkg-descr

Modified: head/x11-wm/wmfs/Makefile
==============================================================================
--- head/x11-wm/wmfs/Makefile	Thu Sep  3 13:54:58 2015	(r395958)
+++ head/x11-wm/wmfs/Makefile	Thu Sep  3 14:03:33 2015	(r395959)
@@ -5,8 +5,7 @@ PORTNAME=	wmfs
 DISTVERSION=	201104
 PORTREVISION=	4
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://wmfs.info/attachments/download/45/ \
-		http://cloud.github.com/downloads/xorg62/wmfs/
+MASTER_SITES=	GHC
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Floating and tiling Window Manager From Scratch
@@ -16,23 +15,28 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	xorg62
+
 USES=		pkgconfig
 USE_XORG=	x11 xft xpm
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix ${PREFIX} \
+		--man-prefix ${MANPREFIX}/man \
+		--xdg-config-dir ${PREFIX}/etc/xdg
+
+CFLAGS+=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/freetype2
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	XRANDR XINERAMA IMLIB
+OPTIONS_DEFINE=		XRANDR XINERAMA IMLIB
 OPTIONS_DEFAULT=	XRANDR XINERAMA IMLIB
 
-CONFIGURE_ARGS=	--prefix ${PREFIX} \
-		--man-prefix ${MANPREFIX}/man \
-		--xdg-config-dir ${PREFIX}/etc/xdg
-
-XRANDR_USE=	XORG=xrandr
-XRANDR_CONFIGURE_WITH+=	xrandr
-XINERAMA_USE=	XORG=xinerama
-XINERARAM_CONFIGURE_WITH=	xinerama
+XRANDR_USE=		XORG=xrandr
+XRANDR_CONFIGURE_WITH=	xrandr
+XINERAMA_USE=		XORG=xinerama
+XINERAMA_CONFIGURE_WITH=	xinerama
 IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB_CONFIGURE_WITH=	imlib2
 

Modified: head/x11-wm/wmfs/pkg-descr
==============================================================================
--- head/x11-wm/wmfs/pkg-descr	Thu Sep  3 13:54:58 2015	(r395958)
+++ head/x11-wm/wmfs/pkg-descr	Thu Sep  3 14:03:33 2015	(r395959)
@@ -1,6 +1,6 @@
-WMFS (Window Manager From Scratch) is a lightweight tiling
-window manager for X. It can be configured with a configuration
-file (made with LibConfuse), it supports Xft (FreeType) fonts
-and EWMH hints wm standards.
+WMFS (Window Manager From Scratch) is a lightweight tiling window
+manager for X. It can be configured with a configuration file (made with
+LibConfuse), it supports Xft (FreeType) fonts and EWMH hints wm
+standards.
 
-WWW: https://www.wmfs.info/projects/wmfs/
+WWW: https://github.com/xorg62/wmfs/