From owner-freebsd-bugs@FreeBSD.ORG Mon Apr 28 23:30:00 2014 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8CD820C for ; Mon, 28 Apr 2014 23:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 858A81FAA for ; Mon, 28 Apr 2014 23:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3SNU0YM044213 for ; Mon, 28 Apr 2014 23:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3SNU0R0044212; Mon, 28 Apr 2014 23:30:00 GMT (envelope-from gnats) Resent-Date: Mon, 28 Apr 2014 23:30:00 GMT Resent-Message-Id: <201404282330.s3SNU0R0044212@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chris petrik Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CCE32DC for ; Mon, 28 Apr 2014 23:23:38 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABCD81E6E for ; Mon, 28 Apr 2014 23:23:38 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3SNNceV054912 for ; Mon, 28 Apr 2014 23:23:38 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3SNNcwN054907; Mon, 28 Apr 2014 23:23:38 GMT (envelope-from nobody) Message-Id: <201404282323.s3SNNcwN054907@cgiserv.freebsd.org> Date: Mon, 28 Apr 2014 23:23:38 GMT From: chris petrik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/189090: [PATCH] Update www/hiawatha to 9.5 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Apr 2014 23:30:00 -0000 >Number: 189090 >Category: misc >Synopsis: [PATCH] Update www/hiawatha to 9.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Apr 28 23:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: chris petrik >Release: >Organization: bsdjunk >Environment: 10.0-RELEASE >Description: Update to 9.5 remove uneeded Makefile args update pkg-plist add in patch to fix build on < 10.0 >How-To-Repeat: >Fix: Patch attached with submission follows: Index: hiawatha/Makefile =================================================================== --- hiawatha/Makefile (revision 352558) +++ hiawatha/Makefile (working copy) @@ -2,12 +2,12 @@ # $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 @@ -17,10 +17,9 @@ 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 \ Index: hiawatha/distinfo =================================================================== --- hiawatha/distinfo (revision 352558) +++ hiawatha/distinfo (working copy) @@ -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 Index: hiawatha/files/pkg-message.in =================================================================== --- hiawatha/files/pkg-message.in (revision 352558) +++ hiawatha/files/pkg-message.in (working copy) @@ -2,13 +2,16 @@ The Hiawatha webserver is now installed. -Edit the configuration files in %%ETCDIR%% to suit your needs. +Copy sample configs 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... + =============================================================================== Index: hiawatha/pkg-plist =================================================================== --- hiawatha/pkg-plist (revision 352558) +++ hiawatha/pkg-plist (working copy) @@ -29,6 +29,6 @@ @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 +lib/hiawatha/libpolarssl.so.1.3.6 +lib/hiawatha/libpolarssl.so.6 @dirrm lib/hiawatha >Release-Note: >Audit-Trail: >Unformatted: