Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jun 2015 17:11:20 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388737 - in head/www/mkapachepw: . files
Message-ID:  <201506071711.t57HBKoG083869@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506071711.t57HBKoG083869>