From owner-svn-ports-head@FreeBSD.ORG  Wed Sep 26 11:28:57 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 919171065673;
	Wed, 26 Sep 2012 11:28:57 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7212A8FC08;
	Wed, 26 Sep 2012 11:28:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QBSvQj018432;
	Wed, 26 Sep 2012 11:28:57 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QBSvRL018427;
	Wed, 26 Sep 2012 11:28:57 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201209261128.q8QBSvRL018427@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 26 Sep 2012 11:28:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304901 - in head/www/xombrero: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Sep 2012 11:28:57 -0000

Author: zeising
Date: Wed Sep 26 11:28:56 2012
New Revision: 304901
URL: http://svn.freebsd.org/changeset/ports/304901

Log:
  Update to 1.3.1
  Install ists-preload as well [1]
  Fix startup script to only copy example configs if installed [2]
  
  PR:		ports/171680 [1], ports/171683 [2]
  Submitted by:	kaltheat <kaltheat@gmail.com> (pr)
  		zeising (patches)
  Approved by:	kwm (mentor)

Modified:
  head/www/xombrero/Makefile
  head/www/xombrero/distinfo
  head/www/xombrero/files/xombrero.in
  head/www/xombrero/pkg-plist

Modified: head/www/xombrero/Makefile
==============================================================================
--- head/www/xombrero/Makefile	Wed Sep 26 11:25:34 2012	(r304900)
+++ head/www/xombrero/Makefile	Wed Sep 26 11:28:56 2012	(r304901)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xombrero
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 CATEGORIES=	www
 MASTER_SITES=	https://opensource.conformal.com/snapshots/xombrero/
 EXTRACT_SUFX=	.tgz
@@ -58,7 +58,7 @@ do-install:
 	${INSTALL_DATA}  ${WRKSRC}/xombreroicon${i}.png ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 .endfor
 	${MKDIR} ${DATADIR}
-.for i in style.css tld-rules
+.for i in hsts-preload style.css tld-rules
 	${INSTALL_DATA}  ${WRKSRC}/${i} ${DATADIR}
 .endfor
 	${MKDIR} ${PREFIX}/share/applications

Modified: head/www/xombrero/distinfo
==============================================================================
--- head/www/xombrero/distinfo	Wed Sep 26 11:25:34 2012	(r304900)
+++ head/www/xombrero/distinfo	Wed Sep 26 11:28:56 2012	(r304901)
@@ -1,2 +1,2 @@
-SHA256 (xombrero-1.3.0.tgz) = 42d831953cd011a81d1c5914ea9e14b14be240b400c1ed94c4cc26ba89f9dde2
-SIZE (xombrero-1.3.0.tgz) = 253343
+SHA256 (xombrero-1.3.1.tgz) = b7eee30e68ad2d71352b9c4d7ca34f025df64277f82e87d6178aa1ad9a291231
+SIZE (xombrero-1.3.1.tgz) = 259149

Modified: head/www/xombrero/files/xombrero.in
==============================================================================
--- head/www/xombrero/files/xombrero.in	Wed Sep 26 11:25:34 2012	(r304900)
+++ head/www/xombrero/files/xombrero.in	Wed Sep 26 11:28:56 2012	(r304901)
@@ -9,12 +9,12 @@ if [ ! -d "$HOME/.xombrero" ]; then
 	mkdir -p -m 700 $HOME/.xombrero
 fi
 
-if [ ! -f "$HOME/.xombrero.conf" ]; then
+if [ -f "%%EXAMPLESDIR%%/xombrero.conf" ] && [ ! -f "$HOME/.xombrero.conf" ]; then
 	cp %%EXAMPLESDIR%%/xombrero.conf $HOME/.xombrero.conf
 	chmod +w $HOME/.xombrero.conf
 fi
 
-if [ ! -f "$HOME/.xombrero/playflash.sh" ]; then
+if [ -f "%%EXAMPLESDIR%%/playflash.sh" ] && [ ! -f "$HOME/.xombrero/playflash.sh" ]; then
 	cp %%EXAMPLESDIR%%/playflash.sh $HOME/.xombrero/playflash.sh
 	chmod +x $HOME/.xombrero/playflash.sh
 fi

Modified: head/www/xombrero/pkg-plist
==============================================================================
--- head/www/xombrero/pkg-plist	Wed Sep 26 11:25:34 2012	(r304900)
+++ head/www/xombrero/pkg-plist	Wed Sep 26 11:28:56 2012	(r304901)
@@ -6,6 +6,7 @@ share/icons/hicolor/16x16/apps/xombreroi
 share/icons/hicolor/32x32/apps/xombreroicon32.png
 share/icons/hicolor/48x48/apps/xombreroicon48.png
 share/icons/hicolor/64x64/apps/xombreroicon64.png
+%%DATADIR%%/hsts-preload
 %%DATADIR%%/style.css
 %%DATADIR%%/tld-rules
 @dirrm %%DATADIR%%