diff options
| author | fredb <fredb@pkgsrc.org> | 2000-09-10 18:00:21 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2000-09-10 18:00:21 +0000 |
| commit | a8226e45880cc9d7199de8a994d0e9fc61cff2cc (patch) | |
| tree | eb49ec716aa202425f0a6d1944c20486d7b22a62 /x11 | |
| parent | 82f7dab80578938b7a8ce8e923a90c02900cf098 (diff) | |
| download | pkgsrc-a8226e45880cc9d7199de8a994d0e9fc61cff2cc.tar.gz | |
Revert a NetBSD patch. We want this to install _over_ the xscreensaver
that ships with gnome, in order to upgrade it properly. Otherwise, trying
to handle two screensavers causes the control panel to crash frequently.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 33 |
2 files changed, 3 insertions, 34 deletions
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum index f4aad1d0a19..b65537f5d74 100644 --- a/x11/xscreensaver/files/patch-sum +++ b/x11/xscreensaver/files/patch-sum @@ -1,6 +1,6 @@ -<<<<<<< patch-sum +$NetBSD: patch-sum,v 1.16 2000/09/10 18:00:22 fredb Exp $ -MD5 (patch-aa) = 0d7fd0cc903af85f30c6a8278a46b193 +MD5 (patch-aa) = 1bcba723997c8e828a4e844b2c0e029c MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886 MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95 MD5 (patch-ad) = 9594fe6c036f69b99730170e1c6bc0c0 diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 64bb9170fee..d8f21df6b1f 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2000/07/26 18:15:04 frueauf Exp $ +$NetBSD: patch-aa,v 1.9 2000/09/10 18:00:21 fredb Exp $ --- driver/Makefile.in.orig Wed Jul 19 09:37:22 2000 +++ driver/Makefile.in Tue Jul 25 23:23:19 2000 @@ -13,37 +13,6 @@ $NetBSD: patch-aa,v 1.8 2000/07/26 18:15:04 frueauf Exp $ $(PASSWD_LIBS) CMD_LIBS = $(LIBS) $(X_LIBS) \ -@@ -328,17 +328,17 @@ - lost2="" ;\ - if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then \ - echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ -+ $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop ;\ - if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop ;\ -+ $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop ;\ - then true ;\ - else \ - lost1="$(install_prefix)$(GNOME_CCDIR)" ;\ - fi ;\ - echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(GNOME_PANELDIR)/screensaver-properties.desktop ;\ -+ $(GNOME_PANELDIR)/xscreensaver-properties.desktop ;\ - if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop ;\ -+ $(install_prefix)$(GNOME_PANELDIR)/xscreensaver-properties.desktop ;\ - then true ;\ - else \ - lost2="$(install_prefix)$(GNOME_PANELDIR)" ;\ -@@ -368,7 +368,7 @@ - - uninstall-gnome: - @if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then \ -- f=screensaver-properties.desktop ;\ -+ f=xscreensaver-properties.desktop ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ @@ -377,11 +377,11 @@ install-kde: |