svn commit: r397580 - in head/www/suphp: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Sep 22 19:55:07 UTC 2015
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%%
More information about the svn-ports-head
mailing list