From owner-svn-ports-all@FreeBSD.ORG Mon Sep 1 20:43:26 2014 Return-Path: Delivered-To: svn-ports-all@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 7460C7D9; Mon, 1 Sep 2014 20:43:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 461FF1F1E; Mon, 1 Sep 2014 20:43:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81KhQd1053002; Mon, 1 Sep 2014 20:43:26 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81KhPUC053000; Mon, 1 Sep 2014 20:43:25 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409012043.s81KhPUC053000@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 1 Sep 2014 20:43:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366954 - head/www/hiawatha X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2014 20:43:26 -0000 Author: tijl Date: Mon Sep 1 20:43:25 2014 New Revision: 366954 URL: http://svnweb.freebsd.org/changeset/ports/366954 QAT: https://qat.redports.org/buildarchive/r366954/ Log: Use /var instead of PREFIX/var PR: 186431 Approved by: maintainer timeout (3 weeks) Modified: head/www/hiawatha/Makefile head/www/hiawatha/pkg-plist Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Mon Sep 1 20:17:08 2014 (r366953) +++ head/www/hiawatha/Makefile Mon Sep 1 20:43:25 2014 (r366954) @@ -3,6 +3,7 @@ PORTNAME= hiawatha PORTVERSION= 9.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/fbsdports/hiawatha/ \ http://www.hiawatha-webserver.org/files/:monitor @@ -22,15 +23,9 @@ USES= cmake compiler:c11 USE_LDCONFIG= yes USE_RC_SUBR= hiawatha -CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=${PREFIX}/bin \ - -DCMAKE_INSTALL_SBINDIR=${PREFIX}/sbin \ - -DCMAKE_INSTALL_SYSCONFDIR=${ETCDIR} \ - -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib \ - -DCONFIG_DIR=${ETCDIR} \ - -DWEBROOT_DIR=${WWWDIR} \ +CMAKE_ARGS= -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man \ - -DLOG_DIR=/var/log/hiawatha \ - -DPID_DIR=/var/run + -DWEBROOT_DIR=${WWWDIR} OPTIONS_DEFINE= CACHE DOCS IPV6 MONITOR RPROXY SSL TOMAHAWK TOOLKIT XSLT @@ -68,8 +63,6 @@ XSLT_USE= GNOME=libxslt XSLT_CMAKE_ON= -DENABLE_XSLT=on XSLT_CMAKE_OFF= -DENABLE_XSLT=off -PLIST_SUB+= ECHO_MSG=${ECHO_MSG} - post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ ${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in \ Modified: head/www/hiawatha/pkg-plist ============================================================================== --- head/www/hiawatha/pkg-plist Mon Sep 1 20:17:08 2014 (r366953) +++ head/www/hiawatha/pkg-plist Mon Sep 1 20:43:25 2014 (r366954) @@ -17,11 +17,10 @@ man/man1/ssi-cgi.1.gz man/man1/wigwam.1.gz @sample %%WWWDIR%%/index.html.sample @dirrmtry %%WWWDIR%% -@dirrmtry var/lib/hiawatha -@dirrmtry var/lib -@dirrmtry var @dirrmtry lib/hiawatha @dirrmtry %%ETCDIR%% -@unexec rmdir "/var/log/hiawatha" >/dev/null 2>&1 || : -@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; +@cwd /var +@dirrmtry log/hiawatha +@dirrmtry lib/hiawatha +@dirrmtry lib +@cwd