Tue Jul 3 18:34:05 2012 UTC ()
update to 5.17
changes:
-iOS support
-Loading images via RSS feeds is much improved
-Enlarged the texture image for lament
-bugfixes


(drochner)
diff -r1.94 -r1.95 pkgsrc/x11/xscreensaver/Makefile
diff -r1.109 -r1.110 pkgsrc/x11/xscreensaver/Makefile.common
diff -r1.61 -r1.62 pkgsrc/x11/xscreensaver/distinfo
diff -r0 -r1.1 pkgsrc/x11/xscreensaver/patches/patch-ao
cvs diff -r1.94 -r1.95 pkgsrc/x11/xscreensaver/Makefile (switch to unified diff)

--- pkgsrc/x11/xscreensaver/Makefile 2012/06/14 07:43:08 1.94
+++ pkgsrc/x11/xscreensaver/Makefile 2012/07/03 18:34:05 1.95
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.94 2012/06/14 07:43:08 sbd Exp $ 1# $NetBSD: Makefile,v 1.95 2012/07/03 18:34:05 drochner Exp $
2 2
3PKGREVISION= 1 
4COMMENT= Screen saver and locker for the X window system 3COMMENT= Screen saver and locker for the X window system
5 4
6CONFLICTS+= xscreensaver-gnome<4.14 5CONFLICTS+= xscreensaver-gnome<4.14
7 6
8PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
9 8
10.include "Makefile.common" 9.include "Makefile.common"
11.include "options.mk" 10.include "options.mk"
12.include "../../textproc/libxml2/buildlink3.mk" 11.include "../../textproc/libxml2/buildlink3.mk"
13 12
14CONFIGURE_ARGS+= --without-gtk 13CONFIGURE_ARGS+= --without-gtk
15CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 14CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
16CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config 15CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
17 16
18EGDIR= ${PREFIX}/share/examples/xscreensaver 17EGDIR= ${PREFIX}/share/examples/xscreensaver
19MESSAGE_SUBST+= EGDIR=${EGDIR:Q} 18MESSAGE_SUBST+= EGDIR=${EGDIR:Q}
20 19
21# Remove useless locale files that have no translations in them. 20# Remove useless locale files that have no translations in them.
22post-extract: 21post-extract:
23 cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po 22 cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
24 23
25INSTALLATION_DIRS= ${EGDIR}/pam.d 24INSTALLATION_DIRS= ${EGDIR}/pam.d
26 25
27post-install: 26post-install:
28 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \ 27 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
29 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD 28 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
30 29
31.include "../../x11/libXScrnSaver/buildlink3.mk" 30.include "../../x11/libXScrnSaver/buildlink3.mk"
32.include "../../x11/libXext/buildlink3.mk" 31.include "../../x11/libXext/buildlink3.mk"
33.include "../../x11/libXinerama/buildlink3.mk" 32.include "../../x11/libXinerama/buildlink3.mk"
34.include "../../x11/libXpm/buildlink3.mk" 33.include "../../x11/libXpm/buildlink3.mk"
35.include "../../x11/libXxf86misc/buildlink3.mk" 34.include "../../x11/libXxf86misc/buildlink3.mk"
36.include "../../x11/libXxf86vm/buildlink3.mk" 35.include "../../x11/libXxf86vm/buildlink3.mk"
37.include "../../x11/xextproto/buildlink3.mk" 36.include "../../x11/xextproto/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.109 -r1.110 pkgsrc/x11/xscreensaver/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/x11/xscreensaver/Attic/Makefile.common 2012/06/15 23:06:08 1.109
+++ pkgsrc/x11/xscreensaver/Attic/Makefile.common 2012/07/03 18:34:05 1.110
@@ -1,74 +1,74 @@ @@ -1,74 +1,74 @@
1# $NetBSD: Makefile.common,v 1.109 2012/06/15 23:06:08 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.110 2012/07/03 18:34:05 drochner Exp $
2# 2#
3# used by x11/xscreensaver/Makefile 3# used by x11/xscreensaver/Makefile
4# used by x11/xscreensaver-demo/Makefile 4# used by x11/xscreensaver-demo/Makefile
5 5
6# When updating the package, 6# When updating the package,
7# please check kdeartwork3 -- it installs some extra 7# please check kdeartwork3 -- it installs some extra
8# files depending on which screensavers it finds. 8# files depending on which screensavers it finds.
9DISTNAME= xscreensaver-5.15 9DISTNAME= xscreensaver-5.17
10CATEGORIES= x11 10CATEGORIES= x11
11MASTER_SITES= ${HOMEPAGE} 11MASTER_SITES= ${HOMEPAGE}
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.jwz.org/xscreensaver/ 14HOMEPAGE= http://www.jwz.org/xscreensaver/
15 15
16BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2 16BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
17 17
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_X11= yes 19USE_X11= yes
20USE_TOOLS+= msgfmt perl 20USE_TOOLS+= msgfmt perl
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver 23CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver
24CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE} 24CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE}
25CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune 25CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune
26 26
27CONFIGURE_ARGS+= --without-motif 27CONFIGURE_ARGS+= --without-motif
28 28
29CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults" 29CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
30CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}" 30CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
31CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q} 31CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
32.if defined(PKGREVISION) 32.if defined(PKGREVISION)
33CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}" 33CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
34.endif 34.endif
35CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q} 35CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
36 36
37DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo 37DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo
38PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches 38PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42PERL_VERSION_cmd= if ${TEST} -x ${PERL5}; then \ 42PERL_VERSION_cmd= if ${TEST} -x ${PERL5}; then \
43 ${PERL5} -e 'print $$]'; \ 43 ${PERL5} -e 'print $$]'; \
44 else \ 44 else \
45 ${ECHO} "5.006"; \ 45 ${ECHO} "5.006"; \
46 fi 46 fi
47 47
48.if (${OPSYS} == "NetBSD") 48.if (${OPSYS} == "NetBSD")
49. if defined(KERBEROS) 49. if defined(KERBEROS)
50CFLAGS+= -I/usr/include/kerberosIV 50CFLAGS+= -I/usr/include/kerberosIV
51. else 51. else
52CONFIGURE_ARGS+= --without-kerberos 52CONFIGURE_ARGS+= --without-kerberos
53. endif 53. endif
54.endif 54.endif
55 55
56.include "../../mk/compiler.mk" 56.include "../../mk/compiler.mk"
57.if !empty(CC_VERSION:Mgcc*) 57.if !empty(CC_VERSION:Mgcc*)
58CFLAGS+= -fno-strict-aliasing 58CFLAGS+= -fno-strict-aliasing
59.endif 59.endif
60 60
61.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 61.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
62GCC_REQD+= 2.95.3 62GCC_REQD+= 2.95.3
63.endif 63.endif
64 64
65.if !exists(/usr/bin/bc) 65.if !exists(/usr/bin/bc)
66BUILD_DEPENDS+= bc>=[0-9]*:../../math/bc 66BUILD_DEPENDS+= bc>=[0-9]*:../../math/bc
67.endif 67.endif
68 68
69INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR} 69INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR}
70 70
71.include "../../devel/gettext-lib/buildlink3.mk" 71.include "../../devel/gettext-lib/buildlink3.mk"
72.include "../../mk/jpeg.buildlink3.mk" 72.include "../../mk/jpeg.buildlink3.mk"
73.include "../../x11/libXrandr/buildlink3.mk" 73.include "../../x11/libXrandr/buildlink3.mk"
74.include "../../x11/libXt/buildlink3.mk" 74.include "../../x11/libXt/buildlink3.mk"
cvs diff -r1.61 -r1.62 pkgsrc/x11/xscreensaver/distinfo (switch to unified diff)

