cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xscreensaver-5.29.

Browse Source
This commit is contained in:
ajacoutot 2014-07-10 07:40:35 +00:00
parent b21869cf20
commit dc835a3ccc
12 changed files with 48 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
x11/xscreensaver/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.80 2013/11/15 15:37:57 sthen Exp $
# $OpenBSD: Makefile,v 1.81 2014/07/10 07:40:35 ajacoutot Exp $
COMMENT= screen saver and locker for the X Window System
DISTNAME= xscreensaver-5.23
DISTNAME= xscreensaver-5.29
CATEGORIES= x11
@ -45,28 +45,21 @@ CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
--with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \
--without-pam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
LDFLAGS="-L${LOCALBASE}/lib"
# Create desktop files from xscreensaver xml files for use by
# freedesktop compliant screensavers.
post-extract:
cp ${FILESDIR}/migrate-xscreensaver-config.sh ${WRKSRC}/hacks/config
cp ${FILESDIR}/xscreensaver-config.xsl ${WRKSRC}/hacks/config
FAKE_FLAGS= install_prefix=${WRKINST}
pre-configure:
perl -pi -e 's,gnome-open,xdg-open,g' ${WRKSRC}/configure
post-install:
# remove conflict on games/circuit, misc/deco
for i in circuit deco ; do \
mv ${PREFIX}/man/man6/$${i}.6 ${PREFIX}/man/man6/x$${i}.6 ; \
mv ${PREFIX}/libexec/xscreensaver/$${i} \
${PREFIX}/libexec/xscreensaver/x$${i} && \
mv ${PREFIX}/share/xscreensaver/config/$${i}.xml \
${PREFIX}/share/xscreensaver/config/x$${i}.xml && \
mv ${WRKSRC}/hacks/config/$${i}.xml \
${WRKSRC}/hacks/config/x$${i}.xml ; done
# remove conflict on misc/deco
mv ${PREFIX}/man/man6/deco.6 ${PREFIX}/man/man6/xscrensaver-deco.6
# create dot.desktop files from xscreensaver xml files for use
# by freedesktop compliant screensavers
cp ${FILESDIR}/migrate-xscreensaver-config.sh ${WRKSRC}/hacks/config
cp ${FILESDIR}/xscreensaver-config.xsl ${WRKSRC}/hacks/config
cd ${WRKSRC}/hacks/config && \
for i in ${WRKSRC}/hacks/config/*.xml; do \
/bin/sh migrate-xscreensaver-config.sh $${i} ; done

4
x11/xscreensaver/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xscreensaver-5.23.tar.gz) = NJ03blaszBAGYzFcsN4AaZ9OmRTyTzHYcjw/KIh3eaM=
SIZE (xscreensaver-5.23.tar.gz) = 8040800
SHA256 (xscreensaver-5.29.tar.gz) = xBj1dQaWtXjfbU/WLIJgwBhmdlPs6X8ruQYSBGvw8pQ=
SIZE (xscreensaver-5.29.tar.gz) = 8774562

4
x11/xscreensaver/files/migrate-xscreensaver-config.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: migrate-xscreensaver-config.sh,v 1.1 2008/11/29 11:29:07 ajacoutot Exp $
# $OpenBSD: migrate-xscreensaver-config.sh,v 1.2 2014/07/10 07:40:36 ajacoutot Exp $
#
# script originally from gnome-screensavers sources
@ -35,4 +35,4 @@ for FILE in $FILES; do
${CMD} -o ${outfile} ${XSL} ${FILE}
done
exit 0
exit 0

12
x11/xscreensaver/patches/patch-driver_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-driver_Makefile_in,v 1.5 2008/12/28 15:45:31 ajacoutot Exp $
--- driver/Makefile.in.orig Mon Aug 11 07:11:59 2008
+++ driver/Makefile.in Thu Oct 23 15:51:54 2008
@@ -10,7 +10,7 @@ VPATH = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
-install_prefix =
+install_prefix = $(DESTDIR)
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@

12
x11/xscreensaver/patches/patch-driver_XScreenSaver_ad_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-driver_XScreenSaver_ad_in,v 1.12 2013/06/01 19:57:34 ajacoutot Exp $
--- driver/XScreenSaver.ad.in.orig Tue Feb 5 07:32:12 2013
+++ driver/XScreenSaver.ad.in Sat Jun 1 21:37:02 2013
@@ -177,7 +177,7 @@ GetViewPortIsFullOfLies: False
bouboule -root \n\
- braid -root \n\
coral -root \n\
- deco -root \n\
+ xdeco -root \n\
drift -root \n\
- fadeplot -root \n\
galaxy -root \n\

12
x11/xscreensaver/patches/patch-hacks_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-hacks_Makefile_in,v 1.3 2005/06/03 05:38:32 marcm Exp $
--- hacks/Makefile.in.orig Sun Mar 20 23:18:18 2005
+++ hacks/Makefile.in Sun Apr 17 23:30:27 2005
@@ -10,7 +10,7 @@ VPATH = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
-install_prefix =
+install_prefix = $(DESTDIR)
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@

11
x11/xscreensaver/patches/patch-hacks_config_deco_xml
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-hacks_config_deco_xml,v 1.1 2002/03/27 01:28:27 lebel Exp $
--- hacks/config/deco.xml.orig Tue Mar 26 19:56:19 2002
+++ hacks/config/deco.xml Tue Mar 26 19:56:06 2002
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<screensaver name="deco" _label="Deco">
+<screensaver name="xdeco" _label="XDeco">
<command arg="-root"/>

29
x11/xscreensaver/patches/patch-hacks_deco_man
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-hacks_deco_man,v 1.3 2008/08/20 13:30:55 jasper Exp $
--- hacks/deco.man.orig Thu Jul 31 21:56:35 2008
+++ hacks/deco.man Wed Aug 20 15:05:40 2008
@@ -1,8 +1,8 @@
.TH XScreenSaver 1 "27-Apr-97" "X Version 11"
.SH NAME
-deco - draw tacky 70s basement wall panelling
+xdeco - draw tacky 70s basement wall panelling
.SH SYNOPSIS
-.B deco
+.B xdeco
[\-display \fIhost:display.screen\fP]
[\-foreground \fIcolor\fP]
[\-background \fIcolor\fP]
@@ -21,12 +21,12 @@ deco - draw tacky 70s basement wall panelling
[\-mondrian]
[\-fps]
.SH DESCRIPTION
-The \fIdeco\fP program subdivides and colors rectangles randomly.
+The \fIxdeco\fP program subdivides and colors rectangles randomly.
It looks kind of like Brady-Bunch-era rec-room wall paneling.
(Raven says: "This screensaver is ugly enough to peel paint.")
Can also produce more aesthetically pleasing displays via options.
.SH OPTIONS
-.I deco
+.I xdeco
accepts the following options:
.TP 8
.B \-window

12
x11/xscreensaver/patches/patch-hacks_glx_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-hacks_glx_Makefile_in,v 1.4 2005/06/03 05:38:32 marcm Exp $
--- hacks/glx/Makefile.in.orig Sun Mar 20 23:18:19 2005
+++ hacks/glx/Makefile.in Sun Apr 17 23:30:27 2005
@@ -11,7 +11,7 @@ VPATH = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
-install_prefix =
+install_prefix = $(DESTDIR)
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@

16
x11/xscreensaver/patches/patch-hacks_memscroller_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-hacks_memscroller_c,v 1.1 2014/07/10 07:40:36 ajacoutot Exp $
memscroller.c:353: error: #pragma GCC diagnostic not allowed inside functions
--- hacks/memscroller.c.orig Thu Jul 10 09:08:48 2014
+++ hacks/memscroller.c Thu Jul 10 09:09:03 2014
@@ -349,9 +349,6 @@ more_bits (state *st, scroller *sc)
from earlier days before the advent of virtual memory management."
-- sbrk(2) man page on MacOS
*/
-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-# endif
himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
# endif

