diff options
author | drochner <drochner@pkgsrc.org> | 2010-02-11 18:16:21 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2010-02-11 18:16:21 +0000 |
commit | 82dd33e11b012eaf439eb67eaae0b41a1d2e464f (patch) | |
tree | 61f5154c095f5d8a9d5cd8ae25a831d0d6fb961c /x11 | |
parent | dc5011354c515e8f46eb792c3dc18bd5ff93f0d7 (diff) | |
download | pkgsrc-82dd33e11b012eaf439eb67eaae0b41a1d2e464f.tar.gz |
update to 5.10
changes:
-bugfixes
-Ported to MacOS 10.6, including various 64-bit fixes
-Merged juggle and juggler3d hacks
-New hack, surfaces, incorporating objects from old klein hack, plus
new ones
-New hack, rubikblocks
-Retired hypercube and hyperball, which are redundant with polytopes
-updates to various hacks
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xscreensaver/Makefile | 4 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 4 | ||||
-rw-r--r-- | x11/xscreensaver/PLIST | 17 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 10 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ac | 22 |
5 files changed, 26 insertions, 31 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index ca6e515a4f4..10aa1e2761a 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2010/01/24 13:26:13 wiz Exp $ - -PKGREVISION= 2 +# $NetBSD: Makefile,v 1.88 2010/02/11 18:16:21 drochner Exp $ COMMENT= Screen saver and locker for the X window system diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 8a08b0b725d..36fb396085a 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $ +# $NetBSD: Makefile.common,v 1.100 2010/02/11 18:16:21 drochner Exp $ # # When updating the package, # please check kdeartwork3 -- it installs some extra # files depending on which screensavers it finds. -DISTNAME= xscreensaver-5.08 +DISTNAME= xscreensaver-5.10 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index b5c04ad732d..4b07e021fdf 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2009/06/14 18:25:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.36 2010/02/11 18:16:21 drochner Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-getimage @@ -129,8 +129,6 @@ libexec/xscreensaver/config/halftone.xml libexec/xscreensaver/config/halo.xml libexec/xscreensaver/config/helix.xml libexec/xscreensaver/config/hopalong.xml -libexec/xscreensaver/config/hyperball.xml -libexec/xscreensaver/config/hypercube.xml libexec/xscreensaver/config/hypertorus.xml libexec/xscreensaver/config/hypnowheel.xml libexec/xscreensaver/config/ifs.xml @@ -140,7 +138,6 @@ libexec/xscreensaver/config/interference.xml libexec/xscreensaver/config/intermomentary.xml libexec/xscreensaver/config/jigglypuff.xml libexec/xscreensaver/config/jigsaw.xml -libexec/xscreensaver/config/juggle.xml libexec/xscreensaver/config/juggler3d.xml libexec/xscreensaver/config/julia.xml libexec/xscreensaver/config/kaleidescope.xml @@ -194,6 +191,7 @@ libexec/xscreensaver/config/rocks.xml libexec/xscreensaver/config/rorschach.xml libexec/xscreensaver/config/rotzoomer.xml libexec/xscreensaver/config/rubik.xml +libexec/xscreensaver/config/rubikblocks.xml libexec/xscreensaver/config/sballs.xml libexec/xscreensaver/config/shadebobs.xml libexec/xscreensaver/config/sierpinski.xml @@ -214,6 +212,7 @@ libexec/xscreensaver/config/stonerview.xml libexec/xscreensaver/config/strange.xml libexec/xscreensaver/config/substrate.xml libexec/xscreensaver/config/superquadrics.xml +libexec/xscreensaver/config/surfaces.xml libexec/xscreensaver/config/swirl.xml libexec/xscreensaver/config/tangram.xml libexec/xscreensaver/config/thornbird.xml @@ -293,8 +292,6 @@ libexec/xscreensaver/halftone libexec/xscreensaver/halo libexec/xscreensaver/helix libexec/xscreensaver/hopalong -libexec/xscreensaver/hyperball -libexec/xscreensaver/hypercube libexec/xscreensaver/hypertorus libexec/xscreensaver/hypnowheel libexec/xscreensaver/ifs @@ -304,7 +301,6 @@ libexec/xscreensaver/interference libexec/xscreensaver/intermomentary libexec/xscreensaver/jigglypuff libexec/xscreensaver/jigsaw -libexec/xscreensaver/juggle libexec/xscreensaver/juggler3d libexec/xscreensaver/julia libexec/xscreensaver/kaleidescope @@ -359,6 +355,7 @@ libexec/xscreensaver/rocks libexec/xscreensaver/rorschach libexec/xscreensaver/rotzoomer libexec/xscreensaver/rubik +libexec/xscreensaver/rubikblocks libexec/xscreensaver/sballs libexec/xscreensaver/shadebobs libexec/xscreensaver/sierpinski @@ -379,6 +376,7 @@ libexec/xscreensaver/stonerview libexec/xscreensaver/strange libexec/xscreensaver/substrate libexec/xscreensaver/superquadrics +libexec/xscreensaver/surfaces libexec/xscreensaver/swirl libexec/xscreensaver/tangram libexec/xscreensaver/thornbird @@ -496,8 +494,6 @@ man/man6/halftone.6 man/man6/halo.6 man/man6/helix.6 man/man6/hopalong.6 -man/man6/hyperball.6 -man/man6/hypercube.6 man/man6/hypertorus.6 man/man6/hypnowheel.6 man/man6/ifs.6 @@ -507,7 +503,6 @@ man/man6/interference.6 man/man6/intermomentary.6 man/man6/jigglypuff.6 man/man6/jigsaw.6 -man/man6/juggle.6 man/man6/juggler3d.6 man/man6/julia.6 man/man6/kaleidescope.6 @@ -560,6 +555,7 @@ man/man6/rocks.6 man/man6/rorschach.6 man/man6/rotzoomer.6 man/man6/rubik.6 +man/man6/rubikblocks.6 man/man6/sballs.6 man/man6/shadebobs.6 man/man6/sierpinski.6 @@ -580,6 +576,7 @@ man/man6/stonerview.6 man/man6/strange.6 man/man6/substrate.6 man/man6/superquadrics.6 +man/man6/surfaces.6 man/man6/swirl.6 man/man6/tangram.6 man/man6/thornbird.6 diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index c9411e12377..c85c3e5c18e 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.54 2009/01/14 13:29:15 drochner Exp $ +$NetBSD: distinfo,v 1.55 2010/02/11 18:16:22 drochner Exp $ -SHA1 (xscreensaver-5.08.tar.gz) = 4e6889d7171eaf18b856c484a87d5701787e5dc6 -RMD160 (xscreensaver-5.08.tar.gz) = f37ba887a656a4ffd14f3809de3269806271352d -Size (xscreensaver-5.08.tar.gz) = 5466460 bytes +SHA1 (xscreensaver-5.10.tar.gz) = d8379928de2e6e86cc7b17d75150daafe57e93c4 +RMD160 (xscreensaver-5.10.tar.gz) = 6c437ef89969a0bf886f27b2430b53a431146b20 +Size (xscreensaver-5.10.tar.gz) = 5561162 bytes SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f -SHA1 (patch-ac) = 5704efa8940569febc95d49eade2dca0e764f0f1 +SHA1 (patch-ac) = d575520bbe7d2ba2363a19620576b12d7110c19d SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 451f9b063d0..5875ece387e 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ +$NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $ ---- configure.orig 2008-12-28 08:59:19.000000000 +0100 +--- configure.orig 2009-09-08 04:54:40.000000000 +0000 +++ configure -@@ -3504,6 +3504,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp +@@ -3505,6 +3505,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" fi @@ -10,9 +10,9 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ +# cause build failures. +if false; then if test -n "$GCC"; then - if test -n "$GCC"; then - { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 -@@ -3554,6 +3557,7 @@ echo "${ECHO_T}Disabling C++ comments in + + case "$host" in +@@ -3565,6 +3568,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -7925,7 +7929,7 @@ _ACEOF +@@ -7936,7 +7940,7 @@ _ACEOF @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -@@ -13644,7 +13648,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -13632,7 +13636,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13731,7 +13735,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -13719,7 +13723,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp <mhat@infocalypse.netlag.com> # (who got it from amu@mit.edu) @@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -14893,7 +14897,7 @@ fi +@@ -14881,7 +14885,7 @@ fi # if test "$enable_locking" = yes ; then case "$host" in @@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ need_setuid=yes ;; esac -@@ -15327,11 +15331,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > +@@ -15315,11 +15319,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > ac_gtk_config_libs=$ac_cv_gtk_config_libs GTK_EXTRA_OBJS="" |