From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 16 16:39:47 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 60B937F9;
 Sun, 16 Dec 2012 16:39:47 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2C77B8FC0A;
 Sun, 16 Dec 2012 16:39:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGGdlR5012335;
 Sun, 16 Dec 2012 16:39:47 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGGdkJG012333;
 Sun, 16 Dec 2012 16:39:46 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201212161639.qBGGdkJG012333@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sun, 16 Dec 2012 16:39:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309027 - in head/www/baikal: . files
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 16:39:47 -0000

Author: adamw
Date: Sun Dec 16 16:39:46 2012
New Revision: 309027
URL: http://svnweb.freebsd.org/changeset/ports/309027

Log:
  * Don't give www ownership of anything it shouldn't need to write to
  * Use PORT_OPTIONS:MDOCS instead of NOPORTDOCS [1]
  * PORTREVISION bump
  
  Submitted by:	jgh [1]

Modified:
  head/www/baikal/Makefile
  head/www/baikal/files/pkg-message.in

Modified: head/www/baikal/Makefile
==============================================================================
--- head/www/baikal/Makefile	Sun Dec 16 16:35:19 2012	(r309026)
+++ head/www/baikal/Makefile	Sun Dec 16 16:39:46 2012	(r309027)
@@ -3,6 +3,7 @@
 
 PORTNAME=		baikal
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=		www
 MASTER_SITES=	http://baikal.codr.fr/get/
 DISTNAME=		${PORTNAME}-regular-${PORTVERSION}
@@ -20,15 +21,12 @@ PLIST_SUB+=		CALDB="${WWWDIR}/Specific/d
 SUB_LIST+=		CALDB="${WWWDIR}/Specific/db/db.sqlite"
 SUB_FILES=		pkg-install pkg-message
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=		*
-.endif
-.if !defined(NOPORTEXAMPLES)
 PORTEXAMPLES=	*
-.endif
 
+.include <bsd.port.options.mk>
 post-patch:
-	${FIND} ${WRKSRC} -type f \! -name '*.php' -exec ${CHMOD} ${SHAREMODE} {} \;
+	${FIND} ${WRKSRC} -type f -not -name '*.php' -exec ${CHMOD} ${SHAREMODE} {} \;
 	${FIND} ${WRKSRC} -type f -name '*.php' -exec ${CHMOD} ${BINMODE} {} \;
 	${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \;
 	${MV} ${WRKSRC}/Specific/db/db.sqlite \
@@ -42,18 +40,20 @@ post-patch:
 
 do-install:
 	${MKDIR} ${WWWDIR}
-.for DIR in Core html Specific
-	cd ${WRKSRC} && ${FIND} ${DIR} \! -path '*/virtualhosts*' | \
-		${CPIO} -pdmu -R ${WWWOWN}:${WWWGRP} --quiet ${WWWDIR}
+.for DIR in Core html
+	cd ${WRKSRC} && ${FIND} ${DIR} | \
+		${CPIO} -pdmu -R ${BINOWN}:${BINGRP} --quiet ${WWWDIR}
 .endfor
+	cd ${WRKSRC} && ${FIND} Specific -not -path '*/virtualhosts*' | \
+		${CPIO} -pdmu -R ${WWWOWN}:${WWWGRP} --quiet ${WWWDIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 .for f in INSTALL.md LICENSE.txt README.md TROUBLESHOOTING.md
 	${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 .for f in apache2 nginx
 	${INSTALL_DATA} ${WRKSRC}/Specific/virtualhosts/baikal.$f ${EXAMPLESDIR}
 .endfor

Modified: head/www/baikal/files/pkg-message.in
==============================================================================
--- head/www/baikal/files/pkg-message.in	Sun Dec 16 16:35:19 2012	(r309026)
+++ head/www/baikal/files/pkg-message.in	Sun Dec 16 16:39:46 2012	(r309027)
@@ -1,7 +1,6 @@
 
 To finish installing Baikal:
-	1) Set up an httpd directive; Baikal *MUST* run from
-	   the root of a VirtualHost or subdomain.
+	1) Set up an httpd directive
 	   See %%EXAMPLESDIR%%
 	2) touch %%WWWDIR%%/Specific/ENABLE_INSTALL
 	3) Browse http://your.host.here/admin