Update to 9.5 remove uneeded Makefile args update pkg-plist add in patch to fix build on < 10.0 Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-bugs->freebsd-ports-bugs ports PR.
Maintainer of www/hiawatha, Please note that PR ports/189090 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189090 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
State Changed From-To: feedback->open Submitter is maintainer from another address.
In case I miss you on IRC, here's a modified patch that cleanly passes poudriere tests. I changed the following: - your custom .sample installation has been changed to use @sample - error.xslt wasnt getting a .sample - instead of index.html.hiawatha it's just index.html.sample now for simplicity (so we can just piggyback on @sample again) - few missing @dirrm entries Let me know if you have any objections. Thanks!
Responsible Changed From-To: freebsd-ports-bugs->feld I'll take it.
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: feld Date: Wed May 21 11:49:17 2014 New Revision: 354744 URL: http://svnweb.freebsd.org/changeset/ports/354744 QAT: https://qat.redports.org/buildarchive/r354744/ Log: - Update to 9.5 - Change sample file installationt use @sample - rc script now passes rclint PR: ports/189090 Sponsored by: SupraNet Communications, Inc Modified: head/www/hiawatha/Makefile head/www/hiawatha/distinfo head/www/hiawatha/files/hiawatha.in head/www/hiawatha/files/pkg-message.in head/www/hiawatha/pkg-plist Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Wed May 21 11:46:16 2014 (r354743) +++ head/www/hiawatha/Makefile Wed May 21 11:49:17 2014 (r354744) @@ -2,25 +2,24 @@ # $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 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 @@ post-install: .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> Modified: head/www/hiawatha/distinfo ============================================================================== --- head/www/hiawatha/distinfo Wed May 21 11:46:16 2014 (r354743) +++ head/www/hiawatha/distinfo Wed May 21 11:49:17 2014 (r354744) @@ -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 Modified: head/www/hiawatha/files/hiawatha.in ============================================================================== --- head/www/hiawatha/files/hiawatha.in Wed May 21 11:46:16 2014 (r354743) +++ head/www/hiawatha/files/hiawatha.in Wed May 21 11:49:17 2014 (r354744) @@ -13,21 +13,16 @@ . /etc/rc.subr -name="hiawatha" +name=hiawatha rcvar=hiawatha_enable load_rc_config $name -: ${hiawatha_enable="NO"} +: ${hiawatha_enable:=NO} command="%%PREFIX%%/sbin/${name}" pidfile=${hiawatha_pidfile:-"/var/run/hiawatha.pid"} -stop_postcmd="${name}_stop_postcmd" - -hiawatha_stop_postcmd() -{ - rm -f ${pidfile} -} +stop_postcmd="rm -f ${pidfile}" run_rc_command "$1" Modified: head/www/hiawatha/files/pkg-message.in ============================================================================== --- head/www/hiawatha/files/pkg-message.in Wed May 21 11:46:16 2014 (r354743) +++ head/www/hiawatha/files/pkg-message.in Wed May 21 11:49:17 2014 (r354744) @@ -2,13 +2,16 @@ The Hiawatha webserver is now installed. -Edit the configuration files in %%ETCDIR%% to suit your needs. +Sample configs were copied 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... + =============================================================================== Modified: head/www/hiawatha/pkg-plist ============================================================================== --- head/www/hiawatha/pkg-plist Wed May 21 11:46:16 2014 (r354743) +++ head/www/hiawatha/pkg-plist Wed May 21 11:49:17 2014 (r354744) @@ -1,34 +1,26 @@ bin/ssi-cgi +@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 sbin/cgi-wrapper sbin/hiawatha sbin/wigwam +lib/hiawatha/libpolarssl.so +lib/hiawatha/libpolarssl.so.1.3.6 +lib/hiawatha/libpolarssl.so.6 man/man1/cgi-wrapper.1.gz 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 %%WWWDIR%%/index.html.sample +@dirrmtry %%WWWDIR%% +@dirrmtry var/lib/hiawatha +@dirrmtry var/lib +@dirrmtry var +@dirrmtry lib/hiawatha +@dirrmtry %%ETCDIR%% @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 -@dirrm lib/hiawatha _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"