Date: Tue, 24 Mar 2009 11:55:12 GMT From: Hiroto Kagotani <hiroto.kagotani@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132999: emulators/open-vm-tools: Unbreak WITH/WITHOUT_X11 Message-ID: <200903241155.n2OBtCYc073231@www.freebsd.org> Resent-Message-ID: <200903241200.n2OC08pR076240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132999
>Category: ports
>Synopsis: emulators/open-vm-tools: Unbreak WITH/WITHOUT_X11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 24 12:00:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Hiroto Kagotani
>Release: 7.1-RELEASE
>Organization:
>Environment:
FreeBSD myhost.mydomain 7.1-RELEASE-p4 FreeBSD 7.1-RELEASE-p4 #0: Sun Mar 22 12:35:36 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Fix PLIST for both with and without X11.
Fix some configure/build errors with WITH_UNITY option.
Eliminate use of LIB32DIR because no i386 binary is included in the distfile.
And unbreak.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru /tmp/open-vm-tools/Makefile ./Makefile
--- /tmp/open-vm-tools/Makefile 2009-03-22 18:52:19.000000000 +0900
+++ ./Makefile 2009-03-24 20:24:06.000000000 +0900
@@ -26,22 +26,23 @@
CONFIGURE_ARGS+= --without-x --without-gtk2 --without-gtkmm
PLIST_SUB+= X11="@comment "
CONFLICTS= open-vm-tools-[0-9]*
-BROKEN= bad plist
.else
.if !defined(WITHOUT_LIBNOTIFY)
LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
.endif
-.if !defined(WITH_UNITY)
+.if defined(WITH_UNITY)
+CONFIGURE_ENV+= CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
+LIB_DEPENDS+= uriparser.1:${PORTSDIR}/net/uriparser
+.else
CONFIGURE_ARGS+= --disable-unity
.endif
CONFIGURE_ARGS+= --with-x --without-gtkmm
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
USE_XORG= x11 ice xineramaproto xinerama xrandr xtst
USE_GNOME= gtk20 glib20
PLIST_SUB+= X11=""
CONFLICTS= open-vm-tools-nox11-[0-9]*
-BROKEN= does not configure
.endif
CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]*
@@ -67,21 +68,17 @@
IGNORE= not yet ported to sparc64
.endif
-PLIST_SUB+= LIB32DIR=${LIB32DIR}
-
-SUB_LIST+= LIB32DIR=${LIB32DIR}
-
post-build:
(cd ${WRKSRC}/modules && ${MAKE})
post-install:
- ${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers
- ${MKDIR} ${PREFIX}/${LIB32DIR}/vmware-tools/modules/input
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmmemctl.ko
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmxnet.ko
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmhgfs.ko
- ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers/vmblock.ko
- @-kldxref ${PREFIX}/${LIB32DIR}/vmware-tools/modules/drivers 2>/dev/null
+ ${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers
+ ${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
+ ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
+ ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
+ ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
+ ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
+ @-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -Nru /tmp/open-vm-tools/files/patch-appUtil.h ./files/patch-appUtil.h
--- /tmp/open-vm-tools/files/patch-appUtil.h 1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-appUtil.h 2009-03-24 19:25:17.000000000 +0900
@@ -0,0 +1,11 @@
+--- lib/include/appUtil.h.orig 2009-03-24 19:24:50.000000000 +0900
++++ lib/include/appUtil.h 2009-03-24 19:24:20.000000000 +0900
+@@ -69,7 +69,7 @@
+
+ #endif //_WIN32
+
+-#if defined(linux)
++#if defined(linux) || defined(__FreeBSD__)
+ #include <glib.h>
+
+ void AppUtil_Init(void);
diff -Nru /tmp/open-vm-tools/files/patch-appUtilX11.c ./files/patch-appUtilX11.c
--- /tmp/open-vm-tools/files/patch-appUtilX11.c 1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-appUtilX11.c 2009-03-24 19:10:12.000000000 +0900
@@ -0,0 +1,12 @@
+--- ./lib/appUtil/appUtilX11.c.orig 2009-02-18 17:02:41.000000000 +0900
++++ ./lib/appUtil/appUtilX11.c 2009-03-24 18:54:18.000000000 +0900
+@@ -26,6 +26,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#if defined(__FreeBSD__)
++#include <libgen.h>
++#endif
+
+ #include "vmware.h"
+ #include "str.h"
diff -Nru /tmp/open-vm-tools/files/patch-ghIntegrationX11.c ./files/patch-ghIntegrationX11.c
--- /tmp/open-vm-tools/files/patch-ghIntegrationX11.c 1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-ghIntegrationX11.c 2009-03-24 19:19:34.000000000 +0900
@@ -0,0 +1,12 @@
+--- lib/ghIntegration/ghIntegrationX11.c.orig 2009-02-18 17:02:42.000000000 +0900
++++ lib/ghIntegration/ghIntegrationX11.c 2009-03-24 19:18:47.000000000 +0900
+@@ -62,7 +62,9 @@
+ #include "imageUtil.h"
+ #include "strutil.h"
+ #include <paths.h>
++#if defined(linux)
+ #include <mntent.h>
++#endif
+ #include "vm_atomic.h"
+ #include "ghIntegration.h"
+ #include "ghIntegrationInt.h"
diff -Nru /tmp/open-vm-tools/files/vmware-kmod.sh.in ./files/vmware-kmod.sh.in
--- /tmp/open-vm-tools/files/vmware-kmod.sh.in 2009-01-06 04:43:58.000000000 +0900
+++ ./files/vmware-kmod.sh.in 2009-03-24 20:30:55.000000000 +0900
@@ -16,22 +16,22 @@
vmware_guest_vmmemctl_start()
{
echo 'Loading vmmemctl kernel module.'
- kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
}
vmware_guest_vmxnet_start()
{
echo 'Loading vmxnet kernel module.'
- kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
}
vmware_guest_vmblock_start()
{
echo 'Loading vmblock kernel module.'
- kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
}
vmware_guest_vmhgfs_start()
{
echo 'Loading vmhgfs kernel module.'
- kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
}
# VMware kernel module: vmmemctl
diff -Nru /tmp/open-vm-tools/pkg-plist ./pkg-plist
--- /tmp/open-vm-tools/pkg-plist 2009-03-04 08:26:15.000000000 +0900
+++ ./pkg-plist 2009-03-24 20:26:53.000000000 +0900
@@ -3,55 +3,55 @@
bin/vmware-xferlogs
bin/vmtoolsd
bin/vmware-toolbox-cmd
+bin/vmware-vmblock-fuse
etc/vmware-tools/tools.conf
-etc/vmware-tools/plugins/vmsvc/libguestInfo.so
-etc/vmware-tools/plugins/vmsvc/libhgfsServer.so
-etc/vmware-tools/plugins/vmsvc/libpowerOps.so
-etc/vmware-tools/plugins/vmsvc/libtimeSync.so
-etc/vmware-tools/plugins/vmsvc/libvix.so
-etc/vmware-tools/plugins/vmsvc/libvmbackup.so
-%%LIB32DIR%%/libvmtools.a
-%%LIB32DIR%%/libvmtools.la
-%%LIB32DIR%%/libvmtools.so
-%%LIB32DIR%%/libvmtools.so.0
-%%LIB32DIR%%/libguestlib.a
-%%LIB32DIR%%/libguestlib.la
-%%LIB32DIR%%/libguestlib.so
-%%LIB32DIR%%/libguestlib.so.0
-%%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko
-%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko
+lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so
+lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+lib/open-vm-tools/plugins/vmsvc/libvix.so
+lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libhgfsServer.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libvix.so
+%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
+lib/libvmtools.a
+lib/libvmtools.la
+lib/libvmtools.so
+lib/libvmtools.so.0
+lib/libguestlib.a
+lib/libguestlib.la
+lib/libguestlib.so
+lib/libguestlib.so.0
+lib/vmware-tools/modules/drivers/linker.hints
+lib/vmware-tools/modules/drivers/vmblock.ko
+lib/vmware-tools/modules/drivers/vmhgfs.ko
+lib/vmware-tools/modules/drivers/vmmemctl.ko
+lib/vmware-tools/modules/drivers/vmxnet.ko
+@exec mkdir -p %D/lib/vmware-tools/modules/input
sbin/mount_vmhgfs
sbin/vmware-guestd
%%X11%%bin/vmware-toolbox
%%X11%%bin/vmware-user
-%%X11%%share/applications/vmware-toolbox.desktop
+%%X11%%bin/vmware-user-suid-wrapper
%%X11%%share/applications/vmware-user.desktop
-%%X11%%share/pixmaps/vmware/vmware-toolbox.xpm
share/vmware-tools/poweroff-vm-default
share/vmware-tools/poweron-vm-default
share/vmware-tools/resume-vm-default
share/vmware-tools/suspend-vm-default
share/vmware-tools/vm-support
-@exec kldxref %%LIB32DIR%%/vmware-tools/modules/drivers 2>/dev/null || true
+@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
@unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
@unexec if test -h %D/etc/vmware-tools/plugins; then rm -f %D/etc/vmware-tools/plugins; fi
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules/input
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules/drivers
-@dirrmtry %%LIB32DIR%%/vmware-tools/modules
-@dirrmtry %%LIB32DIR%%/vmware-tools/plugins
-@dirrmtry %%LIB32DIR%%/vmware-tools
-%%X11%%@dirrm share/pixmaps/vmware
-@dirrmtry etc/vmware-tools/plugins/vmsvc
-@dirrmtry etc/vmware-tools/plugins
+@dirrmtry lib/vmware-tools/modules/drivers
+@dirrmtry lib/vmware-tools/modules/input
+@dirrmtry lib/vmware-tools/modules
+@dirrmtry lib/vmware-tools
@dirrmtry etc/vmware-tools
-@dirrmtry etc/open-vm-tools/plugins
-@dirrmtry etc/open-vm-tools
@dirrmtry share/vmware-tools
%%X11%%@dirrmtry share/applications
-@dirrm %%LIB32DIR%%/open-vm-tools/plugins/vmsvc
-@dirrm %%LIB32DIR%%/open-vm-tools/plugins
-@dirrm %%LIB32DIR%%/open-vm-tools
+@dirrm lib/open-vm-tools/plugins/vmsvc
+%%X11%%@dirrm lib/open-vm-tools/plugins/vmusr
+@dirrm lib/open-vm-tools/plugins
+@dirrm lib/open-vm-tools
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903241155.n2OBtCYc073231>