summaryrefslogtreecommitdiff
path: root/x11/xscreensaver
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2000-07-10 19:57:10 +0000
committertron <tron@pkgsrc.org>2000-07-10 19:57:10 +0000
commitd95f7bcbca538f71a508524fea0ee9a2c2953e2e (patch)
tree442eaaa8458c07fbfd50b053bc7cf7c4013456fd /x11/xscreensaver
parentf77a400677c78f058f076c87587a7e4d2d718931 (diff)
downloadpkgsrc-d95f7bcbca538f71a508524fea0ee9a2c2953e2e.tar.gz
Properly merge "patch-aa" and "patch-af".
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r--x11/xscreensaver/files/patch-sum6
-rw-r--r--x11/xscreensaver/patches/patch-aa17
2 files changed, 16 insertions, 7 deletions
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum
index d1ceabc7835..23efa1e6b08 100644
--- a/x11/xscreensaver/files/patch-sum
+++ b/x11/xscreensaver/files/patch-sum
@@ -1,7 +1,3 @@
<<<<<<< patch-sum
-MD5 (patch-aa) = 37b5010ad229bc8e227d47241658ed20
-MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886
-MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95
-MD5 (patch-ad) = 9594fe6c036f69b99730170e1c6bc0c0
-MD5 (patch-ae) = 938371282904d5f453b608acf14eef4a
+MD5 (patch-aa) = ee200c8710de420fcf097807d6eaa3ce
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 84370208298..bfc220eeeea 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,5 +1,18 @@
---- driver/Makefile.in.orig Mon Jul 10 21:39:55 2000
-+++ driver/Makefile.in Mon Jul 10 21:39:57 2000
+$NetBSD: patch-aa,v 1.6 2000/07/10 19:57:10 tron Exp $
+
+--- driver/Makefile.in.orig Mon Jul 10 21:54:54 2000
++++ driver/Makefile.in Mon Jul 10 21:55:02 2000
+@@ -140,8 +140,8 @@
+ DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS)
+ DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS)
+
+-SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \
+- $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
++SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) -lXt \
++ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \
+ $(PASSWD_LIBS)
+
+ CMD_LIBS = $(LIBS) $(X_LIBS) \
@@ -344,11 +344,11 @@
install-kde: