diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-01 20:43:25 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-01 20:43:25 +0000 |
| commit | f882080b7ecf59cbd3e395ac5cedc6e46d050bb4 (patch) | |
| tree | 5bdcfab46ebfd804b70e9ad1e13e0640ae8629b4 | |
| parent | - Add stage support. Thank you xmj@! (diff) | |
Use /var instead of PREFIX/var
PR: 186431
Approved by: maintainer timeout (3 weeks)
Notes
Notes:
svn path=/head/; revision=366954
| -rw-r--r-- | www/hiawatha/Makefile | 13 | ||||
| -rw-r--r-- | www/hiawatha/pkg-plist | 11 |
2 files changed, 8 insertions, 16 deletions
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 2cd927d6973e..9cbba42b2467 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -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 \ diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist index 644ebd687b45..c256e39c69a6 100644 --- a/www/hiawatha/pkg-plist +++ b/www/hiawatha/pkg-plist @@ -17,11 +17,10 @@ man/man1/ssi-cgi.1.gz man/man1/wigwam.1.gz @sample %%WWWDIR%%/index.html.sample @dirrmtry %%WWWDIR%% -@dirrmtry var/lib/hiawatha -@dirrmtry var/lib -@dirrmtry var @dirrmtry lib/hiawatha @dirrmtry %%ETCDIR%% -@unexec rmdir "/var/log/hiawatha" >/dev/null 2>&1 || : -@exec if [ ! -d /var/log/hiawatha ] ; then mkdir /var/log/hiawatha ; fi -@unexec t=`/bin/ls /var/log/hiawatha`; if [ -z "$t" ]; then %%ECHO_MSG%% "===> Log directory is empty, removing it."; rmdir /var/log/hiawatha; fi; +@cwd /var +@dirrmtry log/hiawatha +@dirrmtry lib/hiawatha +@dirrmtry lib +@cwd |