From owner-svn-ports-head@FreeBSD.ORG  Sun Jun  7 17:11:21 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9062C969;
 Sun,  7 Jun 2015 17:11:21 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
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 647061D0E;
 Sun,  7 Jun 2015 17:11:21 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57HBLnh083876;
 Sun, 7 Jun 2015 17:11:21 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t57HBKoG083869;
 Sun, 7 Jun 2015 17:11:20 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201506071711.t57HBKoG083869@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 7 Jun 2015 17:11:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388737 - in head/www/mkapachepw: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2015 17:11:21 -0000

Author: amdmi3
Date: Sun Jun  7 17:11:20 2015
New Revision: 388737
URL: https://svnweb.freebsd.org/changeset/ports/388737

Log:
  - Add NO_ARCH
  - Simplify docs installation
  - Fix script installation, allowing package creating as plain user
  - Drop @dirrm* from plist
  
  Approved by:	portmgr blanket

Modified:
  head/www/mkapachepw/Makefile
  head/www/mkapachepw/files/patch-Makefile
  head/www/mkapachepw/pkg-plist

Modified: head/www/mkapachepw/Makefile
==============================================================================
--- head/www/mkapachepw/Makefile	Sun Jun  7 17:07:10 2015	(r388736)
+++ head/www/mkapachepw/Makefile	Sun Jun  7 17:11:20 2015	(r388737)
@@ -10,16 +10,14 @@ MAINTAINER=	mkapachepw@tundraware.com
 COMMENT=	Group & Password Management Tool For Apache
 
 USES=		python
-OPTIONS_DEFINE=	DOCS
+NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in WHATSNEW.txt mkapachepw-license.txt mkapachepw.html mkapachepw.pdf mkapachepw.ps mkapachepw.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/www/mkapachepw/files/patch-Makefile
==============================================================================
--- head/www/mkapachepw/files/patch-Makefile	Sun Jun  7 17:07:10 2015	(r388736)
+++ head/www/mkapachepw/files/patch-Makefile	Sun Jun  7 17:11:20 2015	(r388737)
@@ -6,5 +6,5 @@
  install:
 -	install -c -o root -g wheel  -m 500  mkapachepw.py   ${PREFIX}/bin
 -	${BSD_INSTALL_MAN}    mkapachepw.1.gz ${PREFIX}/man/man1
-+	install -c -o root -g wheel  -m 500  mkapachepw.py   $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_SCRIPT} mkapachepw.py   $(DESTDIR)${PREFIX}/bin
 +	${BSD_INSTALL_MAN}    mkapachepw.1.gz $(DESTDIR)${PREFIX}/man/man1

Modified: head/www/mkapachepw/pkg-plist
==============================================================================
--- head/www/mkapachepw/pkg-plist	Sun Jun  7 17:07:10 2015	(r388736)
+++ head/www/mkapachepw/pkg-plist	Sun Jun  7 17:11:20 2015	(r388737)
@@ -6,4 +6,3 @@ man/man1/mkapachepw.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.ps
 %%PORTDOCS%%%%DOCSDIR%%/mkapachepw.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%