From 5da2d2a50402c124adb0e3274f08a9b969cdc460 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sun, 27 Jul 2008 13:57:54 +0000 Subject: Second try to fix the package list. --- .../open-vm-tools/files/patch-guestd-Makefile | 31 ++++++++++++++++++ .../open-vm-tools/files/patch-toolbox-Makefile | 38 ++++++++++++++++------ emulators/open-vm-tools/pkg-plist | 8 +++-- emulators/open-vm-tools/pkg-plist-x11 | 13 ++++++-- 4 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 emulators/open-vm-tools/files/patch-guestd-Makefile diff --git a/emulators/open-vm-tools/files/patch-guestd-Makefile b/emulators/open-vm-tools/files/patch-guestd-Makefile new file mode 100644 index 000000000000..371e168bd631 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-guestd-Makefile @@ -0,0 +1,31 @@ +--- guestd/Makefile.am.orig 2008-07-02 00:31:19.000000000 +0200 ++++ guestd/Makefile.am 2008-07-27 15:48:03.000000000 +0200 +@@ -96,8 +96,8 @@ + endif LINUX + + install-exec-hook: +- $(INSTALL) -d /etc/vmware-tools +- echo 'disable-tools-version = "true"' > /etc/vmware-tools/tools.conf ++ $(INSTALL) -d $(prefix)/etc/vmware-tools ++ echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf + + uninstall-hook: +- $(RM) -rf /etc/vmware-tools ++ $(RM) -rf $(prefix)/etc/vmware-tools +--- guestd/Makefile.in.orig 2008-07-02 00:31:30.000000000 +0200 ++++ guestd/Makefile.in 2008-07-27 15:47:54.000000000 +0200 +@@ -605,11 +605,11 @@ + + + install-exec-hook: +- $(INSTALL) -d /etc/vmware-tools +- echo 'disable-tools-version = "true"' > /etc/vmware-tools/tools.conf ++ $(INSTALL) -d $(prefix)/etc/vmware-tools ++ echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf + + uninstall-hook: +- $(RM) -rf /etc/vmware-tools ++ $(RM) -rf $(prefix)/etc/vmware-tools + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/emulators/open-vm-tools/files/patch-toolbox-Makefile b/emulators/open-vm-tools/files/patch-toolbox-Makefile index ba289e0550d7..1f3daf47ee1a 100644 --- a/emulators/open-vm-tools/files/patch-toolbox-Makefile +++ b/emulators/open-vm-tools/files/patch-toolbox-Makefile @@ -1,22 +1,40 @@ ---- toolbox/Makefile.in.orig 2008-07-08 15:03:02.000000000 +0200 -+++ toolbox/Makefile.in 2008-07-08 15:03:49.000000000 +0200 -@@ -551,7 +551,7 @@ +--- toolbox/Makefile.in.orig 2008-07-02 00:31:34.000000000 +0200 ++++ toolbox/Makefile.in 2008-07-27 15:13:21.000000000 +0200 +@@ -551,14 +551,14 @@ $(INSTALL) -d $(datadir)/applications/ $(INSTALL) -m 644 ../scripts/common/vmware-toolbox.desktop \ $(datadir)/applications/ - $(SED) -i s/Exec=.*/Exec=vmware-toolbox/ \ -+ $(SED) -e s/Exec=.*/Exec=vmware-toolbox/ \ ++ $(SED) -i '' s/Exec=.*/Exec=vmware-toolbox/ \ $(datadir)/applications/vmware-toolbox.desktop - $(INSTALL) -d /usr/share/pixmaps/vmware +- $(INSTALL) -d /usr/share/pixmaps/vmware ++ $(INSTALL) -d $(datadir)/pixmaps/vmware $(INSTALL) -m 644 bigIcon.xpm \ ---- toolbox/Makefile.am.orig 2008-07-08 15:03:10.000000000 +0200 -+++ toolbox/Makefile.am 2008-07-08 15:03:56.000000000 +0200 -@@ -65,7 +65,7 @@ +- /usr/share/pixmaps/vmware/vmware-toolbox.xpm ++ $(datadir)/pixmaps/vmware/vmware-toolbox.xpm + uninstall-hook: + -$(RM) -f $(datadir)/share/applications/vmware-toolbox.desktop +- -$(RM) -rf /usr/share/pixmaps/vmware ++ -$(RM) -rf $(datadir)/pixmaps/vmware + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +--- toolbox/Makefile.am.orig 2008-07-02 00:31:20.000000000 +0200 ++++ toolbox/Makefile.am 2008-07-27 15:13:02.000000000 +0200 +@@ -65,11 +65,11 @@ $(INSTALL) -d $(datadir)/applications/ $(INSTALL) -m 644 ../scripts/common/vmware-toolbox.desktop \ $(datadir)/applications/ - $(SED) -i s/Exec=.*/Exec=vmware-toolbox/ \ -+ $(SED) -e s/Exec=.*/Exec=vmware-toolbox/ \ ++ $(SED) -i '' s/Exec=.*/Exec=vmware-toolbox/ \ $(datadir)/applications/vmware-toolbox.desktop - $(INSTALL) -d /usr/share/pixmaps/vmware +- $(INSTALL) -d /usr/share/pixmaps/vmware ++ $(INSTALL) -d $(datadir)/pixmaps/vmware $(INSTALL) -m 644 bigIcon.xpm \ +- /usr/share/pixmaps/vmware/vmware-toolbox.xpm ++ $(datadir)/pixmaps/vmware/vmware-toolbox.xpm + uninstall-hook: +- -$(RM) -f $(datadir)/share/applications/vmware-toolbox.desktop +- -$(RM) -rf /usr/share/pixmaps/vmware ++ -$(RM) -f $(datadir)/applications/vmware-toolbox.desktop ++ -$(RM) -rf $(datadir)/pixmaps/vmware diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist index f5640d65b909..e001f9d30b53 100644 --- a/emulators/open-vm-tools/pkg-plist +++ b/emulators/open-vm-tools/pkg-plist @@ -12,15 +12,19 @@ share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default share/vmware-tools/vm-support -sbin/vmware-guestd +bin/vmware-guestd bin/vmware-checkvm bin/vmware-xferlogs bin/vmware-hgfsclient +etc/vmware-tools/tools.conf %%FIVEONLY%%sbin/mount_vmhgfs -@dirrm share/vmware-tools @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi @dirrmtry lib/vmware-tools/modules/drivers @dirrmtry lib/vmware-tools/modules/input @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi @dirrmtry lib/vmware-tools/modules @dirrmtry lib/vmware-tools +@dirrmtry etc/vmware-tools +@dirrmtry share/vmware-tools +@dirrmtry share/applications +@dirrmtry share/pixmaps diff --git a/emulators/open-vm-tools/pkg-plist-x11 b/emulators/open-vm-tools/pkg-plist-x11 index 88fa659d8bca..26afadd398f3 100644 --- a/emulators/open-vm-tools/pkg-plist-x11 +++ b/emulators/open-vm-tools/pkg-plist-x11 @@ -12,17 +12,26 @@ share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default share/vmware-tools/vm-support -sbin/vmware-guestd +share/pixmaps/vmware/vmware-toolbox.xpm +bin/vmware-guestd +bin/vmware-toolbox +bin/vmware-user bin/vmware-checkvm bin/vmware-xferlogs bin/vmware-hgfsclient +etc/vmware-tools/tools.conf %%FIVEONLY%%sbin/mount_vmhgfs %%X11%%sbin/vmware-toolbox %%X11%%sbin/vmware-user -@dirrm share/vmware-tools +share/applications/vmware-user.desktop +share/applications/vmware-toolbox.desktop @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi @dirrmtry lib/vmware-tools/modules/drivers @dirrmtry lib/vmware-tools/modules/input @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi @dirrmtry lib/vmware-tools/modules @dirrmtry lib/vmware-tools +@dirrmtry etc/vmware-tools +@dirrmtry share/vmware-tools +@dirrmtry share/applications +@dirrmtry share/pixmaps -- cgit v1.2.3