diff options
author | fredb <fredb> | 2003-11-14 15:05:09 +0000 |
---|---|---|
committer | fredb <fredb> | 2003-11-14 15:05:09 +0000 |
commit | a9b692f2c0dfe0bcfa3ed05c4cb4239a330fba56 (patch) | |
tree | 76c23dd029c56b995026cf3c31f3edf936f170dd | |
parent | cbc0b16ae3d831b61753d756d21d734ed02476ce (diff) | |
download | pkgsrc-a9b692f2c0dfe0bcfa3ed05c4cb4239a330fba56.tar.gz |
Make the gnome1 control-center applet work again:
- The demo now needs --crapplet to run properly in the control-center
(undoubtedly, short for "control-center applet"). ;-)
- There's no need to haphazardly install the gnome2 applet into the gnome1
directories, as the package gnome2 control-center will presumably use
the directories designated for it.
-rw-r--r-- | x11/xscreensaver-gnome/PLIST | 4 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 5 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ad | 63 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ag | 11 |
4 files changed, 74 insertions, 9 deletions
diff --git a/x11/xscreensaver-gnome/PLIST b/x11/xscreensaver-gnome/PLIST index 4706139adfa..396bb6f1394 100644 --- a/x11/xscreensaver-gnome/PLIST +++ b/x11/xscreensaver-gnome/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2003/09/08 12:11:17 wiz Exp $ +@comment $NetBSD: PLIST,v 1.16 2003/11/14 15:05:09 fredb Exp $ bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command @@ -358,7 +358,6 @@ man/man1/xteevee.1 man/man1/zoom.1 share/control-center-2.0/capplets/screensaver-properties.desktop share/control-center/Desktop/screensaver-properties.desktop -share/control-center/capplets/screensaver-properties.desktop share/control-center/screensavers/README share/control-center/screensavers/anemone.xml share/control-center/screensavers/ant.xml @@ -571,7 +570,6 @@ share/xscreensaver/xscreensaver-demo.glade2 @dirrm share/xscreensaver @comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Desktop @dirrm share/control-center/screensavers -@comment in controlcenter: @dirrm share/control-center/capplets @comment in controlcenter: @dirrm share/control-center/Desktop @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets @comment in gnome2-dirs: @dirrm share/control-center-2.0 diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 257e3c9465a..62fcbcefc03 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.29 2003/09/30 21:01:08 mycroft Exp $ +$NetBSD: distinfo,v 1.30 2003/11/14 15:05:09 fredb Exp $ SHA1 (xscreensaver-4.13.tar.gz) = 3d78b783fd1bc1e7f33fa7846fea6502217df802 Size (xscreensaver-4.13.tar.gz) = 3902864 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d SHA1 (patch-ac) = 9b82326439791ecc8e05e85a4d691109b4e50e68 -SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b +SHA1 (patch-ad) = a4683d7961c41148320a9c48de227a00cc0a1ad6 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = f1f7659e7173349868434d6dd35363e305817fd7 +SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad index f7905a92a46..8e4ac0ad066 100644 --- a/x11/xscreensaver/patches/patch-ad +++ b/x11/xscreensaver/patches/patch-ad @@ -1,8 +1,26 @@ -$NetBSD: patch-ad,v 1.8 2002/10/28 22:37:11 wiz Exp $ +$NetBSD: patch-ad,v 1.9 2003/11/14 15:05:09 fredb Exp $ ---- driver/Makefile.in.orig Fri Oct 25 23:20:06 2002 +--- driver/Makefile.in.orig 2003-09-07 19:00:00.000000000 -0500 +++ driver/Makefile.in -@@ -452,7 +452,7 @@ install-pam: +@@ -16,7 +16,7 @@ exec_prefix = @exec_prefix@ + bindir = @bindir@ + #datadir = @datadir@ + datadir = $(GNOME_DATADIR) +-localedir = $(datadir)/locale ++localedir = /usr/X11R6/share/locale + mandir = @mandir@ + mansuffix = 1 + manNdir = $(mandir)/man$(mansuffix) +@@ -39,7 +39,7 @@ CC = @CC@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + DEFS = @DEFS@ +-INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" ++INTL_DEFS = -DLOCALEDIR="\"/usr/X11R6/share/locale\"" + SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' + GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GLADE_DATADIR)"' + CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' +@@ -456,7 +456,7 @@ install-pam: fi ; \ fi @@ -11,7 +29,35 @@ $NetBSD: patch-ad,v 1.8 2002/10/28 22:37:11 wiz Exp $ @lost="" ;\ if [ "$(GNOME_DATADIR)" != "" ]; then \ \ -@@ -527,7 +527,7 @@ install-gnome:: screensaver-properties.d +@@ -464,10 +464,6 @@ install-gnome:: screensaver-properties.d + 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 ;\ + if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ +@@ -488,16 +484,6 @@ install-gnome:: screensaver-properties.d + fi ;\ + \ + echo $(INSTALL_DATA) screensaver-properties.desktop \ +- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ +- \ +- if $(INSTALL_DATA) screensaver-properties.desktop \ +- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ +- then true ;\ +- else \ +- lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ +- fi ;\ +- \ +- echo $(INSTALL_DATA) screensaver-properties.desktop \ + $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ + \ + if $(INSTALL_DATA) screensaver-properties.desktop \ +@@ -531,7 +517,7 @@ install-gnome:: screensaver-properties.d fi ;\ fi @@ -20,3 +66,12 @@ $NetBSD: patch-ad,v 1.8 2002/10/28 22:37:11 wiz Exp $ @if [ "$(GNOME_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ +@@ -630,8 +616,6 @@ uninstall-gnome:: + f=screensaver-properties.desktop ;\ + echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ + rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ +- echo rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ +- rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ + echo rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ + rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ + echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ diff --git a/x11/xscreensaver/patches/patch-ag b/x11/xscreensaver/patches/patch-ag new file mode 100644 index 00000000000..b37e2ce3d25 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ag @@ -0,0 +1,11 @@ +$NetBSD: patch-ag,v 1.1 2003/11/14 15:05:09 fredb Exp $ + +--- driver/screensaver-properties.desktop.in.orig 2003-05-20 07:24:06.000000000 -0500 ++++ driver/screensaver-properties.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Exec=xscreensaver-demo ++Exec=xscreensaver-demo --crapplet + Icon=xscreensaver.xpm + Terminal=false + _Name=Screensaver |