From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 18 01:29:18 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9AB17C9C;
 Fri, 18 Jan 2013 01:29:18 +0000 (UTC) (envelope-from jgh@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 699F71F6;
 Fri, 18 Jan 2013 01:29:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0I1TIhR085265;
 Fri, 18 Jan 2013 01:29:18 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0I1TIEb085264;
 Fri, 18 Jan 2013 01:29:18 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201301180129.r0I1TIEb085264@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 18 Jan 2013 01:29:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310580 - head/x11-wm/mcwm
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: Fri, 18 Jan 2013 01:29:18 -0000

Author: jgh
Date: Fri Jan 18 01:29:17 2013
New Revision: 310580
URL: http://svnweb.freebsd.org/changeset/ports/310580

Log:
  - makefile cleanup and trim historical header
  - fix LIB_DEPENDS
  - while here trim COMMENT and use INSTALL_DATA
  
  PR:		175367
  Submitted by:	maintainer, jakub_lach@mailplus.pl

Modified:
  head/x11-wm/mcwm/Makefile

Modified: head/x11-wm/mcwm/Makefile
==============================================================================
--- head/x11-wm/mcwm/Makefile	Fri Jan 18 00:59:37 2013	(r310579)
+++ head/x11-wm/mcwm/Makefile	Fri Jan 18 01:29:17 2013	(r310580)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   mcwm
-# Date created:        16 March 2011
-# Whom:                Jakub Lach <jakub_lach@mailplus.pl>
-#
+# Created by: Jakub Lach <jakub_lach@mailplus.pl>
 # $FreeBSD$
-#
 
 PORTNAME=	mcwm
 PORTVERSION=	20111124
@@ -12,14 +8,14 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://hack.org/mc/hacks/mcwm/
 
 MAINTAINER=	jakub_lach@mailplus.pl
-COMMENT=	A small window manager inspired by CTWM, evilwm, and tinywm
+COMMENT=	Small window manager inspired by CTWM, evilwm, and tinywm
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	xcb-util:${PORTSDIR}/x11/xcb-util \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
-		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
+		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm
 
 MAKE_JOBS_SAFE=	yes
 
@@ -28,7 +24,7 @@ USE_BZIP2=	yes
 
 MAN1=		mcwm.1
 PLIST_FILES=	bin/mcwm
-PORTDOCS=	LICENSE README NEWS
+PORTDOCS=	README NEWS
 
 pre-everything::
 		@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"
@@ -45,17 +41,18 @@ post-patch:
 	    ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \
 		${MAN1PREFIX}/man/man1/${PORTNAME}.1
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}