diff options
| author | tron <tron> | 2000-07-10 20:19:27 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-07-10 20:19:27 +0000 |
| commit | 99f5252388590ea85f485358a626c3e94262682f (patch) | |
| tree | 16122105bb28331183c790d16da439d1ef8105aa /x11/xscreensaver | |
| parent | 82478191e180dd2a409ff3474ff8e4af755865eb (diff) | |
| download | pkgsrc-99f5252388590ea85f485358a626c3e94262682f.tar.gz | |
Avoid conflict between "control-center" and "xscreensave-gnome" package.
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/files/patch-sum | 6 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 35 |
2 files changed, 36 insertions, 5 deletions
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum index 23efa1e6b08..c7f5c3fde45 100644 --- a/x11/xscreensaver/files/patch-sum +++ b/x11/xscreensaver/files/patch-sum @@ -1,3 +1,7 @@ <<<<<<< patch-sum -MD5 (patch-aa) = ee200c8710de420fcf097807d6eaa3ce +MD5 (patch-aa) = c0444fe88100cb9da17fcbfaef766615 +MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886 +MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95 +MD5 (patch-ad) = 9594fe6c036f69b99730170e1c6bc0c0 +MD5 (patch-ae) = 938371282904d5f453b608acf14eef4a diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index bfc220eeeea..1d08ed819c5 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2000/07/10 19:57:10 tron Exp $ +$NetBSD: patch-aa,v 1.7 2000/07/10 20:19:28 tron Exp $ ---- driver/Makefile.in.orig Mon Jul 10 21:54:54 2000 -+++ driver/Makefile.in Mon Jul 10 21:55:02 2000 +--- driver/Makefile.in.orig Mon Apr 3 11:04:08 2000 ++++ driver/Makefile.in Mon Jul 10 22:05:33 2000 @@ -140,8 +140,8 @@ DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS) @@ -13,7 +13,34 @@ $NetBSD: patch-aa,v 1.6 2000/07/10 19:57:10 tron Exp $ $(PASSWD_LIBS) CMD_LIBS = $(LIBS) $(X_LIBS) \ -@@ -344,11 +344,11 @@ +@@ -325,30 +325,30 @@ + install-gnome: screensaver-properties.desktop + @if [ "$(GNOME_DATADIR)" != "" ]; then \ + echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(GNOME_CCDIR)/screensaver-properties.desktop ; \ ++ $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(GNOME_CCDIR)/screensaver-properties.desktop ; \ ++ $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ + echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ ++ $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ ++ $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ + fi + + uninstall-gnome: + @if [ "$(GNOME_DATADIR)" != "" ]; then \ +- echo rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \ +- rm -f $(GNOME_CCDIR)/screensaver-properties.desktop ; \ +- echo rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ +- rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop ; \ ++ echo rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ ++ rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop ; \ ++ echo rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ ++ rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop ; \ + fi install-kde: @src="$(srcdir)/xscreensaver.kss" ; \ |