aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/hiawatha/Makefile50
-rw-r--r--www/hiawatha/distinfo6
-rw-r--r--www/hiawatha/files/pkg-message.in4
-rw-r--r--www/hiawatha/pkg-plist35
4 files changed, 58 insertions, 37 deletions
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 0efdfd204b8e..e90ba6479325 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -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
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>
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 1dde584f7d70..bf5052798e06 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -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
diff --git a/www/hiawatha/files/pkg-message.in b/www/hiawatha/files/pkg-message.in
index 11dd02e7e29e..4e43d2a2b2e3 100644
--- a/www/hiawatha/files/pkg-message.in
+++ b/www/hiawatha/files/pkg-message.in
@@ -2,9 +2,9 @@
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
+%%PREFIX%%/etc/rc.d/hiawatha start
===============================================================================
diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist
index c7d03ee6190a..739d89637602 100644
--- a/www/hiawatha/pkg-plist
+++ b/www/hiawatha/pkg-plist
@@ -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%%