From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 21 05:32:18 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 701ACE6B;
 Fri, 21 Dec 2012 05:32:18 +0000 (UTC)
 (envelope-from danfe@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 3BD888FC14;
 Fri, 21 Dec 2012 05:32:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBL5WIY6098034;
 Fri, 21 Dec 2012 05:32:18 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBL5WI6v098033;
 Fri, 21 Dec 2012 05:32:18 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201212210532.qBL5WI6v098033@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 21 Dec 2012 05:32:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309340 - head/archivers/cabextract
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, 21 Dec 2012 05:32:18 -0000

Author: danfe
Date: Fri Dec 21 05:32:17 2012
New Revision: 309340
URL: http://svnweb.freebsd.org/changeset/ports/309340

Log:
  - Trim Makefile header per new bylaws
  - Drop indefinite article from COMMENT
  - Define LICENSE (and remove COPYING from portdocs)
  - Unmute installation commands
  - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS
  
  Approved by:	maintainer (gabor)

Modified:
  head/archivers/cabextract/Makefile

Modified: head/archivers/cabextract/Makefile
==============================================================================
--- head/archivers/cabextract/Makefile	Fri Dec 21 05:22:17 2012	(r309339)
+++ head/archivers/cabextract/Makefile	Fri Dec 21 05:32:17 2012	(r309340)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cabextract
-# Date Created:				30 November 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cabextract
 PORTVERSION=	1.4
@@ -11,7 +7,9 @@ CATEGORIES=	archivers
 MASTER_SITES=	http://www.cabextract.org.uk/
 
 MAINTAINER=	gabor@FreeBSD.org
-COMMENT=	A program to extract Microsoft cabinet (.CAB) files
+COMMENT=	Program to extract Microsoft cabinet (.CAB) files
+
+LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
 
@@ -19,24 +17,28 @@ MANLANG=	"" ja
 MAN1=		cabextract.1
 
 PLIST_FILES=	bin/cabextract
-DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+DOCS=		AUTHORS ChangeLog NEWS README TODO
 DOC_DOCS=	magic wince_cab_format.html
 SRC_DOCS=	wince_info wince_rename
 PORTDOCS=	${DOCS} ${DOC_DOCS} ${SRC_DOCS}
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/cabextract.1 ${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/ja/cabextract.1 ${MAN1PREFIX}/man/ja/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in ${DOC_DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .for i in ${SRC_DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/${i} ${DOCSDIR}
 .endfor
 .endif