From owner-svn-ports-all@freebsd.org  Tue Sep 22 19:55:07 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB51BA06E45;
 Tue, 22 Sep 2015 19:55:07 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 9231C1FAC;
 Tue, 22 Sep 2015 19:55:07 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8MJt7EL011751;
 Tue, 22 Sep 2015 19:55:07 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8MJt6cc011748;
 Tue, 22 Sep 2015 19:55:06 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509221955.t8MJt6cc011748@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 22 Sep 2015 19:55:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397580 - in head/www/suphp: . 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2015 19:55:07 -0000

Author: amdmi3
Date: Tue Sep 22 19:55:06 2015
New Revision: 397580
URL: https://svnweb.freebsd.org/changeset/ports/397580

Log:
  - Switch to options helpers
  - Unsilence install commands
  - Fix build from plain user by creating a directory with correct permissions
  
  Approved by:	portmgr blanket

Added:
  head/www/suphp/files/patch-src_apache2_Makefile.am   (contents, props changed)
Modified:
  head/www/suphp/Makefile
  head/www/suphp/pkg-plist

Modified: head/www/suphp/Makefile
==============================================================================
--- head/www/suphp/Makefile	Tue Sep 22 19:53:17 2015	(r397579)
+++ head/www/suphp/Makefile	Tue Sep 22 19:55:06 2015	(r397580)
@@ -45,16 +45,16 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apache
-.for f in ${MYPORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
-.endfor
-.endif
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
+	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
 	    ${STAGEDIR}${PREFIX}/etc/suphp.conf-example
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apache
+.for f in ${MYPORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
+.endfor
+
 .include <bsd.port.mk>

Added: head/www/suphp/files/patch-src_apache2_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/suphp/files/patch-src_apache2_Makefile.am	Tue Sep 22 19:55:06 2015	(r397580)
@@ -0,0 +1,9 @@
+--- src/apache2/Makefile.am.orig	2006-10-18 20:42:07 UTC
++++ src/apache2/Makefile.am
+@@ -13,5 +13,5 @@ mod_suphp_la_SOURCES = mod_suphp.c
+ mod_suphp_la_LDFLAGS = -module -rpath '@APXS_LIBEXECDIR@'
+ 
+ install-data-local:
+-	${INSTALL_SCRIPT} -d ${DESTDIR}'@APXS_LIBEXECDIR@'
++	mkdir ${DESTDIR}'@APXS_LIBEXECDIR@'
+ 	${INSTALL_SCRIPT} -m 0755 .libs/mod_suphp.so ${DESTDIR}'@APXS_LIBEXECDIR@'/mod_suphp.so

Modified: head/www/suphp/pkg-plist
==============================================================================
--- head/www/suphp/pkg-plist	Tue Sep 22 19:53:17 2015	(r397579)
+++ head/www/suphp/pkg-plist	Tue Sep 22 19:55:06 2015	(r397580)
@@ -10,5 +10,3 @@ etc/suphp.conf-example
 %%PORTDOCS%%%%DOCSDIR%%/apache/CONFIG
 %%PORTDOCS%%%%DOCSDIR%%/apache/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/apache/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apache
-%%PORTDOCS%%@dirrm %%DOCSDIR%%