- update xscreensaver to 5.03

- fix WANTLIB
- add $OpenBSD$ to patch-configure and patch-hacks_deco_c
This commit is contained in:
jasper 2007-07-18 11:26:30 +00:00
parent d6e56d0507
commit 958dd5d63e
5 changed files with 31 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.42 2007/05/18 19:11:37 martynas Exp $
# $OpenBSD: Makefile,v 1.43 2007/07/18 11:26:30 jasper Exp $
COMMENT= "screen saver and locker for the X Window System"
COMMENT= screen saver and locker for the X Window System
DISTNAME= xscreensaver-5.02
DISTNAME= xscreensaver-5.03
CATEGORIES= x11
HOMEPAGE= http://www.jwz.org/xscreensaver/
@ -13,11 +13,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= GL GLU ICE SM X11 Xext Xinerama Xmu Xrandr Xrender \
Xt Xxf86misc Xxf86vm c jpeg m pthread util z \
atk-1.0 fontconfig freetype Xpm pangocairo-1.0 \
glib-2.0 gmodule-2.0 gobject-2.0 glitz png \
pango-1.0 pangoft2-1.0 cairo
WANTLIB= GL GLU ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi \
Xinerama Xmu Xpm Xrandr Xrender Xt Xxf86misc Xxf86vm \
atk-1.0 c cairo expat fontconfig freetype glib-2.0 \
glitz gmodule-2.0 gobject-2.0 jpeg m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png pthread util z
MASTER_SITES= ${HOMEPAGE}
@ -34,9 +34,9 @@ NO_REGRESS= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
--with-x-app-defaults="${PREFIX}/lib/X11/app-defaults"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# License issues with graphics/gle necessitate this
FLAVORS= no_gle
@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --without-gle
post-install:
# rename deco to xdeco, so it doesn't conflict with misc/deco
@mv ${PREFIX}/man/man6/deco.6 ${PREFIX}/man/man6/xdeco.6
@mv ${PREFIX}/man/man6/deco.6 ${PREFIX}/man/man6/xdeco.6
@mv ${PREFIX}/libexec/xscreensaver/deco \
${PREFIX}/libexec/xscreensaver/xdeco
@mv ${PREFIX}/share/xscreensaver/config/deco.xml \

View File

@ -1,5 +1,5 @@
MD5 (xscreensaver-5.02.tar.gz) = g5N3kbMPVfUgEdT+4PXf8w==
RMD160 (xscreensaver-5.02.tar.gz) = tw/PsNSVgTSCOp/XoogpfFP+8nA=
SHA1 (xscreensaver-5.02.tar.gz) = PgL1Fu/CV1XxqJ9a85g0I/Y5+Cs=
SHA256 (xscreensaver-5.02.tar.gz) = DLfnZTGWcBwxwu5m8nb0Z72KmImnHDeK7cOx+iuOh50=
SIZE (xscreensaver-5.02.tar.gz) = 5371759
MD5 (xscreensaver-5.03.tar.gz) = NnsDlxMhAvr0PnHie73BgQ==
RMD160 (xscreensaver-5.03.tar.gz) = 8orKgpmCybmxmJ8DMJ5I/b3I4t4=
SHA1 (xscreensaver-5.03.tar.gz) = 4oOlL69hSCc6gqnlye1wxXIs3Lg=
SHA256 (xscreensaver-5.03.tar.gz) = gq0yUj9ea4yLZDGqxEdPK/3p1M9wyuyURu2QD0iIfSY=
SIZE (xscreensaver-5.03.tar.gz) = 5412089

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-configure,v 1.5 2007/07/18 11:26:30 jasper Exp $
--- configure.orig Sat Apr 21 06:33:15 2007
+++ configure Mon May 14 20:34:42 2007
@@ -10306,7 +10306,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;

View File

