From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 22:01:05 2013 Return-Path: Delivered-To: svn-ports-head@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 048BD5E8; Tue, 17 Dec 2013 22:01:05 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C93C91155; Tue, 17 Dec 2013 22:01:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHM14i6067482; Tue, 17 Dec 2013 22:01:04 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHM13Xp067474; Tue, 17 Dec 2013 22:01:03 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312172201.rBHM13Xp067474@svn.freebsd.org> From: Niclas Zeising Date: Tue, 17 Dec 2013 22:01:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336780 - in head/x11/xscreensaver: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:01:05 -0000 Author: zeising Date: Tue Dec 17 22:01:03 2013 New Revision: 336780 URL: http://svnweb.freebsd.org/changeset/ports/336780 Log: Update to 5.26 Stagify. Thanks to bapt for the help with staging! Modified: head/x11/xscreensaver/Makefile head/x11/xscreensaver/distinfo head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in head/x11/xscreensaver/files/patch-hacks__config__sonar.xml head/x11/xscreensaver/pkg-plist Modified: head/x11/xscreensaver/Makefile ============================================================================== --- head/x11/xscreensaver/Makefile Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/Makefile Tue Dec 17 22:01:03 2013 (r336780) @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= xscreensaver -PORTVERSION= 5.22 -PORTREVISION= 3 +PORTVERSION= 5.26 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= zeising@FreeBSD.org COMMENT= Save your screen while you entertain your cat -LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ - glade-2.0.0:${PORTSDIR}/devel/libglade2 +LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \ + libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libglade-2.0.so:${PORTSDIR}/devel/libglade2 RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www/p5-libwww \ giftopnm:${PORTSDIR}/graphics/netpbm +DESTDIRNAME= install_prefix CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* @@ -46,7 +46,6 @@ XMOUN_DESC= Add extra port graphics/xmou XPLAN_DESC= Add extra port astro/xplanet XSNOW_DESC= Add extra port x11/xsnow -NO_STAGE= yes .include .if ${PORT_OPTIONS:MKERBEROS} @@ -89,48 +88,6 @@ RUN_DEPENDS+= xsnow:${PORTSDIR}/x11/xsno .undef HAVE_GNOME -MAN1= xscreensaver-command.1 xscreensaver-demo.1 \ - xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \ - xscreensaver-getimage.1 xscreensaver-text.1 xscreensaver.1 - -MAN6= anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \ - apollonian.6 apple2.6 atlantis.6 attraction.6 atunnel.6 barcode.6 \ - blaster.6 blinkbox.6 blitspin.6 blocktube.6 boing.6 bouboule.6 \ - bouncingcow.6 boxed.6 boxfit.6 braid.6 bsod.6 bubble3d.6 \ - bumps.6 cage.6 carousel.6 ccurve.6 celtic.6 circuit.6 cloudlife.6 \ - compass.6 coral.6 crackberg.6 crystal.6 cube21.6 \ - cubenetic.6 cubestorm.6 cynosure.6 dangerball.6 decayscreen.6 deco.6 \ - deluxe.6 demon.6 discrete.6 distort.6 drift.6 endgame.6 engine.6 \ - epicycle.6 eruption.6 euler2d.6 extrusion.6 fadeplot.6 fiberlamp.6 \ - fireworkx.6 flame.6 flipflop.6 flipscreen3d.6 fliptext.6 flow.6 \ - fluidballs.6 flurry.6 flyingtoasters.6 fontglide.6 \ - fuzzyflakes.6 galaxy.6 gears.6 gflux.6 glblur.6 gleidescope.6 \ - glhanoi.6 glknots.6 glmatrix.6 glplanet.6 glschool.6 \ - glslideshow.6 glsnake.6 gltext.6 goop.6 grav.6 greynetic.6 halftone.6 \ - halo.6 helix.6 hexadrop.6 hopalong.6 hypertorus.6 ifs.6 \ - imsmap.6 interaggregate.6 interference.6 intermomentary.6 jigglypuff.6 \ - jigsaw.6 juggler3d.6 julia.6 kaleidocycle.6 kaleidescope.6 klein.6 \ - kumppa.6 lament.6 lavalite.6 ljlatest.6 \ - loop.6 maze.6 memscroller.6 menger.6 metaballs.6 mirrorblob.6 \ - moebius.6 moire.6 moire2.6 molecule.6 morph3d.6 mountain.6 \ - munch.6 nerverot.6 noof.6 noseguy.6 pacman.6 pedal.6 penetrate.6 \ - penrose.6 petri.6 phosphor.6 piecewise.6 pinion.6 pipes.6 polyhedra.6 \ - polyominoes.6 polytopes.6 pong.6 providence.6 pulsar.6 pyro.6 qix.6 \ - quasicrystal.6 queens.6 rd-bomb.6 ripples.6 rocks.6 rorschach.6 \ - rotzoomer.6 rubik.6 sballs.6 shadebobs.6 sierpinski.6 sierpinski3d.6 \ - slidescreen.6 slip.6 sonar.6 speedmine.6 spheremonics.6 \ - spotlight.6 sproingies.6 squiral.6 stairs.6 starfish.6 \ - starwars.6 stonerview.6 strange.6 substrate.6 superquadrics.6 \ - swirl.6 tangram.6 thornbird.6 timetunnel.6 topblock.6 \ - triangle.6 truchet.6 twang.6 unknownpleasures.6 vermiculate.6 \ - vidwhacker.6 wander.6 webcollage.6 whirlwindwarp.6 wormhole.6 \ - xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \ - xspirograph.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \ - abstractile.6 moebiusgears.6 lockward.6 cubicgrid.6 hypnowheel.6 \ - lcdscrub.6 skytentacles.6 photopile.6 rubikblocks.6 surfaces.6 \ - companioncube.6 hilbert.6 tronbit.6 \ - xscreensaver-gl-helper.6 - SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop @@ -153,11 +110,11 @@ post-patch: .endif post-install: - ${INSTALL_DATA} ${FILESDIR}/x*.xml ${DATADIR}/config/ + ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/ @(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \ ${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \ ${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \ ${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi) - ${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Modified: head/x11/xscreensaver/distinfo ============================================================================== --- head/x11/xscreensaver/distinfo Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/distinfo Tue Dec 17 22:01:03 2013 (r336780) @@ -1,2 +1,2 @@ -SHA256 (xscreensaver-5.22.tar.gz) = 47b703ed22dce46a08f11ddd7d67d52e4f7ad8df844bdf956431069a0db36797 -SIZE (xscreensaver-5.22.tar.gz) = 7411666 +SHA256 (xscreensaver-5.26.tar.gz) = 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 +SIZE (xscreensaver-5.26.tar.gz) = 8760550 Modified: head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in ============================================================================== --- head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Tue Dec 17 22:01:03 2013 (r336780) @@ -1,6 +1,6 @@ ---- driver/XScreenSaver.ad.in.orig 2009-09-07 21:53:15.000000000 -0700 -+++ driver/XScreenSaver.ad.in 2009-09-15 02:10:42.000000000 -0700 -@@ -54,7 +54,7 @@ +--- driver/XScreenSaver.ad.in.orig 2013-12-09 12:01:40.000000000 +0100 ++++ driver/XScreenSaver.ad.in 2013-12-17 19:34:28.222008084 +0100 +@@ -56,7 +56,7 @@ *splashDuration: 0:00:05 *visualID: default *captureStderr: True @@ -9,7 +9,16 @@ *textMode: file *textLiteral: XScreenSaver -@@ -151,6 +151,18 @@ +@@ -122,7 +122,7 @@ + + ! The format used for printing the date and time in the password dialog box + ! (see the strftime(3) manual page for details.) +-*dateFormat: %d-%b-%y (%a); %I:%M %p ++*dateFormat: %Y-%m-%d %H:%M:%S + ! To show the time only: + ! *dateFormat: %I:%M %p + ! For 24 hour time: +@@ -156,6 +156,18 @@ ! screen savers interactively. ! *programs: \ @@ -28,7 +37,7 @@ maze -root \n\ @GL_KLUDGE@ GL: superquadrics -root \n\ attraction -root \n\ -@@ -246,7 +258,6 @@ +@@ -251,7 +263,6 @@ xspirograph -root \n\ @GL_KLUDGE@ GL: circuit -root \n\ @GL_KLUDGE@ GL: dangerball -root \n\ @@ -36,7 +45,7 @@ @GL_KLUDGE@ GL: engine -root \n\ @GL_KLUDGE@ GL: flipscreen3d -root \n\ @GL_KLUDGE@ GL: gltext -root \n\ -@@ -435,7 +446,6 @@ +@@ -449,7 +460,6 @@ *hacks.cwaves.name: CWaves *hacks.dangerball.name: DangerBall *hacks.decayscreen.name: DecayScreen Modified: head/x11/xscreensaver/files/patch-hacks__config__sonar.xml ============================================================================== --- head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Tue Dec 17 22:01:03 2013 (r336780) @@ -1,5 +1,5 @@ ---- hacks/config/sonar.xml.orig 2012-07-02 12:25:48.000000000 -0700 -+++ hacks/config/sonar.xml 2012-07-04 15:29:38.000000000 -0700 +--- hacks/config/sonar.xml.orig 2013-12-04 23:42:00.000000000 +0100 ++++ hacks/config/sonar.xml 2013-12-09 12:29:34.301395635 +0100 @@ -29,7 +29,7 @@