svn commit: r366954 - head/www/hiawatha
Tijl Coosemans
tijl at FreeBSD.org
Mon Sep 1 20:43:26 UTC 2014
Author: tijl
Date: Mon Sep 1 20:43:25 2014
New Revision: 366954
URL: http://svnweb.freebsd.org/changeset/ports/366954
QAT: https://qat.redports.org/buildarchive/r366954/
Log:
Use /var instead of PREFIX/var
PR: 186431
Approved by: maintainer timeout (3 weeks)
Modified:
head/www/hiawatha/Makefile
head/www/hiawatha/pkg-plist
Modified: head/www/hiawatha/Makefile
==============================================================================
--- head/www/hiawatha/Makefile Mon Sep 1 20:17:08 2014 (r366953)
+++ head/www/hiawatha/Makefile Mon Sep 1 20:43:25 2014 (r366954)
@@ -3,6 +3,7 @@
PORTNAME= hiawatha
PORTVERSION= 9.6
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/fbsdports/hiawatha/ \
http://www.hiawatha-webserver.org/files/:monitor
@@ -22,15 +23,9 @@ USES= cmake compiler:c11
USE_LDCONFIG= yes
USE_RC_SUBR= hiawatha
-CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=${PREFIX}/bin \
- -DCMAKE_INSTALL_SBINDIR=${PREFIX}/sbin \
- -DCMAKE_INSTALL_SYSCONFDIR=${ETCDIR} \
- -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib \
- -DCONFIG_DIR=${ETCDIR} \
- -DWEBROOT_DIR=${WWWDIR} \
+CMAKE_ARGS= -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
- -DLOG_DIR=/var/log/hiawatha \
- -DPID_DIR=/var/run
+ -DWEBROOT_DIR=${WWWDIR}
OPTIONS_DEFINE= CACHE DOCS IPV6 MONITOR RPROXY SSL TOMAHAWK TOOLKIT XSLT
@@ -68,8 +63,6 @@ XSLT_USE= GNOME=libxslt
XSLT_CMAKE_ON= -DENABLE_XSLT=on
XSLT_CMAKE_OFF= -DENABLE_XSLT=off
-PLIST_SUB+= ECHO_MSG=${ECHO_MSG}
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in \
Modified: head/www/hiawatha/pkg-plist
==============================================================================
--- head/www/hiawatha/pkg-plist Mon Sep 1 20:17:08 2014 (r366953)
+++ head/www/hiawatha/pkg-plist Mon Sep 1 20:43:25 2014 (r366954)
@@ -17,11 +17,10 @@ man/man1/ssi-cgi.1.gz
man/man1/wigwam.1.gz
@sample %%WWWDIR%%/index.html.sample
@dirrmtry %%WWWDIR%%
- at dirrmtry var/lib/hiawatha
- at dirrmtry var/lib
- at dirrmtry var
@dirrmtry lib/hiawatha
@dirrmtry %%ETCDIR%%
- at unexec rmdir "/var/log/hiawatha" >/dev/null 2>&1 || :
- at exec if [ ! -d /var/log/hiawatha ] ; then mkdir /var/log/hiawatha ; fi
- at unexec t=`/bin/ls /var/log/hiawatha`; if [ -z "$t" ]; then %%ECHO_MSG%% "===> Log directory is empty, removing it."; rmdir /var/log/hiawatha; fi;
+ at cwd /var
+ at dirrmtry log/hiawatha
+ at dirrmtry lib/hiawatha
+ at dirrmtry lib
+ at cwd
More information about the svn-ports-head
mailing list