Bug 109163

Summary:	[maintainer update] www/hiawatha
Product:	Ports & Packages	Reporter:	Hugo Leisink <hugo>
Component:	Individual Port(s)	Assignee:	Rong-En Fan <rafan>
Status:	Closed FIXED
Severity:	Affects Only Me
Priority:	Normal
Version:	Latest
Hardware:	Any
OS:	Any

Description Hugo Leisink 2007-02-14 11:50:05 UTC

Comment 1 Mark Linimon freebsd_committer

2007-02-14 14:16:15 UTC

Responsible Changed
From-To: freebsd-www->freebsd-ports-bugs

The www category is only for problems with the FreeBSD website.  Make this 
a ports PR.

Comment 2 Rong-En Fan freebsd_committer

2007-02-15 09:14:48 UTC

Responsible Changed
From-To: freebsd-ports-bugs->rafan

Eat.

Comment 3 Rong-En Fan freebsd_committer

2007-02-15 09:16:58 UTC

State Changed
From-To: open->feedback

Please submit patch genreated from 'diff -u'.

Comment 4 Hugo Leisink 2007-02-16 10:59:13 UTC

--- hiawatha-5.3.shar    Mon Feb 12 23:06:14 2007
+++ hiawatha-5.6.shar    Mon Feb 12 23:10:23 2007
@@ -6,34 +6,74 @@
 # This archive contains:
 #
 #    hiawatha
+#    hiawatha/files
+#    hiawatha/files/pkg-message.in
+#    hiawatha/files/hiawatha.in
 #    hiawatha/Makefile
 #    hiawatha/distinfo
 #    hiawatha/pkg-descr
 #    hiawatha/pkg-plist
-#    hiawatha/files
-#    hiawatha/files/hiawatha.in
-#    hiawatha/files/pkg-message.in
 #
 echo c - hiawatha
 mkdir -p hiawatha > /dev/null 2>&1
+echo c - hiawatha/files
+mkdir -p hiawatha/files > /dev/null 2>&1
+echo x - hiawatha/files/pkg-message.in
+sed 's/^X//' >hiawatha/files/pkg-message.in << 
'END-of-hiawatha/files/pkg-message.in'
+X===============================================================================
+X
+XThe Hiawatha webserver is now installed.
+X
+XEdit the configuration files in %%PREFIX%%/etc/hiawatha to suit your 
needs.
+X
+XAdd hiawatha_enable="YES" to rc.conf and start Hiawatha by running:
+X%%PREFIX%%/etc/rc.d/hiawatha.sh start
+X
+X===============================================================================
+END-of-hiawatha/files/pkg-message.in
+echo x - hiawatha/files/hiawatha.in
+sed 's/^X//' >hiawatha/files/hiawatha.in << 
'END-of-hiawatha/files/hiawatha.in'
+X#!/bin/sh
+X#
+X# $FreeBSD$
+X#
+X
+X# PROVIDE: httpd
+X# REQUIRE: NETWORKING SERVERS
+X# BEFORE: DAEMON
+X
+X# Add the following line(s) to /etc/rc.conf:
+X# hiawatha_enable (bool): Set to "NO" by default, set it to "YES" to 
enable hiawatha
+X
+X. %%RC_SUBR%%
+X
+Xname="hiawatha"
+Xrcvar=`set_rcvar`
+Xcommand="%%PREFIX%%/sbin/${name}"
+Xpidfile="/var/run/${name}.pid"
+X
+Xload_rc_config $name
+X: ${hiawatha_enable="NO"}
+Xrun_rc_command "$1"
+END-of-hiawatha/files/hiawatha.in
 echo x - hiawatha/Makefile
 sed 's/^X//' >hiawatha/Makefile << 'END-of-hiawatha/Makefile'
 X# New ports collection makefile for:   hiawatha
-X# Date created:        24 november 2006
+X# Date created:        17 december 2006
 X# Whom:                Hugo Leisink <hugo@leisink.net>
 X#
-X# $FreeBSD: ports/www/hiawatha/Makefile,v 1.2 2006/12/27 10:06:14 
itetcu Exp $
+X# $FreeBSD$
 X#
 X
 XPORTNAME=    hiawatha