12
x11/xscreensaver/patches/patch-po_Makefile_in_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.7 2013/06/01 19:57:53 ajacoutot Exp $
--- po/Makefile.in.in.orig Sun Dec 16 13:46:12 2007
+++ po/Makefile.in.in Sun Dec 16 13:47:36 2007
@@ -102,7 +102,7 @@ exec_prefix = @exec_prefix@
#datadir = $(prefix)/@DATADIRNAME@ -- not for xscreensaver
datadir = @PO_DATADIR@
datarootdir = @datarootdir@
-localedir = $(datadir)/locale
+localedir = $(DESTDIR)$(datadir)/locale
#localedir = $(prefix)/share/locale
#gnulocaledir = $(prefix)/share/locale -- not for xscreensaver
gnulocaledir = $(localedir)

26
x11/xscreensaver/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.32 2013/11/15 15:37:57 sthen Exp $
@comment $OpenBSD: PLIST,v 1.33 2014/07/10 07:40:36 ajacoutot Exp $
@conflict xscreensaver-data-*
@conflict xscreensaver-gle-*
@conflict xscreensaver-<5.07p3-no_gle
@ -47,6 +47,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/carousel
@bin libexec/xscreensaver/ccurve
@bin libexec/xscreensaver/celtic
@bin libexec/xscreensaver/circuit
@bin libexec/xscreensaver/cloudlife
@bin libexec/xscreensaver/companioncube
@bin libexec/xscreensaver/compass
@ -61,6 +62,7 @@ libexec/xscreensaver/
@bin libexec/xscreensaver/cynosure
@bin libexec/xscreensaver/dangerball
@bin libexec/xscreensaver/decayscreen
@bin libexec/xscreensaver/deco
@bin libexec/xscreensaver/deluxe
@bin libexec/xscreensaver/demon
@bin libexec/xscreensaver/discrete
@ -162,6 +164,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/polytopes
@bin libexec/xscreensaver/pong
@bin libexec/xscreensaver/popsquares
@bin libexec/xscreensaver/projectiveplane
@bin libexec/xscreensaver/providence
@bin libexec/xscreensaver/pulsar
@bin libexec/xscreensaver/pyro
@ -198,6 +201,7 @@ libexec/xscreensaver/ljlatest
@bin libexec/xscreensaver/surfaces
@bin libexec/xscreensaver/swirl
@bin libexec/xscreensaver/tangram
@bin libexec/xscreensaver/tessellimage
@bin libexec/xscreensaver/thornbird
@bin libexec/xscreensaver/timetunnel
@bin libexec/xscreensaver/topblock
@ -215,8 +219,6 @@ libexec/xscreensaver/webcollage
@bin libexec/xscreensaver/whirlwindwarp
@bin libexec/xscreensaver/wormhole
@bin libexec/xscreensaver/xanalogtv
@bin libexec/xscreensaver/xcircuit
@bin libexec/xscreensaver/xdeco
@bin libexec/xscreensaver/xflame
@bin libexec/xscreensaver/xjack
@bin libexec/xscreensaver/xlyap
@ -260,6 +262,7 @@ libexec/xscreensaver/webcollage
@man man/man6/carousel.6
@man man/man6/ccurve.6
@man man/man6/celtic.6
@man man/man6/circuit.6
@man man/man6/cloudlife.6
@man man/man6/companioncube.6
@man man/man6/compass.6
@ -373,6 +376,7 @@ libexec/xscreensaver/webcollage
@man man/man6/polyominoes.6
@man man/man6/polytopes.6
@man man/man6/pong.6
@man man/man6/projectiveplane.6
@man man/man6/providence.6
@man man/man6/pulsar.6
@man man/man6/pyro.6
@ -409,6 +413,7 @@ libexec/xscreensaver/webcollage
@man man/man6/surfaces.6
@man man/man6/swirl.6
@man man/man6/tangram.6
@man man/man6/tessellimage.6
@man man/man6/thornbird.6
@man man/man6/timetunnel.6
@man man/man6/topblock.6
@ -425,14 +430,13 @@ libexec/xscreensaver/webcollage
@man man/man6/whirlwindwarp.6
@man man/man6/wormhole.6
@man man/man6/xanalogtv.6
@man man/man6/xcircuit.6
@man man/man6/xdeco.6
@man man/man6/xflame.6
@man man/man6/xjack.6
@man man/man6/xlyap.6
@man man/man6/xmatrix.6
@man man/man6/xrayswarm.6
@man man/man6/xscreensaver-gl-helper.6
@man man/man6/xscrensaver-deco.6
@man man/man6/xspirograph.6
@man man/man6/zoom.6
share/applications/screensavers/
@ -467,6 +471,7 @@ share/applications/screensavers/cage.desktop
share/applications/screensavers/carousel.desktop
share/applications/screensavers/ccurve.desktop
share/applications/screensavers/celtic.desktop
share/applications/screensavers/circuit.desktop
share/applications/screensavers/cloudlife.desktop
share/applications/screensavers/companioncube.desktop
share/applications/screensavers/compass.desktop
@ -482,6 +487,7 @@ share/applications/screensavers/cwaves.desktop
share/applications/screensavers/cynosure.desktop
share/applications/screensavers/dangerball.desktop
share/applications/screensavers/decayscreen.desktop
share/applications/screensavers/deco.desktop
share/applications/screensavers/deluxe.desktop
share/applications/screensavers/demon.desktop
share/applications/screensavers/discrete.desktop
@ -595,6 +601,7 @@ share/applications/screensavers/polyominoes.desktop
share/applications/screensavers/polytopes.desktop
share/applications/screensavers/pong.desktop
share/applications/screensavers/popsquares.desktop
share/applications/screensavers/projectiveplane.desktop
share/applications/screensavers/providence.desktop
share/applications/screensavers/pulsar.desktop
share/applications/screensavers/pyro.desktop
@ -636,6 +643,7 @@ share/applications/screensavers/surfaces.desktop
share/applications/screensavers/swirl.desktop
share/applications/screensavers/t3d.desktop
share/applications/screensavers/tangram.desktop
share/applications/screensavers/tessellimage.desktop
share/applications/screensavers/thornbird.desktop
share/applications/screensavers/timetunnel.desktop
share/applications/screensavers/topblock.desktop
@ -655,8 +663,6 @@ share/applications/screensavers/whirlygig.desktop
share/applications/screensavers/worm.desktop
share/applications/screensavers/wormhole.desktop
share/applications/screensavers/xanalogtv.desktop
share/applications/screensavers/xcircuit.desktop
share/applications/screensavers/xdeco.desktop
share/applications/screensavers/xflame.desktop
share/applications/screensavers/xjack.desktop
share/applications/screensavers/xlyap.desktop
@ -724,6 +730,7 @@ share/xscreensaver/config/cage.xml
share/xscreensaver/config/carousel.xml
share/xscreensaver/config/ccurve.xml
share/xscreensaver/config/celtic.xml
share/xscreensaver/config/circuit.xml
share/xscreensaver/config/cloudlife.xml
share/xscreensaver/config/companioncube.xml
share/xscreensaver/config/compass.xml
@ -738,6 +745,7 @@ share/xscreensaver/config/cwaves.xml
share/xscreensaver/config/cynosure.xml
share/xscreensaver/config/dangerball.xml
share/xscreensaver/config/decayscreen.xml
share/xscreensaver/config/deco.xml
share/xscreensaver/config/deluxe.xml
share/xscreensaver/config/demon.xml
share/xscreensaver/config/discrete.xml
@ -838,6 +846,7 @@ share/xscreensaver/config/polyominoes.xml
share/xscreensaver/config/polytopes.xml
share/xscreensaver/config/pong.xml
share/xscreensaver/config/popsquares.xml
share/xscreensaver/config/projectiveplane.xml
share/xscreensaver/config/providence.xml
share/xscreensaver/config/pulsar.xml
share/xscreensaver/config/pyro.xml
@ -874,6 +883,7 @@ share/xscreensaver/config/superquadrics.xml
share/xscreensaver/config/surfaces.xml
share/xscreensaver/config/swirl.xml
share/xscreensaver/config/tangram.xml
share/xscreensaver/config/tessellimage.xml
share/xscreensaver/config/thornbird.xml
share/xscreensaver/config/timetunnel.xml
share/xscreensaver/config/topblock.xml
@ -890,8 +900,6 @@ share/xscreensaver/config/webcollage.xml
share/xscreensaver/config/whirlwindwarp.xml
share/xscreensaver/config/wormhole.xml
share/xscreensaver/config/xanalogtv.xml
share/xscreensaver/config/xcircuit.xml
share/xscreensaver/config/xdeco.xml
share/xscreensaver/config/xflame.xml
share/xscreensaver/config/xjack.xml
share/xscreensaver/config/xlyap.xml