@ -1,3 +1,4 @@
$OpenBSD: patch-hacks_deco_c,v 1.4 2007/07/18 11:26:30 jasper Exp $
--- hacks/deco.c.orig Mon Feb 13 00:01:40 2006
+++ hacks/deco.c Mon May 14 20:34:43 2007
@@ -134,7 +134,6 @@ deco_free (Display *dpy, Window window, void *closure)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2007/01/16 10:11:53 bernd Exp $
@comment $OpenBSD: PLIST,v 1.22 2007/07/18 11:26:30 jasper Exp $
@conflict circuit-*
@mode 4755
bin/xscreensaver
@ -51,6 +51,7 @@ libexec/xscreensaver/crystal
libexec/xscreensaver/cube21
libexec/xscreensaver/cubenetic
libexec/xscreensaver/cubestorm
libexec/xscreensaver/cwaves
libexec/xscreensaver/cynosure
libexec/xscreensaver/dangerball
libexec/xscreensaver/decayscreen
@ -84,6 +85,7 @@ libexec/xscreensaver/galaxy
libexec/xscreensaver/gears
libexec/xscreensaver/gflux
libexec/xscreensaver/glblur
libexec/xscreensaver/glcells
libexec/xscreensaver/gleidescope
libexec/xscreensaver/glforestfire
libexec/xscreensaver/glhanoi
@ -126,6 +128,7 @@ libexec/xscreensaver/lissie
libexec/xscreensaver/ljlatest
libexec/xscreensaver/lmorph
libexec/xscreensaver/loop
libexec/xscreensaver/m6502
libexec/xscreensaver/maze
libexec/xscreensaver/memscroller
libexec/xscreensaver/menger
@ -201,6 +204,7 @@ libexec/xscreensaver/twang
libexec/xscreensaver/vermiculate
libexec/xscreensaver/vidwhacker
libexec/xscreensaver/vines
libexec/xscreensaver/voronoi
libexec/xscreensaver/wander
libexec/xscreensaver/webcollage
libexec/xscreensaver/webcollage-helper
@ -264,6 +268,7 @@ libexec/xscreensaver/zoom
@man man/man6/cube21.6
@man man/man6/cubenetic.6
@man man/man6/cubestorm.6
@man man/man6/cwaves.6
@man man/man6/cynosure.6
@man man/man6/dangerball.6
@man man/man6/decayscreen.6
@ -297,6 +302,7 @@ libexec/xscreensaver/zoom
@man man/man6/gears.6
@man man/man6/gflux.6
@man man/man6/glblur.6
@man man/man6/glcells.6
@man man/man6/gleidescope.6
@man man/man6/glforestfire.6
@man man/man6/glhanoi.6
@ -413,6 +419,7 @@ libexec/xscreensaver/zoom
@man man/man6/vermiculate.6
@man man/man6/vidwhacker.6
@man man/man6/vines.6
@man man/man6/voronoi.6
@man man/man6/wander.6
@man man/man6/webcollage.6
@man man/man6/whirlwindwarp.6
@ -503,6 +510,7 @@ share/xscreensaver/config/crystal.xml
share/xscreensaver/config/cube21.xml
share/xscreensaver/config/cubenetic.xml
share/xscreensaver/config/cubestorm.xml
share/xscreensaver/config/cwaves.xml
share/xscreensaver/config/cynosure.xml
share/xscreensaver/config/dangerball.xml
share/xscreensaver/config/decayscreen.xml
@ -538,6 +546,7 @@ share/xscreensaver/config/galaxy.xml
share/xscreensaver/config/gears.xml
share/xscreensaver/config/gflux.xml
share/xscreensaver/config/glblur.xml
share/xscreensaver/config/glcells.xml
share/xscreensaver/config/gleidescope.xml
share/xscreensaver/config/glforestfire.xml
share/xscreensaver/config/glhanoi.xml
@ -580,6 +589,7 @@ share/xscreensaver/config/lisa.xml
share/xscreensaver/config/lissie.xml
share/xscreensaver/config/lmorph.xml
share/xscreensaver/config/loop.xml
share/xscreensaver/config/m6502.xml
share/xscreensaver/config/maze.xml
share/xscreensaver/config/memscroller.xml
share/xscreensaver/config/menger.xml
@ -656,6 +666,7 @@ share/xscreensaver/config/twang.xml
share/xscreensaver/config/vermiculate.xml
share/xscreensaver/config/vidwhacker.xml
share/xscreensaver/config/vines.xml
share/xscreensaver/config/voronoi.xml
share/xscreensaver/config/wander.xml
share/xscreensaver/config/webcollage.xml
share/xscreensaver/config/whirlwindwarp.xml