-XPORTVERSION=    5.3
+XPORTVERSION=    5.6
 XCATEGORIES=    www
 XMASTER_SITES=    http://hiawatha.leisink.org/files/
 X
 XMAINTAINER=    hugo@leisink.net
 XCOMMENT=    An advanced and secure webserver for Unix
 X
-XMAN1=        hiawatha.1 cgi_wrapper.1
+XMAN1=        hiawatha.1 cgi-wrapper.1 php-fcgi.1 wigwam.1
 XMANCOMPRESSED=    no
 X
 XUSE_RC_SUBR=    hiawatha
@@ -42,10 +82,11 @@
 XGNU_CONFIGURE=    yes
 XCONFIGURE_ARGS=    --localstatedir=/var webrootdir=${PREFIX}/www/hiawatha
 X
-XOPTIONS=    SSL "Compile with SSL support?" On
-XOPTIONS+=    PHP "Include the CGI version of PHP?" On
+XOPTIONS=    SSL "Support for Secure Sockets Layer (SSL)?" On
+XOPTIONS+=    CACHE "Internal file caching support?" On
+XOPTIONS+=    COMMAND "Enable the Hiawatha CommandChannel?" Off
 X
-XCONFIG_FILES=    httpd.conf mimetype.conf throttle.conf cgi_wrapper.conf
+XCONFIG_FILES=    httpd.conf mimetype.conf throttle.conf 
cgi-wrapper.conf php-fcgi.conf
 X
 X.include <bsd.port.pre.mk>
 X
@@ -53,15 +94,17 @@
 XCONFIGURE_ARGS+=--disable-ssl
 X.endif
 X
-X.if !defined(WITHOUT_PHP)
-XWANT_PHP_CGI=    yes
+X.if defined(WITHOUT_CACHE)
+XCONFIGURE_ARGS+=--disable-cache
+X.endif
+X
+X.if !defined(WITHOUT_COMMAND)
+XCONFIGURE_ARGS+=--enable-command
 X.endif
 X
 Xpost-install:
-X    ${CP} -f ${WRKSRC}/extra/fcgi-server ${PREFIX}/sbin
-X    ${CP} -f ${WRKSRC}/extra/newroot ${PREFIX}/sbin
-X    @for _file in ${CONFIG_FILES} ; do \
-X        ${CP} -f ${WRKSRC}/etc/hiawatha/$${_file} 
${PREFIX}/etc/hiawatha/$${_file}.sample ; \
+X    @for file in ${CONFIG_FILES} ; do \
+X        ${CP} -f ${WRKSRC}/etc/hiawatha/$${file} 
${PREFIX}/etc/hiawatha/$${file}.sample ; \
 X    done
 X    ${CP} -f ${WRKSRC}/doc/index.html 
${PREFIX}/www/hiawatha/index.html.sample
 X    @${CAT} ${PKGMESSAGE}
@@ -70,9 +113,9 @@
 END-of-hiawatha/Makefile
 echo x - hiawatha/distinfo
 sed 's/^X//' >hiawatha/distinfo << 'END-of-hiawatha/distinfo'
-XMD5 (hiawatha-5.3.tar.gz) = 16a3d7e720fb4b1a7dd66f77c60b7dc5
-XSHA256 (hiawatha-5.3.tar.gz) = 
168dc7fec581a905600a4a1d50dd35e3e635a8601e5b6a023a326ce15654ae37
-XSIZE (hiawatha-5.3.tar.gz) = 184446
+XMD5 (hiawatha-5.6.tar.gz) = 3c471a19793e838b58201d711f19d0c3
+XSHA256 (hiawatha-5.6.tar.gz) = 
27f570eb41409606cdf16b77e73293587e2337a7c4f2981eae0a019dc461991a
+XSIZE (hiawatha-5.6.tar.gz) = 194423
 END-of-hiawatha/distinfo
 echo x - hiawatha/pkg-descr
 sed 's/^X//' >hiawatha/pkg-descr << 'END-of-hiawatha/pkg-descr'
@@ -85,62 +128,24 @@
 echo x - hiawatha/pkg-plist
 sed 's/^X//' >hiawatha/pkg-plist << 'END-of-hiawatha/pkg-plist'
 Xsbin/hiawatha
-Xsbin/cgi_wrapper
+Xsbin/cgi-wrapper
 Xsbin/wigwam
