Bug 177627

Summary: www/hiawatha: Hiawatha command channel renamed to Tomahawk
Product: Ports & Packages Reporter: Daniel Eisele <daniel_eisele>
Component: Individual Port(s)Assignee: Carlo Strub <cs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
Makefile_diff.txt none

Description Daniel Eisele 2013-04-04 12:20:00 UTC 
Hiawatha (www/hiawatha) command channel was renamed to Tomahawk, so the build option has changed from "-DENABLE_COMMAND" to "-DENABLE_TOMAHAWK".

Fix: 

Patch is attached.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-04 15:00:18 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->cs

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Daniel Eisele 2013-04-04 17:25:27 UTC 
Sorry, I forgot to submit the patch. I obtained the patch with "diff
-ruN Makefile Makefile.old > Makefile.diff"
It should be attached now...
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-04-18 06:45:59 UTC 
Author: cs
Date: Thu Apr 18 05:45:52 2013
New Revision: 316018
URL: http://svnweb.freebsd.org/changeset/ports/316018

Log:
  - Update to 9.1
  - Update options
  
  PR:		ports/177627
  Submitted by:	Daniel Eisele <daniel_eisele@gmx.de>
  		Hugo Leisink (author of hiawatha, via mail)
  Feature safe:	yes

Modified:
  head/www/hiawatha/Makefile
  head/www/hiawatha/distinfo
  head/www/hiawatha/pkg-plist

Modified: head/www/hiawatha/Makefile
==============================================================================
--- head/www/hiawatha/Makefile	Thu Apr 18 04:58:41 2013	(r316017)
+++ head/www/hiawatha/Makefile	Thu Apr 18 05:45:52 2013	(r316018)
@@ -3,7 +3,7 @@
 #
 
 PORTNAME=	hiawatha
-PORTVERSION=	9.0
+PORTVERSION=	9.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.hiawatha-webserver.org/files/ \
 		http://www.c-s.li/ports/
@@ -13,7 +13,7 @@ COMMENT=	Advanced and secure webserver f
 
 LICENSE=	GPLv2
 
-PORTDOCS=	AUTHORS ChangeLog INSTALL
+PORTDOCS=	ChangeLog README.md
 CONFIG_FILES=	hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf \
 		index.xslt
 
@@ -37,24 +37,21 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_BINDIR=${PR
 		-DPID_DIR=/var/run
 
 OPTIONS_DEFINE=	CACHE \
-		CHROOT \
-		COMMAND \
-		DEBUG \
 		DOCS \
 		IPV6 \
 		MONITOR \
 		RPROXY \
 		SSL \
+		TOMAHAWK \
 		TOOLKIT \
 		XSLT
 
 OPTIONS_DEFAULT=CACHE IPV6 RPROXY SSL TOOLKIT XSLT DOCS
 
 CACHE_DESC=	Enable cache support
-CHROOT_DESC=	Enable chroot support
-COMMAND_DESC=	Enable Hiawatha command channel
 MONITOR_DESC=	Enable Hiawatha Monitor
 RPROXY_DESC=	Enable reverse proxy
+TOMAHAWK_DESC=	Enable Tomahawk command channel
 TOOLKIT_DESC=	Enable URL toolkit
 XSLT_DESC=	Enable XSLT support
 
@@ -66,22 +63,10 @@ CMAKE_ARGS+=	-DENABLE_CACHE=on
 CMAKE_ARGS+=	-DENABLE_CACHE=off
 .endif
 
-.if ${PORT_OPTIONS:MCHROOT}
-CMAKE_ARGS+=	-DENABLE_CHROOT=on
+.if ${PORT_OPTIONS:MTOMAHAWK}
+CMAKE_ARGS+=	-DENABLE_TOMAHAWK=on
 .else
-CMAKE_ARGS+=	-DENABLE_CHROOT=off
-.endif
-
-.if ${PORT_OPTIONS:MCOMMAND}
-CMAKE_ARGS+=	-DENABLE_COMMAND=on
-.else
-CMAKE_ARGS+=	-DENABLE_COMMAND=off
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=	-DENABLE_DEBUG=on
-.else
-CMAKE_ARGS+=	-DENABLE_DEBUG=off
+CMAKE_ARGS+=	-DENABLE_TOMAHAWK=off
 .endif
 
 .if ${PORT_OPTIONS:MIPV6}

Modified: head/www/hiawatha/distinfo
==============================================================================
--- head/www/hiawatha/distinfo	Thu Apr 18 04:58:41 2013	(r316017)
+++ head/www/hiawatha/distinfo	Thu Apr 18 05:45:52 2013	(r316018)
@@ -1,2 +1,2 @@
-SHA256 (hiawatha-9.0.tar.gz) = 4bc0869e8dc49985b7152397d8112e6a63aa9927977f46feca67274f303ad127
-SIZE (hiawatha-9.0.tar.gz) = 666251
+SHA256 (hiawatha-9.1.tar.gz) = 699958c178757be0a5074093c15a136cd4387403e60911d29520d362f345ab48
+SIZE (hiawatha-9.1.tar.gz) = 668747

Modified: head/www/hiawatha/pkg-plist
==============================================================================
--- head/www/hiawatha/pkg-plist	Thu Apr 18 04:58:41 2013	(r316017)
+++ head/www/hiawatha/pkg-plist	Thu Apr 18 05:45:52 2013	(r316018)
@@ -25,5 +25,5 @@ sbin/wigwam
 @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.2
-lib/hiawatha/libpolarssl.so.1.2.6
+lib/hiawatha/libpolarssl.so.1.2.7
 @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"
Comment 4 Carlo Strub freebsd_committer freebsd_triage 2013-04-18 06:47:22 UTC 
State Changed
From-To: open->closed

Committed. Thank you very much.