1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

Second try to fix the package list.

This commit is contained in:
Martin Blapp 2008-07-27 13:57:54 +00:00
parent 3419b291c5
commit 5da2d2a504
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=217662
4 changed files with 76 additions and 14 deletions

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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