Author: pebender
Date: Sat Aug 30 06:30:09 2008
New Revision: 3663
Added:
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07.patch.gar
Removed:
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.06.patch.gar
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/X11/xscreensaver/Makefile
trunk/gar-minimyth/script/X11/xscreensaver/checksums
Log:
- Updated package
X11/xscreensaver
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Aug 30
06:30:09 2008
@@ -95,6 +95,7 @@
Updated utils/mktemp.
Updated utils/squashfs.
Updated utils/which.
+ Updated X11/xscreensaver.
--------------------------------------------------------------------------------
Changes since 56 (2008-08-06):
Modified: trunk/gar-minimyth/script/X11/xscreensaver/Makefile
==============================================================================
--- trunk/gar-minimyth/script/X11/xscreensaver/Makefile (original)
+++ trunk/gar-minimyth/script/X11/xscreensaver/Makefile Sat Aug 30 06:30:09
2008
@@ -1,5 +1,5 @@
GARNAME = xscreensaver
-GARVERSION = 5.06
+GARVERSION = 5.07
CATEGORIES = X11
MASTER_SITES = http://www.jwz.org/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
Modified: trunk/gar-minimyth/script/X11/xscreensaver/checksums
==============================================================================
--- trunk/gar-minimyth/script/X11/xscreensaver/checksums (original)
+++ trunk/gar-minimyth/script/X11/xscreensaver/checksums Sat Aug 30
06:30:09 2008
@@ -1,2 +1,2 @@
-c6b2cab02aaea32684d37a9a76488e0f download/xscreensaver-5.06.tar.gz
-2638e3b104ade9cd022fb21b1f18efe9 download/xscreensaver-5.06.patch.gar
+55a12fcb5d3a7231c9850ef9d9f82918 download/xscreensaver-5.07.tar.gz
+b8dfb76ee537414656dec5c93c309f63 download/xscreensaver-5.07.patch.gar
Added:
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/X11/xscreensaver/files/xscreensaver-5.07.patch.gar
Sat Aug 30 06:30:09 2008
@@ -0,0 +1,154 @@
+diff -Naur xscreensaver-5.07-old/configure.in
xscreensaver-5.07-new/configure.in
+--- xscreensaver-5.07-old/configure.in 2008-08-03 10:57:17.000000000 -0700
++++ xscreensaver-5.07-new/configure.in 2008-08-29 20:54:36.000000000 -0700
+@@ -346,10 +346,9 @@
+ OBJCC="$CC"
+
+ AC_MSG_CHECKING([whether the compiler works on ANSI C])
+- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
++ AC_COMPILE_IFELSE([ main(int ac, char **av) { return 0; } ],
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no)
+- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check
CC.),
+ AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check
CC.))
+
+ if test -n "$GCC"; then
+@@ -952,9 +951,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+@@ -964,9 +960,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+@@ -976,9 +969,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+@@ -993,15 +983,9 @@
+ ac_save_LDFLAGS="$LDFLAGS"
+ # ac_save_LIBS="$LIBS"
+
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ # note: $X_CFLAGS includes $x_includes
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+- if test \! -z "$libdir" ; then
+- LDFLAGS="$LDFLAGS -L$libdir"
+- fi
+ # note: $X_LIBS includes $x_libraries
+ LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
+
+@@ -1018,9 +1002,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_RUN([$1], [$2], [$3], [$4])
+@@ -1052,7 +1033,6 @@
+ AC_MSG_CHECKING([for [$3] headers])
+ d=$[$1]/include
+ if test -d $d; then
+- X_CFLAGS="-I$d $X_CFLAGS"
+ AC_MSG_RESULT($d)
+ else
+ AC_MSG_RESULT(not found ($d: no such directory))
+@@ -1061,7 +1041,6 @@
+ AC_MSG_CHECKING([for [$3] libs])
+ d=$[$1]/lib
+ if test -d $d; then
+- X_LIBS="-L$d $X_LIBS"
+ AC_MSG_RESULT($d)
+ else
+ AC_MSG_RESULT(not found ($d: no such directory))
+@@ -2831,9 +2810,6 @@
+ EOF
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+ mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep
configure:`
+@@ -3516,14 +3492,6 @@
+ DEPEND_DEFINES=
+
+
+-if test \! -z "$includedir" ; then
+- INCLUDES="$INCLUDES -I$includedir"
+-fi
+-
+-if test \! -z "$libdir" ; then
+- LDFLAGS="$LDFLAGS -L$libdir"
+-fi
+-
+
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
+@@ -4174,7 +4142,7 @@
+ changequote(X,Y)
+ rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+ sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+- head -1`
++ head -n 1`
+ changequote([,])
+
+ if test \! -z "$rpmv" ; then
+diff -Naur xscreensaver-5.07-old/driver/Makefile.in
xscreensaver-5.07-new/driver/Makefile.in
+--- xscreensaver-5.07-old/driver/Makefile.in 2008-08-10 22:11:59.000000000
-0700
++++ xscreensaver-5.07-new/driver/Makefile.in 2008-08-29 20:54:36.000000000
-0700
+@@ -347,7 +347,7 @@
+
+ munge-scripts: $(SCRIPTS)
+ @tmp=/tmp/mf.$$$$ ; \
+- perl="${PERL}" ; \
++ perl="@GAR_bindir@/perl" ; \
+ rm -f $$tmp ; \
+ for program in $(SCRIPTS); do \
+ sed "[EMAIL PROTECTED](#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)[EMAIL
PROTECTED]@" \
+@@ -417,7 +417,7 @@
+ dest=`sed -n 's/.*PAM_SERVICE_NAME[ ]*"\([^"]*\)".*$$/\1/p' \
+ < ../config.h` ; \
+ dir="$(install_prefix)$(PAM_DIR)" ; \
+- conf="$(PAM_CONF)" ; \
++ conf="$(install_prefix)$(PAM_CONF)" ; \
+ \
+ if [ -d $$dir ] ; then \
+ \
+diff -Naur xscreensaver-5.07-old/hacks/Makefile.in
xscreensaver-5.07-new/hacks/Makefile.in
+--- xscreensaver-5.07-old/hacks/Makefile.in 2008-08-10 22:11:59.000000000
-0700
++++ xscreensaver-5.07-new/hacks/Makefile.in 2008-08-29 20:54:36.000000000
-0700
+@@ -308,7 +308,7 @@
+
+ munge-scripts: $(SCRIPTS)
+ @tmp=/tmp/mf.$$$$ ; \
+- perl="${PERL}" ; \
++ perl="@GAR_bindir@/perl" ; \
+ rm -f $$tmp ; \
+ for program in $(SCRIPTS); do \
+ sed "[EMAIL PROTECTED](#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)[EMAIL
PROTECTED]@" \
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
