Installing www/xombrero without examples produces following errors when starting xombrero using wrapper-script afterwards: cp: /usr/local/share/examples/xombrero/xombrero.conf: No such file or directory chmod: /home/henry/.xombrero.conf: No such file or directory cp: /usr/local/share/examples/xombrero/playflash.sh: No such file or directory chmod: /home/henry/.xombrero/playflash.sh: No such file or directory xombrero-bin: config_parse: cannot open /home/henry/.xombrero.conf: No such file or directory xombrero-bin: config_parse: cannot open /usr/local/share/xombrero/hsts-preload: No such file or directory Fix: change wrapper-script to check whether example-files exist or not How-To-Repeat: start xombrero using wrapper-script
Responsible Changed From-To: freebsd-ports-bugs->zeising Over to maintainer (via the GNATS Auto Assign Tool)
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%% _______________________________________________ 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"
State Changed From-To: open->closed Fixed, thanks!