From owner-svn-ports-all@FreeBSD.ORG  Wed Apr  3 06:21:41 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EB1C0F82;
 Wed,  3 Apr 2013 06:21:41 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CF617741;
 Wed,  3 Apr 2013 06:21:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r336LfEc015237;
 Wed, 3 Apr 2013 06:21:41 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r336LfZj015235;
 Wed, 3 Apr 2013 06:21:41 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201304030621.r336LfZj015235@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 3 Apr 2013 06:21:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315693 - head/x11-wm/windowlab
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Apr 2013 06:21:42 -0000

Author: miwi
Date: Wed Apr  3 06:21:41 2013
New Revision: 315693
URL: http://svnweb.freebsd.org/changeset/ports/315693

Log:
  - Fix build
  - Update MASTER_SITES
  - OptionsNG
  
  PR:		177553
  Submitted by:	Ports Fury

Modified:
  head/x11-wm/windowlab/Makefile
  head/x11-wm/windowlab/distinfo   (contents, props changed)

Modified: head/x11-wm/windowlab/Makefile
==============================================================================
--- head/x11-wm/windowlab/Makefile	Wed Apr  3 06:12:53 2013	(r315692)
+++ head/x11-wm/windowlab/Makefile	Wed Apr  3 06:21:41 2013	(r315693)
@@ -3,39 +3,56 @@
 
 PORTNAME=	windowlab
 PORTVERSION=	1.40
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://nickgravgaard.com/windowlab/
 EXTRACT_SUFX=	.tar
+DIST_SUBDIR=	repacked
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A small window manager for X11
+COMMENT=	Small window manager for X11
 
-MAN1=		windowlab.1x
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	XFT DOCS
 
 USE_XORG=	x11 xext
 USE_GMAKE=	yes
+MAKE_ENV=	XROOT="${LOCALBASE}" SYSCONFDIR="${ETCDIR}"
+MAKE_JOBS_SAFE=	yes
 
-BROKEN=		distfile mismatch
-
-MAKE_ARGS=	MENURC=${PREFIX}/etc/windowlab/menurc CC="${CC}"
+MAN1=		windowlab.1x
+PORTDOCS=	CHANGELOG README
+PLIST_FILES=	bin/windowlab %%ETCDIR%%/menurc
+PLIST_DIRS=	%%ETCDIR%%
 
-PLIST_FILES=	bin/windowlab etc/windowlab/menurc
-PLIST_DIRS=	etc/windowlab
+.include <bsd.port.options.mk>
 
-PORTDOCS=	CHANGELOG README
+.if ${PORT_OPTIONS:MXFT}
+USE_XORG+=	xft
+USE_PKGCONFIG=	build
+MAKE_ENV+=	EXTRA_INC="$$(pkg-config --cflags xft)" \
+		EXTRA_LIBS="$$(pkg-config --libs xft)"
+CFLAGS+=	-DXFT
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \
-		-e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^\(PREFIX\) =|\1 ?=| ; \
+		 s|^\(XROOT\) =|\1 ?=| ; \
+		 s|^\(SYSCONFDIR\) =|\1 ?=| ; \
+		 s|^\(CC\) =|\1 ?=|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/windowlab ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/windowlab.1x ${MANPREFIX}/man/man1
-	${MKDIR} ${PREFIX}/etc/windowlab
-	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${PREFIX}/etc/windowlab/menurc
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} windowlab ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} windowlab.1x ${MANPREFIX}/man/man1)
+	@${MKDIR} ${ETCDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} windowlab.menurc ${ETCDIR}/menurc)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>

Modified: head/x11-wm/windowlab/distinfo
==============================================================================
--- head/x11-wm/windowlab/distinfo	Wed Apr  3 06:12:53 2013	(r315692)
+++ head/x11-wm/windowlab/distinfo	Wed Apr  3 06:21:41 2013	(r315693)
@@ -1,2 +1,2 @@
-SHA256 (windowlab-1.40.tar) = 1c9cca5d997cfdcec093e98b7f1996da2d806fbbe4472bdcca568863f3e75d93
-SIZE (windowlab-1.40.tar) = 174080
+SHA256 (repacked/windowlab-1.40.tar) = 8d6831a4b848badf82d1f34af6e45dc814d30ee75173b52f1717254d3097a4bb
+SIZE (repacked/windowlab-1.40.tar) = 174080