--- pkgsrc/x11/xscreensaver/distinfo 2011/12/07 20:09:19 1.61
+++ pkgsrc/x11/xscreensaver/distinfo 2012/07/03 18:34:05 1.62
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.61 2011/12/07 20:09:19 drochner Exp $ 1$NetBSD: distinfo,v 1.62 2012/07/03 18:34:05 drochner Exp $
2 2
3SHA1 (xscreensaver-5.15.tar.gz) = b5ce7caa19f4d57c3bac83377a36dddbe7095052 3SHA1 (xscreensaver-5.17.tar.gz) = 8cbe8d03642a7c3216030d01286b95568319d54c
4RMD160 (xscreensaver-5.15.tar.gz) = 58c7d4fae709b6500001df53e8ce27c48ae8a5b9 4RMD160 (xscreensaver-5.17.tar.gz) = eb90dcd8ec90ae8264eea2123e1a8d873d58a726
5Size (xscreensaver-5.15.tar.gz) = 5977594 bytes 5Size (xscreensaver-5.17.tar.gz) = 7238015 bytes
6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
7SHA1 (patch-ab) = a4abfe0b769d528fda56968801c49e622d2c3424 7SHA1 (patch-ab) = a4abfe0b769d528fda56968801c49e622d2c3424
8SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388 8SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388
9SHA1 (patch-ad) = 45f739d70e2b4d96f491aa35ded3c9edfb745e18 9SHA1 (patch-ad) = 45f739d70e2b4d96f491aa35ded3c9edfb745e18
10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5 12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
13SHA1 (patch-aj) = 09c06207549ab5adf286dcf04e48a900f1ea9e1e 13SHA1 (patch-aj) = 09c06207549ab5adf286dcf04e48a900f1ea9e1e
14SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1 14SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1
15SHA1 (patch-al) = c1266ddbe4e0638579cde7ec0a7308ac7c463222 15SHA1 (patch-al) = c1266ddbe4e0638579cde7ec0a7308ac7c463222
 16SHA1 (patch-ao) = 3a0cdcac612022f0551a30fff99a3b8d3b7b706e
File Added: pkgsrc/x11/xscreensaver/patches/Attic/patch-ao
$NetBSD: patch-ao,v 1.1 2012/07/03 18:34:05 drochner Exp $

--- hacks/glx/Makefile.in.orig	2012-07-02 17:27:00.000000000 +0000
+++ hacks/glx/Makefile.in
@@ -1832,7 +1832,6 @@ klein.o: $(HACK_SRC)/xlockmore.h
 lament.o: ../../config.h
 lament.o: $(HACK_SRC)/fps.h
 lament.o: $(srcdir)/gltrackball.h
-lament.o: $(HACK_SRC)/images/lament.xpm
 lament.o: $(srcdir)/jwzgles.h
 lament.o: $(srcdir)/normals.h
 lament.o: $(srcdir)/rotator.h