Attachment 142114 Details for Bug 189090 – hiawatha.patch

[patch] hiawatha.patch

hiawatha.patch (text/x-patch), 5.41 KB, created by Mark Felder on 2014-05-16 13:55:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2014-05-16 13:55:24 UTC

Size: 5.41 KB

patch

obsolete

>Index: hiawatha/Makefile
>===================================================================
>--- hiawatha/Makefile	(revision 354213)
>+++ hiawatha/Makefile	(working copy)
>@@ -2,12 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	hiawatha
>-PORTVERSION=	9.3.1
>+PORTVERSION=	9.5
> CATEGORIES=	www
> MASTER_SITES=	http://www.hiawatha-webserver.org/files/ \
>-		http://www.c-s.li/ports/
>+		SF/fbsdports/hiawatha/
> 
>-MAINTAINER=	c.petrik.sosa@gmail.com
>+MAINTAINER=	chris@bsdjunk.com
> COMMENT=	Advanced and secure webserver for Unix
> 
> LICENSE=	GPLv2
>@@ -14,13 +14,12 @@
> 
> PORTDOCS=	ChangeLog README.md
> CONFIG_FILES=	hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf \
>-		index.xslt
>+		error.xslt index.xslt
> 
> SUB_FILES=	pkg-message
>-USES=		cmake
>+USES=		cmake compiler:c11
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	hiawatha
>-WANT_GNOME=	yes
> 
> CMAKE_ARGS+=	-DCMAKE_INSTALL_BINDIR=${PREFIX}/bin \
> 		-DCMAKE_INSTALL_SBINDIR=${PREFIX}/sbin \
>@@ -87,6 +86,6 @@
> .endfor
> 
> 	@${MKDIR} ${STAGEDIR}${WWWDIR} ; \
>-	${CP} ${WRKSRC}/extra/index.html ${STAGEDIR}${WWWDIR}/index.hiawatha.html
>+	${INSTALL_DATA} ${WRKSRC}/extra/index.html ${STAGEDIR}${WWWDIR}/index.html.sample
> 
> .include <bsd.port.mk>
>Index: hiawatha/distinfo
>===================================================================
>--- hiawatha/distinfo	(revision 354213)
>+++ hiawatha/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (hiawatha-9.3.1.tar.gz) = 2fb5a7bf2004cb55511c3e165563e6b2119e863ec2cad773cbe79e75e3c0775a
>-SIZE (hiawatha-9.3.1.tar.gz) = 793782
>+SHA256 (hiawatha-9.5.tar.gz) = c181011db1af187006190fc186689a0707a6f1e7b524c2a4347840e8fdf68b4f
>+SIZE (hiawatha-9.5.tar.gz) = 847545
>Index: hiawatha/files/pkg-message.in
>===================================================================
>--- hiawatha/files/pkg-message.in	(revision 354213)
>+++ hiawatha/files/pkg-message.in	(working copy)
>@@ -2,13 +2,16 @@
> 
> The Hiawatha webserver is now installed.
> 
>-Edit the configuration files in %%ETCDIR%% to suit your needs.
>+Copy sample configs to .conf, edit the configuration files in %%ETCDIR%% 
>+to suit your needs.
> 
> Add hiawatha_enable="YES" to rc.conf and start Hiawatha by running:
>-%%PREFIX%%/etc/rc.d/hiawatha start
>+service hiawatha start
> 
> If you configured Hiawatha with Monitor, download and install the respective
> files needed to monitor your webserver:
> http://www.hiawatha-webserver.org/monitor
> 
>+A port to do this for you is in the making...
>+
> ===============================================================================
>Index: hiawatha/pkg-plist
>===================================================================
>--- hiawatha/pkg-plist	(revision 354213)
>+++ hiawatha/pkg-plist	(working copy)
>@@ -6,29 +6,21 @@
> man/man1/hiawatha.1.gz
> man/man1/ssi-cgi.1.gz
> man/man1/wigwam.1.gz
>-@unexec if cmp -s %D/etc/hiawatha/cgi-wrapper.conf.sample %D/etc/hiawatha/cgi-wrapper.conf ; then rm -f %D/etc/hiawatha/cgi-wrapper.conf; fi
>-%%ETCDIR%%/cgi-wrapper.conf.sample
>-@exec if [ ! -f %D/etc/hiawatha/cgi-wrapper.conf.sample ] ; then cp -p %D/%F %%ETCDIR%%/cgi-wrapper.conf; fi
>-@unexec if cmp -s %D/etc/hiawatha/hiawatha.conf.sample %D/etc/hiawatha/hiawatha.conf ; then rm -f %D/etc/hiawatha/hiawatha.conf; fi
>-%%ETCDIR%%/hiawatha.conf.sample
>-@exec if [ ! -f %D/etc/hiawatha/hiawatha.conf.sample ] ; then cp -p %D/%F %%ETCDIR%%/hiawatha.conf; fi
>-@unexec if cmp -s %D/etc/hiawatha/index.xslt.sample %D/etc/hiawatha/index.xslt ; then rm -f %D/etc/hiawatha/index.xslt; fi
>-%%ETCDIR%%/index.xslt.sample
>-@exec if [ ! -f %D/etc/hiawatha/index.xslt.sample ] ; then cp -p %D/%F %%ETCDIR%%/index.xslt; fi
>-@unexec if cmp -s %D/etc/hiawatha/mimetype.conf.sample %D/etc/hiawatha/mimetype.conf ; then rm -f %D/etc/hiawatha/mimetype.conf; fi
>-%%ETCDIR%%/mimetype.conf.sample
>-@exec if [ ! -f %D/etc/hiawatha/mimetype.conf.sample ] ; then cp -p %D/%F %%ETCDIR%%/mimetype.conf; fi
>-@unexec if cmp -s %D/etc/hiawatha/toolkit.conf.sample %D/etc/hiawatha/toolkit.conf ; then rm -f %D/etc/hiawatha/toolkit.conf; fi
>-%%ETCDIR%%/toolkit.conf.sample
>-@exec if [ ! -f %D/etc/hiawatha/toolkit.conf.sample ] ; then cp -p %D/%F %%ETCDIR%%/toolkit.conf; fi
>-@unexec t=`/bin/ls %D/etc/hiawatha`; if [ -z "$t" ]; then %%ECHO_MSG%% "===>    Configuration directory is empty, removing it."; rmdir %D/etc/hiawatha; fi;
>+@sample %%ETCDIR%%/cgi-wrapper.conf.sample
>+@sample %%ETCDIR%%/error.xslt.sample
>+@sample %%ETCDIR%%/hiawatha.conf.sample
>+@sample %%ETCDIR%%/index.xslt.sample
>+@sample %%ETCDIR%%/mimetype.conf.sample
>+@sample %%ETCDIR%%/toolkit.conf.sample
>+@sample %%WWWDIR%%/index.html.sample
> @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;
>-@unexec if cmp -s %D/www/hiawatha/index.html %D/www/hiawatha/index.hiawatha.html ; then rm -f %D/www/hiawatha/index.html; fi
>-%%WWWDIR%%/index.hiawatha.html
>-@exec if [ ! -f %D/www/hiawatha/index.html ] ; then cp -p %D/%F %%WWWDIR%%/index.html; fi
>-@unexec t=`/bin/ls %D/www/hiawatha`; if [ -z "$t" ]; then %%ECHO_MSG%% "===>    WWW directory is empty, removing it."; rmdir %D/www/hiawatha; fi;
> lib/hiawatha/libpolarssl.so
>-lib/hiawatha/libpolarssl.so.5
>-lib/hiawatha/libpolarssl.so.1.3.2
>+lib/hiawatha/libpolarssl.so.1.3.6
>+lib/hiawatha/libpolarssl.so.6
> @dirrm lib/hiawatha
>+@dirrm var/lib/hiawatha
>+@dirrm var/lib
>+@dirrm var
>+@dirrm %%WWWDIR%%
>+@dirrm %%ETCDIR%%

Actions: View | Diff

Attachments on bug 189090: 142113 | 142114