From owner-svn-ports-all@FreeBSD.ORG Tue Apr 22 06:38:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D201FA64; Tue, 22 Apr 2014 06:38:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A48EC19AF; Tue, 22 Apr 2014 06:38:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M6c7CV067454; Tue, 22 Apr 2014 06:38:07 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M6c7OQ067451; Tue, 22 Apr 2014 06:38:07 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404220638.s3M6c7OQ067451@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 22 Apr 2014 06:38:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351754 - head/x11-wm/pwm 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 06:38:07 -0000 Author: bapt Date: Tue Apr 22 06:38:06 2014 New Revision: 351754 URL: http://svnweb.freebsd.org/changeset/ports/351754 QAT: https://qat.redports.org/buildarchive/r351754/ Log: Support stage Use @sample Modified: head/x11-wm/pwm/Makefile head/x11-wm/pwm/pkg-plist Modified: head/x11-wm/pwm/Makefile ============================================================================== --- head/x11-wm/pwm/Makefile Tue Apr 22 06:36:07 2014 (r351753) +++ head/x11-wm/pwm/Makefile Tue Apr 22 06:38:06 2014 (r351754) @@ -3,22 +3,19 @@ PORTNAME= pwm PORTVERSION= 2007.07.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ \ http://schot.a-eskwadraat.nl/files/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} MAINTAINER= schot@a-eskwadraat.nl -COMMENT= A lightweight window manager with emphasis on usability +COMMENT= lightweight window manager with emphasis on usability USE_XORG= x11 USES= gmake MAKE_ENV= X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1 -MAN1= pwm.1x - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^PREFIX=|PREFIX?=|g ; \ @@ -29,17 +26,12 @@ post-patch: s|-pedantic-errors||g' ${WRKSRC}/system.mk do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pwm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pwm.1x ${MANPREFIX}/man/man1 - @${MKDIR} ${PREFIX}/etc/pwm - ${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${PREFIX}/etc/pwm -.if !exists(${PREFIX}/etc/pwm/pwm.conf) - ${CP} ${PREFIX}/etc/pwm/sample.conf ${PREFIX}/etc/pwm/pwm.conf -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/config.txt ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/pwm ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/pwm.1x ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/pwm ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${STAGEDIR}${PREFIX}/etc/pwm + ${MV} ${STAGEDIR}${PREFIX}/etc/pwm/sample.conf ${STAGEDIR}${PREFIX}/etc/pwm/pwm.conf.sample + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/config.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/x11-wm/pwm/pkg-plist ============================================================================== --- head/x11-wm/pwm/pkg-plist Tue Apr 22 06:36:07 2014 (r351753) +++ head/x11-wm/pwm/pkg-plist Tue Apr 22 06:38:06 2014 (r351754) @@ -4,9 +4,8 @@ etc/pwm/keys-default.conf etc/pwm/look-beoslike.conf etc/pwm/look-brownsteel.conf etc/pwm/menus-default.conf -@unexec if cmp -s %B/sample.conf %B/pwm.conf; then rm -f %B/pwm.conf; fi -etc/pwm/sample.conf -@exec if [ ! -e %B/pwm.conf ]; then cp %B/sample.conf %B/pwm.conf; fi +@sample etc/pwm/pwm.conf.sample +man/man1/pwm.1x.gz %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/config.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%