Index: head/www/hiawatha/Makefile
===================================================================
--- head/www/hiawatha/Makefile	(revision 264424)
+++ head/www/hiawatha/Makefile	(revision 264425)
@@ -1,112 +1,113 @@
 # New ports collection makefile for:   hiawatha
 # Date created:        24 november 2006
 # Whom:                Hugo Leisink <hugo@leisink.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	hiawatha
-PORTVERSION=	7.3
-PORTREVISION=	1
+PORTVERSION=	7.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.hiawatha-webserver.org/files/ \
 		http://www.c-s.li/ports/
 
 MAINTAINER=	c-s@c-s.li
 COMMENT=	An advanced and secure webserver for Unix
 
 LICENSE=	GPLv2
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL
 PORTEXAMPLES=	hiawatha mkcert newroot php-fcgi
 CONFIG_FILES=	hiawatha.conf mimetype.conf cgi-wrapper.conf php-fcgi.conf
 MAN1=		cgi-wrapper.1 hiawatha.1 newroot.1 php-fcgi.1 ssi-cgi.1 wigwam.1
 
 USE_RC_SUBR=	hiawatha
 SUB_FILES=	pkg-message
 WANT_GNOME=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var webrootdir=${WWWDIR}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 OPTIONS=	COMMAND "Enable the Hiawatha CommandChannel" Off \
 		CACHE "Internal file caching support" On \
 		IPV6 "Enable IPv6 Support" On \
 		LARGEFILE "Support for large files" On \
 		MONITOR "Enable Hiawatha Monitor" On \
 		SSL "Support for Secure Sockets Layer (SSL)" On \
 		TOOLKIT "Enable URL Toolkit" On \
 		XSLT "XSLT support" On
+
+PLIST_SUB+=	ECHO_MSG=${ECHO_MSG}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_COMMAND)
 CONFIGURE_ARGS+=	--enable-command
 .else
 CONFIGURE_ARGS+=	--disable-command
 .endif
 
 .if !defined(WITH_CACHE)
 CONFIGURE_ARGS+=	--disable-cache
 .endif
 
 .if !defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !defined(WITH_LARGEFILE)
 CONFIGURE_ARGS+=	--disable-largefile
 .endif
 
 .if !defined(WITH_SSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if !defined(WITH_TOOLKIT)
 CONFIGURE_ARGS+=	--disable-toolkit
 .endif
 
 .if !defined(WITH_XSLT)
 CONFIGURE_ARGS+=	--disable-xslt
 .else
 USE_GNOME+=	libxslt
 CPPFLAGS+=	-I${LOCALBASE}/include/libxml2
 .endif
 
 .if !defined(WITH_MONITOR)
 CONFIGURE_ARGS+=	--disable-monitor
 .else
 CONFIGURE_ARGS+=	--enable-xslt
 USE_GNOME+=	libxslt
 CPPFLAGS+=	-I${LOCALBASE}/include/libxml2
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/extra/,} ${EXAMPLESDIR}/
 .endif
 .for FILE in ${CONFIG_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/etc/hiawatha/${FILE} ${PREFIX}/etc/hiawatha/${FILE}.sample
 	@if [ ! -f ${PREFIX}/etc/hiawatha/${FILE} ]; then \
 		${CP} -p ${WRKSRC}/etc/hiawatha/${FILE} ${PREFIX}/etc/hiawatha/${FILE} ; \
 	fi
 .endfor
 	@if [ ! -d ${WWWDIR} ]; then \
 		@${MKDIR} ${WWWDIR} ; \
 	fi
 	@${CP} ${WRKSRC}/doc/index.html ${WWWDIR}/index.hiawatha.html
 	@if [ ! -f ${WWWDIR}/index.html ] ; then \
 		${CP} ${WRKSRC}/doc/index.html ${WWWDIR}/ ; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/hiawatha/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property
Index: head/www/hiawatha/distinfo
===================================================================
--- head/www/hiawatha/distinfo	(revision 264424)
+++ head/www/hiawatha/distinfo	(revision 264425)
@@ -1,3 +1,2 @@
-MD5 (hiawatha-7.3.tar.gz) = 0a16d97a51ac8bc3559f165cb6ce97e9
-SHA256 (hiawatha-7.3.tar.gz) = 43453ffa1a8beffe4b5cb9bec9720704294235b5962aaae1d6ba22d8df44858f
-SIZE (hiawatha-7.3.tar.gz) = 273120
+SHA256 (hiawatha-7.4.tar.gz) = 71e8935926e91632c0e601520f1b60c20dc961e085c692454018c6ac86ab58d2
+SIZE (hiawatha-7.4.tar.gz) = 274169

Property changes on: head/www/hiawatha/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.22
\ No newline at end of property
+1.23
\ No newline at end of property
Index: head/www/hiawatha/pkg-plist
===================================================================
--- head/www/hiawatha/pkg-plist	(revision 264424)
+++ head/www/hiawatha/pkg-plist	(revision 264425)
@@ -1,25 +1,25 @@
 bin/ssi-cgi
 sbin/cgi-wrapper
 sbin/hiawatha
 sbin/newroot
 sbin/php-fcgi
 sbin/wigwam
 %%ETCDIR%%/index.xslt
 @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 ] ; 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 ] ; then cp -p %D/%F %%ETCDIR%%/hiawatha.conf; 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 ] ; then cp -p %D/%F %%ETCDIR%%/mimetype.conf; fi
 @unexec if cmp -s %D/etc/hiawatha/php-fcgi.conf.sample %D/etc/hiawatha/php-fcgi.conf ; then rm -f %D/etc/hiawatha/php-fcgi.conf; fi
 %%ETCDIR%%/php-fcgi.conf.sample
 @exec if [ ! -f %D/etc/hiawatha/php-fcgi.conf ] ; then cp -p %D/%F %%ETCDIR%%/php-fcgi.conf; fi
-@unexec t=`/bin/ls %D/etc/hiawatha`; if [ -z "$t" ]; then echo "Configuration directory is empty, remove it."; rmdir %D/etc/hiawatha; fi;
-@unexec t=`/bin/ls /var/log/hiawatha`; if [ -z "$t" ]; then echo "Log directory is empty, remove it."; rmdir /var/log/hiawatha; 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;
+@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 "WWW directory is empty, remove it."; rmdir %D/www/hiawatha; 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;

Property changes on: head/www/hiawatha/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property