diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2004-03-07 08:09:01 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2004-03-07 08:09:01 +0000 |
| commit | b94d64b3b4a837e940be02c53a5fc508ae4d80a3 (patch) | |
| tree | 95d085e846bb47240146c1649748def182c5bd44 /x11/xscreensaver | |
| parent | Upgrade to 4.15, which contains the usual assortment of minor bug fixes (diff) | |
Un-fuzz for 4.15.
Notes
Notes:
svn path=/head/; revision=103177
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/files/patch-ab | 10 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-driver_Makefile.in | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab index 38bb68934ceb..b2dc3fc43705 100644 --- a/x11/xscreensaver/files/patch-ab +++ b/x11/xscreensaver/files/patch-ab @@ -1,6 +1,6 @@ ---- configure.orig Sat Oct 25 00:47:18 2003 -+++ configure Sun Nov 9 23:11:47 2003 -@@ -2572,7 +2572,7 @@ +--- configure.orig Thu Feb 26 17:37:55 2004 ++++ configure Sat Mar 6 23:51:07 2004 +@@ -2574,7 +2574,7 @@ if test -n "$GCC"; then echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5 echo "${ECHO_T}Turning on gcc compiler warnings." >&6 @@ -9,7 +9,7 @@ OBJCC="$OBJCC -Wall" # supposedly gcc 3.4 will have "-Wdeclaration-after-statement" # and then perhaps we can do without -pedantic? -@@ -13323,7 +13323,7 @@ +@@ -13491,7 +13491,7 @@ ok="yes" pkg_check_version gtk+ 1.2 ; ac_gtk_version_string="$vers" pkg_check_version glib 1.0 @@ -18,7 +18,7 @@ have_gtk="$ok" # Now check for Gnome... -@@ -18603,13 +18603,13 @@ +@@ -19014,13 +19014,13 @@ # Now that we know whether we have Gnome, we can decide where the XML # config files get installed. # diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in index b3bb8c2f32e6..c99156da81ae 100644 --- a/x11/xscreensaver/files/patch-driver_Makefile.in +++ b/x11/xscreensaver/files/patch-driver_Makefile.in @@ -1,7 +1,7 @@ ---- driver/Makefile.in.orig Thu Aug 14 02:52:11 2003 -+++ driver/Makefile.in Sun Sep 7 16:02:47 2003 -@@ -121,7 +121,7 @@ - test-apm test-fade xdpyinfo +--- driver/Makefile.in.orig Thu Feb 26 17:37:56 2004 ++++ driver/Makefile.in Sat Mar 6 23:51:07 2004 +@@ -125,7 +125,7 @@ + test-apm test-fade test-xinerama xdpyinfo MOTIF_LIBS = @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS) -GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS) @@ -9,7 +9,7 @@ XML_LIBS = @XML_LIBS@ XDPMS_LIBS = @XDPMS_LIBS@ -@@ -219,8 +219,6 @@ +@@ -234,8 +234,6 @@ EXTRAS = README Makefile.in XScreenSaver.ad.in xscreensaver.pam \ xscreensaver-demo.glade xscreensaver-demo.glade2 \ xscreensaver-demo.glade2p \ @@ -18,7 +18,7 @@ xscreensaver.kss.in \ .gdbinit VMSFILES = compile_axp.com compile_decc.com link_axp.com link_decc.com \ -@@ -454,107 +452,6 @@ +@@ -464,107 +462,6 @@ $$e "" ;\ fi ; \ fi |