-Xsbin/fcgi-server
+Xsbin/php-fcgi
 Xsbin/newroot
 X@unexec if cmp -s %D/etc/hiawatha/httpd.conf 
%D/etc/hiawatha/httpd.conf.sample; then rm -f %D/etc/hiawatha/httpd.conf; fi
 X@unexec if cmp -s %D/etc/hiawatha/mimetype.conf 
%D/etc/hiawatha/mimetype.conf.sample; then rm -f 
%D/etc/hiawatha/mimetype.conf; fi
 X@unexec if cmp -s %D/etc/hiawatha/throttle.conf 
%D/etc/hiawatha/throttle.conf.sample; then rm -f 
%D/etc/hiawatha/throttle.conf; fi
-X@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
+X@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
+X@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
 Xetc/hiawatha/httpd.conf.sample
 Xetc/hiawatha/mimetype.conf.sample
 Xetc/hiawatha/throttle.conf.sample
-Xetc/hiawatha/cgi_wrapper.conf.sample
+Xetc/hiawatha/cgi-wrapper.conf.sample
+Xetc/hiawatha/php-fcgi.conf.sample
 X@dirrm etc/hiawatha
 X@unexec if cmp -s %D/www/hiawatha/index.html 
%D/www/hiawatha/index.html.sample; then rm -f %D/www/hiawatha/index.html; fi
 Xwww/hiawatha/index.html.sample
 X@dirrm www/hiawatha
 END-of-hiawatha/pkg-plist
-echo c - hiawatha/files
-mkdir -p hiawatha/files > /dev/null 2>&1
-echo x - hiawatha/files/hiawatha.in
-sed 's/^X//' >hiawatha/files/hiawatha.in << 
'END-of-hiawatha/files/hiawatha.in'
-X#!/bin/sh
-X#
-X# $FreeBSD: ports/www/hiawatha/files/hiawatha.in,v 1.1 2006/12/03 
20:56:24 itetcu Exp $
-X#
-X
-X# PROVIDE: httpd
-X# REQUIRE: NETWORKING SERVERS
-X# BEFORE: DAEMON
-X
-X# Add the following line(s) to /etc/rc.conf:
-X# hiawatha_enable (bool): Set to "NO" by default, set it to "YES" to 
enable hiawatha
-X
-X. %%RC_SUBR%%
-X
-Xname="hiawatha"
-Xrcvar=`set_rcvar`
-Xcommand="%%PREFIX%%/sbin/${name}"
-Xpidfile="/var/run/${name}.pid"
-X
-Xload_rc_config $name
-X: ${hiawatha_enable="NO"}
-Xrun_rc_command "$1"
-END-of-hiawatha/files/hiawatha.in
-echo x - hiawatha/files/pkg-message.in
-sed 's/^X//' >hiawatha/files/pkg-message.in << 
'END-of-hiawatha/files/pkg-message.in'
-X===============================================================================
-X
-XThe Hiawatha webserver is now installed.
-X
-XEdit the configuration files in %%PREFIX%%/etc/hiawatha to suit your 
needs.
-X
-XAdd hiawatha_enable="YES" to rc.conf and start Hiawatha by running:
-X%%PREFIX%%/etc/rc.d/hiawatha.sh start
-X
-X===============================================================================
-END-of-hiawatha/files/pkg-message.in
 exit

Comment 5 Hugo Leisink 2007-02-16 12:24:29 UTC

diff -u hiawatha-5.3/Makefile hiawatha/Makefile
--- hiawatha-5.3/Makefile    Wed Dec 27 11:06:14 2006
+++ hiawatha/Makefile    Mon Feb 12 23:10:03 2007
@@ -1,19 +1,19 @@
 # New ports collection makefile for:   hiawatha
-# Date created:        24 november 2006
+# Date created:        17 december 2006
 # Whom:                Hugo Leisink <hugo@leisink.net>
 #
-# $FreeBSD: ports/www/hiawatha/Makefile,v 1.2 2006/12/27 10:06:14 
itetcu Exp $
+# $FreeBSD$
 #
 
 PORTNAME=    hiawatha
-PORTVERSION=    5.3
+PORTVERSION=    5.6
 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
+MAN1=        hiawatha.1 cgi-wrapper.1 php-fcgi.1 wigwam.1
 MANCOMPRESSED=    no
 
 USE_RC_SUBR=    hiawatha
