From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 14 16:50:08 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 B59455ED;
 Fri, 14 Jun 2013 16:50:08 +0000 (UTC)
 (envelope-from bsam@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 8E2E61B28;
 Fri, 14 Jun 2013 16:50:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EGo8Hl093330;
 Fri, 14 Jun 2013 16:50:08 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EGo8d0093328;
 Fri, 14 Jun 2013 16:50:08 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201306141650.r5EGo8d0093328@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Fri, 14 Jun 2013 16:50:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320953 - head/sysutils/penv
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, 14 Jun 2013 16:50:08 -0000

Author: bsam
Date: Fri Jun 14 16:50:07 2013
New Revision: 320953
URL: http://svnweb.freebsd.org/changeset/ports/320953

Log:
  . add LICENSE=BSD;
  . bump PORTREVISION;
  . remove unneeded DISTNAME;
  . NOPORTDOCS -> PORT_OPTIONS:MDOCS;
  . trim Makefile headers;
  . pet portlint: use @dirrmtry instead of @unexec rmdir.

Modified:
  head/sysutils/penv/Makefile
  head/sysutils/penv/pkg-plist

Modified: head/sysutils/penv/Makefile
==============================================================================
--- head/sysutils/penv/Makefile	Fri Jun 14 16:37:09 2013	(r320952)
+++ head/sysutils/penv/Makefile	Fri Jun 14 16:50:07 2013	(r320953)
@@ -1,19 +1,17 @@
-# New ports collection makefile for:	penv
-# Date created:		5 August 2001
-# Whom:			roam@FreeBSD.org
-#
+# Created by: roam@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	penv
 PORTVERSION=	1.2p1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://devel.ringlet.net/sysutils/penv/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set the environment according to the current working directory
 
+LICENSE=	BSD
+
 RUN_DEPENDS=	envdir:${PORTSDIR}/sysutils/daemontools
 
 MAN1=		penv.1
@@ -32,16 +30,20 @@ PLIST_SUB+=	DBDIR=${DBDIR}
 
 DOCS=		html txt
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-install:
-		${MKDIR} ${PREFIX}/etc
-		${MKDIR} ${DBDIR}
+		@${MKDIR} ${PREFIX}/etc
+		@${MKDIR} ${DBDIR}
 		${INSTALL_DATA} ${WRKSRC}/penv.conf.default ${PREFIX}/etc
 		if [ ! -e ${PREFIX}/etc/penv.conf ]; then \
 			${INSTALL_DATA} ${WRKSRC}/penv.conf.default \
 				${PREFIX}/etc/penv.conf; \
 		fi
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+		@${MKDIR} ${DOCSDIR}
 		cd ${WRKSRC}/doc && ${TAR} -cpf - ${DOCS} | ${TAR} -xpf - -C ${DOCSDIR}
 .endif
 

Modified: head/sysutils/penv/pkg-plist
==============================================================================
--- head/sysutils/penv/pkg-plist	Fri Jun 14 16:37:09 2013	(r320952)
+++ head/sysutils/penv/pkg-plist	Fri Jun 14 16:50:07 2013	(r320953)
@@ -30,4 +30,4 @@ etc/penv.conf.default
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %%DBDIR%%
-@unexec rmdir %%DBDIR%% 2>/dev/null || true
+@dirrmtry %%DBDIR%% 2>/dev/null || true