Attachment 145523 Details for Bug 186431 – proposed patch

[patch] proposed patch

hiawatha.patch (text/plain), 2.02 KB, created by Tijl Coosemans on 2014-08-08 14:24:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-08-08 14:24:05 UTC

Size: 2.02 KB

patch

obsolete

>Index: www/hiawatha/Makefile
>===================================================================
>--- www/hiawatha/Makefile	(revision 364346)
>+++ www/hiawatha/Makefile	(working copy)
>@@ -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,7 +63,7 @@ XSLT_USE=		GNOME=libxslt
> XSLT_CMAKE_ON=		-DENABLE_XSLT=on
> XSLT_CMAKE_OFF=		-DENABLE_XSLT=off
> 
>-PLIST_SUB+=	ECHO_MSG=${ECHO_MSG}
>+PLIST_SUB=	ECHO_MSG=${ECHO_MSG} RESET_PREFIX=${PREFIX}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
>Index: www/hiawatha/pkg-plist
>===================================================================
>--- www/hiawatha/pkg-plist	(revision 364346)
>+++ www/hiawatha/pkg-plist	(working copy)
>@@ -17,11 +17,12 @@ 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
>+@exec mkdir -p %D/log/hiawatha
>+@exec mkdir -p %D/lib/hiawatha
>+@dirrmtry log/hiawatha
>+@dirrmtry lib/hiawatha
>+@dirrmtry lib
>+@cwd %%RESET_PREFIX%%

Actions: View | Diff

Attachments on bug 186431: 145523