Date: Tue, 29 Jan 2008 02:30:32 GMT From: Felippe de Meirelles Motta <lippemail@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/120107: [UPDATE] www/hiawatha Message-ID: <200801290230.m0T2UWL1053553@www.freebsd.org> Resent-Message-ID: <200801290240.m0T2e251094524@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120107
>Category: ports
>Synopsis: [UPDATE] www/hiawatha
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 29 02:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Felippe de Meirelles Motta
>Release: FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC
>Description:
- Updated to 6.3;
- Now using WWWDIR;
- New OPTIONS;
- pkg-plist fixed and sorted;
- Rename hiawatha.in to hiawatha.sh.in;
- Makefile cleanups and fixes
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/hiawatha/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 26 Oct 2007 20:21:15 -0000 1.9
+++ Makefile 29 Jan 2008 02:29:14 -0000
@@ -6,48 +6,64 @@
#
PORTNAME= hiawatha
-PORTVERSION= 6.0
+PORTVERSION= 6.3
CATEGORIES= www
MASTER_SITES= http://hiawatha.leisink.org/files/
MAINTAINER= hugo@leisink.net
COMMENT= An advanced and secure webserver for Unix
-MAN1= hiawatha.1 cgi-wrapper.1 php-fcgi.1 wigwam.1 newroot.1
+DOCS= AUTHORS COPYING ChangeLog INSTALL
+EXAMPLES= hiawatha mkcert newroot php-fcgi
+CONFIG_FILES= httpd.conf mimetype.conf cgi-wrapper.conf php-fcgi.conf
+MAN1= cgi-wrapper.1 hiawatha.1 newroot.1 php-fcgi.1 wigwam.1
MANCOMPRESSED= no
-USE_RC_SUBR= hiawatha
+USE_RC_SUBR= hiawatha.sh
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=/var webrootdir=${PREFIX}/www/hiawatha
+CONFIGURE_ARGS= --localstatedir=/var webrootdir=${WWWDIR}
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-OPTIONS= SSL "Support for Secure Sockets Layer (SSL)?" On
-OPTIONS+= CACHE "Internal file caching support?" On
-OPTIONS+= COMMAND "Enable the Hiawatha CommandChannel?" Off
-
-CONFIG_FILES= httpd.conf mimetype.conf cgi-wrapper.conf php-fcgi.conf
+OPTIONS= SSL "Support for Secure Sockets Layer (SSL)" On \
+ CACHE "Internal file caching support" On \
+ REWRITE "Enable URL rewriting" On \
+ COMMAND "Enable the Hiawatha CommandChannel" Off \
+ IPV6 "Enable IPv6 Support" Off
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--disable-ssl
+.if !defined(WITH_SSL)
+CONFIGURE_ARGS+= --disable-ssl
+.endif
+
+.if !defined(WITH_CACHE)
+CONFIGURE_ARGS+= --disable-cache
.endif
-.if defined(WITHOUT_CACHE)
-CONFIGURE_ARGS+=--disable-cache
+.if !defined(WITH_REWRITE)
+CONFIGURE_ARGS+= --disable-rewrite
.endif
.if defined(WITH_COMMAND)
-CONFIGURE_ARGS+=--enable-command
+CONFIGURE_ARGS+= --enable-command
+.endif
+
+.if !defined(WITH_IPV6)
+CONFIGURE_ARGS+= --disable-ipv6
.endif
post-install:
- @for file in ${CONFIG_FILES} ; do \
- ${CP} -f ${WRKSRC}/etc/hiawatha/$${file} ${PREFIX}/etc/hiawatha/$${file}.sample ; \
- done
- ${CP} -f ${WRKSRC}/doc/index.html ${PREFIX}/www/hiawatha/index.html.sample
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} ${ETCDIR}
+ @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+ @${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/extra/,} ${EXAMPLESDIR}/
+.endif
+ @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1
+ @${INSTALL_DATA} ${CONFIG_FILES:S,^,${WRKSRC}/etc/${PORTNAME}/,} ${ETCDIR}
+ @${MKDIR} ${WWWDIR}
+ @${CP} -f ${WRKSRC}/doc/index.html ${WWWDIR}
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/hiawatha/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 26 Oct 2007 20:21:15 -0000 1.8
+++ distinfo 29 Jan 2008 02:29:14 -0000
@@ -1,3 +1,3 @@
-MD5 (hiawatha-6.0.tar.gz) = db22a3c6737e8ad2047c1fd874b06650
-SHA256 (hiawatha-6.0.tar.gz) = e5387393f614a39f3eb6269474a1b2fac8d2414d892c3ca3932efb5a9f1097ff
-SIZE (hiawatha-6.0.tar.gz) = 229687
+MD5 (hiawatha-6.3.tar.gz) = 0547687b3618067864abc628407cf94e
+SHA256 (hiawatha-6.3.tar.gz) = c5e713fa01e3ee92dee917f4d54306d71ebb9bdee7991e0113cfe79abbf14fcd
+SIZE (hiawatha-6.3.tar.gz) = 231771
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/hiawatha/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist 9 Sep 2007 12:37:29 -0000 1.4
+++ pkg-plist 29 Jan 2008 02:29:14 -0000
@@ -1,17 +1,22 @@
-sbin/hiawatha
sbin/cgi-wrapper
-sbin/wigwam
-sbin/php-fcgi
+sbin/hiawatha
sbin/newroot
-@unexec if cmp -s %D/etc/hiawatha/httpd.conf %D/etc/hiawatha/httpd.conf.sample; then rm -f %D/etc/hiawatha/httpd.conf; fi
-@unexec if cmp -s %D/etc/hiawatha/mimetype.conf %D/etc/hiawatha/mimetype.conf.sample; then rm -f %D/etc/hiawatha/mimetype.conf; fi
-@unexec if cmp -s %D/etc/hiawatha/cgi-wrapper.conf %D/etc/hiawatha/cgi-wrapper.conf.sample; then rm -f %D/etc/hiawatha/cgi-wrapper.conf; fi
-@unexec if cmp -s %D/etc/hiawatha/php-fcgi.conf %D/etc/hiawatha/php-fcgi.conf.sample; then rm -f %D/etc/hiawatha/php-fcgi.conf; fi
-etc/hiawatha/httpd.conf.sample
-etc/hiawatha/mimetype.conf.sample
-etc/hiawatha/cgi-wrapper.conf.sample
-etc/hiawatha/php-fcgi.conf.sample
-@dirrm etc/hiawatha
-@unexec if cmp -s %D/www/hiawatha/index.html %D/www/hiawatha/index.html.sample; then rm -f %D/www/hiawatha/index.html; fi
-www/hiawatha/index.html.sample
-@dirrm www/hiawatha
+sbin/php-fcgi
+sbin/wigwam
+%%ETCDIR%%/cgi-wrapper.conf
+%%ETCDIR%%/httpd.conf
+%%ETCDIR%%/mimetype.conf
+%%ETCDIR%%/php-fcgi.conf
+%%WWWDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%EXAMPLESDIR%%/hiawatha
+%%PORTDOCS%%%%EXAMPLESDIR%%/mkcert
+%%PORTDOCS%%%%EXAMPLESDIR%%/newroot
+%%PORTDOCS%%%%EXAMPLESDIR%%/php-fcgi
+@dirrm %%ETCDIR%%
+@dirrm %%WWWDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: files/hiawatha.in
===================================================================
RCS file: files/hiawatha.in
diff -N files/hiawatha.in
--- files/hiawatha.in 3 Dec 2006 20:56:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/www/hiawatha/files/hiawatha.in,v 1.1 2006/12/03 20:56:24 itetcu Exp $
-#
-
-# PROVIDE: httpd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-
-# Add the following line(s) to /etc/rc.conf:
-# hiawatha_enable (bool): Set to "NO" by default, set it to "YES" to enable hiawatha
-
-. %%RC_SUBR%%
-
-name="hiawatha"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-: ${hiawatha_enable="NO"}
-run_rc_command "$1"
Index: files/hiawatha.sh.in
===================================================================
RCS file: files/hiawatha.sh.in
diff -N files/hiawatha.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/hiawatha.sh.in 29 Jan 2008 02:29:16 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: httpd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+
+# Add the following line(s) to /etc/rc.conf:
+# hiawatha_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable hiawatha.
+
+. %%RC_SUBR%%
+
+name="hiawatha"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+
+load_rc_config $name
+: ${hiawatha_enable="NO"}
+run_rc_command "$1"
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/www/hiawatha/files/pkg-message.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-message.in
--- files/pkg-message.in 3 Dec 2006 20:56:24 -0000 1.1
+++ files/pkg-message.in 29 Jan 2008 02:29:16 -0000
@@ -2,7 +2,7 @@
The Hiawatha webserver is now installed.
-Edit the configuration files in %%PREFIX%%/etc/hiawatha to suit your needs.
+Edit the configuration files in %%ETCDIRX%% to suit your needs.
Add hiawatha_enable="YES" to rc.conf and start Hiawatha by running:
%%PREFIX%%/etc/rc.d/hiawatha.sh start
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801290230.m0T2UWL1053553>