diff options
| author | fredb <fredb> | 2002-03-01 07:36:05 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-03-01 07:36:05 +0000 |
| commit | 04220e62f31ed874ba9c483420e36732aaa4fa17 (patch) | |
| tree | 57c5d99f0b1412cb450cc79ce194db634fdbbe9f /x11/xscreensaver | |
| parent | 8678afb086123dcb40db042ade0f57fbddcdd6e4 (diff) | |
| download | pkgsrc-04220e62f31ed874ba9c483420e36732aaa4fa17.tar.gz | |
Don't install the gnome control panel twice -- that's ugly.
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/distinfo | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 34 |
2 files changed, 33 insertions, 5 deletions
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index e7798ad0e22..825e393ad0b 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2002/03/01 06:46:49 fredb Exp $ +$NetBSD: distinfo,v 1.12 2002/03/01 07:36:05 fredb Exp $ SHA1 (xscreensaver-4.01.tar.gz) = 09f087d653c9c8d6b3777aa3f348c5e2f7217686 Size (xscreensaver-4.01.tar.gz) = 2156101 bytes SHA1 (patch-aa) = f2c8ac0ffeb0f8aab546362caf3084bcfc31309a SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30 -SHA1 (patch-ac) = 0408f5f6ddf3ea80a981c223ab41f7464c4e1357 +SHA1 (patch-ac) = 280c0bb061926fe5dad5b23e1a0c938dedc2cb35 SHA1 (patch-ad) = e245611bfd7de949a788fe38f9bcc99b52f286c7 SHA1 (patch-ae) = c3e7ddffb2caab5c545b0834c93238455852dea6 diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index a82714d583e..3592069879e 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,36 @@ -$NetBSD: patch-ac,v 1.4 2002/02/24 21:42:56 wiz Exp $ +$NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $ ---- driver/Makefile.in.orig Sun Feb 24 18:19:18 2002 +--- driver/Makefile.in.orig Sun Feb 24 03:56:29 2002 +++ driver/Makefile.in -@@ -762,7 +762,7 @@ +@@ -433,10 +433,6 @@ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ + fi ;\ +- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \ +- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ +- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ +- fi ;\ + \ + echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ + $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ +@@ -448,16 +444,6 @@ + lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)" ;\ + fi ;\ + \ +- echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop ;\ +- \ +- if $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ +- $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop ;\ +- then true ;\ +- else \ +- lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ +- fi ;\ +- \ + if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ +@@ -762,7 +748,7 @@ xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ |