aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2015-09-23 03:55:06 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2015-09-23 03:55:06 +0800
commit209883645ec1912ca9da7b3afb5b002bf7a8e4f8 (patch)
treecb32d5567c3dce6a179e4fcca3360b3aaf5af88b /www
parent047e4fefb4a6c501f37bbd0ea12d5118755ded23 (diff)
downloadfreebsd-ports-gnome-209883645ec1912ca9da7b3afb5b002bf7a8e4f8.tar.gz
freebsd-ports-gnome-209883645ec1912ca9da7b3afb5b002bf7a8e4f8.tar.zst
freebsd-ports-gnome-209883645ec1912ca9da7b3afb5b002bf7a8e4f8.zip
- Switch to options helpers
- Unsilence install commands - Fix build from plain user by creating a directory with correct permissions Approved by: portmgr blanket
Diffstat (limited to 'www')
-rw-r--r--www/suphp/Makefile14
-rw-r--r--www/suphp/files/patch-src_apache2_Makefile.am9
-rw-r--r--www/suphp/pkg-plist2
3 files changed, 16 insertions, 9 deletions
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 22de3f7f5f2a..a8bb1eec930b 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -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>
diff --git a/www/suphp/files/patch-src_apache2_Makefile.am b/www/suphp/files/patch-src_apache2_Makefile.am
new file mode 100644
index 000000000000..ce43c3a05fad
--- /dev/null
+++ b/www/suphp/files/patch-src_apache2_Makefile.am
@@ -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
diff --git a/www/suphp/pkg-plist b/www/suphp/pkg-plist
index 3b066d45cfa5..ff713b64c4f6 100644
--- a/www/suphp/pkg-plist
+++ b/www/suphp/pkg-plist
@@ -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%%