@@ -22,10 +22,11 @@
 GNU_CONFIGURE=    yes
 CONFIGURE_ARGS=    --localstatedir=/var webrootdir=${PREFIX}/www/hiawatha
 
-OPTIONS=    SSL "Compile with SSL support?" On
-OPTIONS+=    PHP "Include the CGI version of PHP?" On
+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 throttle.conf cgi_wrapper.conf
+CONFIG_FILES=    httpd.conf mimetype.conf throttle.conf 
cgi-wrapper.conf php-fcgi.conf
 
 .include <bsd.port.pre.mk>
 
@@ -33,15 +34,17 @@
 CONFIGURE_ARGS+=--disable-ssl
 .endif
 
-.if !defined(WITHOUT_PHP)
-WANT_PHP_CGI=    yes
+.if defined(WITHOUT_CACHE)
+CONFIGURE_ARGS+=--disable-cache
+.endif
+
+.if !defined(WITHOUT_COMMAND)
+CONFIGURE_ARGS+=--enable-command
 .endif
 
 post-install:
-    ${CP} -f ${WRKSRC}/extra/fcgi-server ${PREFIX}/sbin
-    ${CP} -f ${WRKSRC}/extra/newroot ${PREFIX}/sbin
-    @for _file in ${CONFIG_FILES} ; do \
-        ${CP} -f ${WRKSRC}/etc/hiawatha/$${_file} 
${PREFIX}/etc/hiawatha/$${_file}.sample ; \
+    @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
     @${CAT} ${PKGMESSAGE}
diff -u hiawatha-5.3/distinfo hiawatha/distinfo
--- hiawatha-5.3/distinfo    Wed Dec 27 11:06:14 2006
+++ hiawatha/distinfo    Mon Feb 12 23:07:13 2007
@@ -1,3 +1,3 @@
-MD5 (hiawatha-5.3.tar.gz) = 16a3d7e720fb4b1a7dd66f77c60b7dc5
-SHA256 (hiawatha-5.3.tar.gz) = 
168dc7fec581a905600a4a1d50dd35e3e635a8601e5b6a023a326ce15654ae37
-SIZE (hiawatha-5.3.tar.gz) = 184446
+MD5 (hiawatha-5.6.tar.gz) = 3c471a19793e838b58201d711f19d0c3
+SHA256 (hiawatha-5.6.tar.gz) = 
27f570eb41409606cdf16b77e73293587e2337a7c4f2981eae0a019dc461991a
+SIZE (hiawatha-5.6.tar.gz) = 194423
Common subdirectories: hiawatha-5.3/files and hiawatha/files
diff -u hiawatha-5.3/pkg-plist hiawatha/pkg-plist
--- hiawatha-5.3/pkg-plist    Wed Dec 27 11:06:14 2006
+++ hiawatha/pkg-plist    Mon Feb 12 23:10:03 2007
@@ -1,16 +1,18 @@
 sbin/hiawatha
-sbin/cgi_wrapper
+sbin/cgi-wrapper
 sbin/wigwam
-sbin/fcgi-server
+sbin/php-fcgi
 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/throttle.conf 
%D/etc/hiawatha/throttle.conf.sample; then rm -f 
%D/etc/hiawatha/throttle.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/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/throttle.conf.sample
-etc/hiawatha/cgi_wrapper.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
Only in hiawatha: work

Comment 6 Rong-En Fan freebsd_committer

2007-02-16 17:36:55 UTC

State Changed
From-To: feedback->open

Patch received.

Comment 7 dfilter service freebsd_committer

2007-02-17 04:43:28 UTC

rafan       2007-02-17 04:43:22 UTC

  FreeBSD ports repository

  Modified files:
    www/hiawatha         Makefile distinfo pkg-plist 
  Log:
  - Update to 5.6
  
  PR:             ports/109163
  Submitted by:   Hugo Leisink <hugo at leisink.org> (maintainer)
  
  Revision  Changes    Path
  1.3       +14 -11    ports/www/hiawatha/Makefile
  1.3       +3 -3      ports/www/hiawatha/distinfo
  1.3       +6 -4      ports/www/hiawatha/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 8 Rong-En Fan freebsd_committer

2007-02-17 04:43:30 UTC

State Changed
From-To: open->closed

Committed. Thanks!