View | Details | Raw Unified | Return to bug 180471
Collapse All | Expand All

(-)open-vm-tools/Makefile (-9 / +3 lines)
Lines 6-12 Link Here
6
PORTREVISION=		3
6
PORTREVISION=		3
7
PORTEPOCH=		1
7
PORTEPOCH=		1
8
CATEGORIES=		emulators kld
8
CATEGORIES=		emulators kld
9
MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
9
MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
10
DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
10
DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
11
11
12
MAINTAINER=		swills@FreeBSD.org
12
MAINTAINER=		swills@FreeBSD.org
Lines 15-22 Link Here
15
LICENSE=		LGPL21
15
LICENSE=		LGPL21
16
LICENSE_FILE=		${WRKSRC}/COPYING
16
LICENSE_FILE=		${WRKSRC}/COPYING
17
17
18
RELEASE_VER=		8.6.0
18
RELEASE_VER=		9.2.3
19
BUILD_VER=		425873
19
BUILD_VER=		1031360
20
20
21
WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
21
WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
22
GNU_CONFIGURE=		yes
22
GNU_CONFIGURE=		yes
Lines 34-45 Link Here
34
.if !defined(WITHOUT_LIBNOTIFY)
34
.if !defined(WITHOUT_LIBNOTIFY)
35
LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
35
LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
36
.endif
36
.endif
37
.if defined(WITH_UNITY)
38
CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
39
LIB_DEPENDS+=		uriparser.1:${PORTSDIR}/net/uriparser
40
.else
41
CONFIGURE_ARGS+=	--disable-unity
42
.endif
43
LIB_DEPENDS+=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
37
LIB_DEPENDS+=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
44
CONFIGURE_ARGS+=	--with-x
38
CONFIGURE_ARGS+=	--with-x
45
LDFLAGS+=		-L${LOCALBASE}/lib
39
LDFLAGS+=		-L${LOCALBASE}/lib
(-)open-vm-tools/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
1
SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
2
SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
2
SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935
(-)open-vm-tools/files/patch-appUtilX11.c (-12 lines)
Lines 1-12 Link Here
1
--- ./lib/appUtil/appUtilX11.c.orig	2009-02-18 17:02:41.000000000 +0900
2
+++ ./lib/appUtil/appUtilX11.c	2009-03-24 18:54:18.000000000 +0900
3
@@ -26,6 +26,9 @@
4
 #include <stdlib.h>
5
 #include <string.h>
6
 #include <unistd.h>
7
+#if defined(__FreeBSD__)
8
+#include <libgen.h>
9
+#endif
10
 
11
 #include "vmware.h"
12
 #include "str.h"
(-)open-vm-tools/files/patch-freebsd-9 (-38 lines)
Lines 1-38 Link Here
1
--- modules/freebsd/vmxnet/if_vxn.c.orig	2009-12-31 09:34:42.000000000 +0100
2
+++ modules/freebsd/vmxnet/if_vxn.c	2009-12-31 09:36:56.000000000 +0100
3
@@ -134,7 +134,9 @@
4
 static void vxn_init(void *);
5
 static void vxn_start(struct ifnet *);
6
 static int vxn_ioctl(struct ifnet *, u_long, caddr_t);
7
+#if __FreeBSD_version <= 900000
8
 static void vxn_watchdog(struct ifnet *);
9
+#endif
10
 static void vxn_intr (void *);
11
 
12
 static void vxn_rx(vxn_softc_t *sc);
13
@@ -383,7 +385,9 @@
14
    ifp->if_ioctl = vxn_ioctl;
15
    ifp->if_output = ether_output;
16
    ifp->if_start = vxn_start;
17
+#if __FreeBSD_version <= 900000
18
    ifp->if_watchdog = vxn_watchdog;
19
+#endif
20
    ifp->if_init = vxn_init;
21
    ifp->if_baudrate = 1000000000;
22
    ifp->if_snd.ifq_maxlen = sc->vxn_num_tx_bufs;
23
@@ -1018,6 +1022,7 @@
24
    return error;
25
 }
26
 
27
+#if __FreeBSD_version <= 900000
28
 /*
29
  *-----------------------------------------------------------------------------
30
  * vxn_watchdog --
31
@@ -1035,6 +1040,7 @@
32
 {
33
    printf("vxn%d: watchdog\n", VXN_IF_UNIT(ifp));
34
 }
35
+#endif
36
 
37
 /*
38
  *-----------------------------------------------------------------------------
(-)open-vm-tools/files/patch-services-Makefile (-22 lines)
Lines 1-22 Link Here
1
--- services/Makefile.am.orig	2009-02-28 20:48:46.000000000 +0100
2
+++ services/Makefile.am	2009-02-28 20:49:28.000000000 +0100
3
@@ -20,6 +20,5 @@
4
 SUBDIRS += plugins
5
 
6
 install-exec-local:
7
-	mkdir -p $(DESTDIR)/etc/vmware-tools
8
-	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
9
+	mkdir -p $(prefix)/etc/vmware-tools
10
 
11
--- services/Makefile.in.orig	2009-02-28 20:48:52.000000000 +0100
12
+++ services/Makefile.in	2009-02-28 20:49:46.000000000 +0100
13
@@ -642,8 +642,7 @@
14
 
15
 
16
 install-exec-local:
17
-	mkdir -p $(DESTDIR)/etc/vmware-tools
18
-	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
19
+	mkdir -p $(prefix)/etc/vmware-tools
20
 
21
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
22
 # Otherwise a system limit (for SysV at least) may be exceeded.
(-)open-vm-tools/files/patch-vmhgfs-Makefile (-27 / +51 lines)
Lines 1-27 Link Here
1
--- ./modules/freebsd/vmhgfs/Makefile.orig	2010-10-20 05:19:54.000000000 +0900
1
*** modules/freebsd/vmhgfs/Makefile.orig	Wed Apr 17 17:12:22 2013
2
+++ ./modules/freebsd/vmhgfs/Makefile	2010-11-11 23:06:07.000000000 +0900
2
--- modules/freebsd/vmhgfs/Makefile	Thu Jul 11 01:14:46 2013
3
@@ -90,22 +90,7 @@
3
***************
4
    CFLAGS += -Ishared
4
*** 47,53 ****
5
 .endif
5
  .endif
6
 
6
  
7
-#
7
  COMMON_HGFS_SRCS := debug.c
8
-# FreeBSD's kernel module build system defines a bunch of additional warning
8
! COMMON_HGFS_SRCS := bdhandler.c
9
-# flags for the compiler in addition to -Wall -Werror.  However, some of these,
9
  COMMON_HGFS_SRCS += request.c
10
-# like -Wredundant-decls, are overkill.  To get around this, I copied their list
10
  COMMON_HGFS_SRCS += worker.c
11
-# of warning flags, but explicitly disabled a few.
11
  COMMON_HGFS_SRCS += fsutil.c
12
-#
12
--- 47,53 ----
13
-CWARNFLAGS := -Wall
13
  .endif
14
-CWARNFLAGS += -Werror
14
  
15
-CWARNFLAGS += -Wno-redundant-decls
15
  COMMON_HGFS_SRCS := debug.c
16
-CWARNFLAGS += -Wnested-externs
16
! COMMON_HGFS_SRCS += bdhandler.c
17
-CWARNFLAGS += -Wstrict-prototypes
17
  COMMON_HGFS_SRCS += request.c
18
-CWARNFLAGS += -Wno-missing-prototypes
18
  COMMON_HGFS_SRCS += worker.c
19
-CWARNFLAGS += -Wpointer-arith
19
  COMMON_HGFS_SRCS += fsutil.c
20
-CWARNFLAGS += -Winline
20
***************
21
-CWARNFLAGS += -Wcast-qual
21
*** 93,114 ****
22
-
22
     CFLAGS += -Ishared
23
 EXPORT_SYMS = NO
23
  .endif
24
 
24
  
25
+.include <bsd.own.mk>
25
- #
26
 .include <bsd.kmod.mk>
26
- # FreeBSD's kernel module build system defines a bunch of additional warning
27
27
- # flags for the compiler in addition to -Wall -Werror.  However, some of these,
28
- # like -Wredundant-decls, are overkill.  To get around this, I copied their list
29
- # of warning flags, but explicitly disabled a few.
30
- #
31
- CWARNFLAGS := -Wall
32
- CWARNFLAGS += -Werror
33
- CWARNFLAGS += -Wno-redundant-decls
34
- CWARNFLAGS += -Wnested-externs
35
- CWARNFLAGS += -Wstrict-prototypes
36
- CWARNFLAGS += -Wno-missing-prototypes
37
- CWARNFLAGS += -Wpointer-arith
38
- CWARNFLAGS += -Winline
39
- CWARNFLAGS += -Wcast-qual
40
- 
41
  EXPORT_SYMS = NO
42
  
43
  .include <bsd.kmod.mk>
44
--- 93,99 ----
45
     CFLAGS += -Ishared
46
  .endif
47
  
48
  EXPORT_SYMS = NO
49
  
50
+ .include <bsd.own.mk>
51
  .include <bsd.kmod.mk>
(-)open-vm-tools/files/patch-vmhgfs-state.c (-31 lines)
Lines 1-31 Link Here
1
--- modules/freebsd/vmhgfs/state.c.orig	2010-10-20 05:19:54.000000000 +0900
2
+++ modules/freebsd/vmhgfs/state.c	2010-11-16 13:27:57.000000000 +0900
3
@@ -770,6 +770,12 @@
4
       goto destroyVnode;
5
    }
6
 
7
+#if __FreeBSD_version >= 700034
8
+   if ((ret = insmntque(vp, vfsp)) != 0) {
9
+      return ret;
10
+   }
11
+#endif
12
+
13
    /*
14
     * Now we'll initialize the vnode.  We need to set the file type, vnode
15
     * operations, flags, filesystem pointer, reference count, and device.
16
@@ -1277,6 +1283,7 @@
17
  *----------------------------------------------------------------------------
18
  */
19
 
20
+#if 0 /* never used */
21
 void
22
 HgfsMarkFileMmapped(struct vnode *vp,    // vnode which state is being changed
23
                     Bool mmapped)        // New mapping state
24
@@ -1286,6 +1293,7 @@
25
    fp = HGFS_VP_TO_FP(vp);
26
    fp->mmapped = mmapped;
27
 }
28
+#endif
29
 
30
 /* Adding/finding/removing file state from hash table */
31
 
(-)open-vm-tools/pkg-plist (-5 lines)
Lines 14-20 Link Here
14
lib/open-vm-tools/plugins/common/libvix.so
14
lib/open-vm-tools/plugins/common/libvix.so
15
lib/open-vm-tools/plugins/common/libvix.la
15
lib/open-vm-tools/plugins/common/libvix.la
16
%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
16
%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
17
%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
18
%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
17
%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
19
%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
18
%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
20
lib/libhgfs.a
19
lib/libhgfs.a
Lines 41-56 Link Here
41
include/vmGuestLib/vm_basic_types.h
40
include/vmGuestLib/vm_basic_types.h
42
@exec mkdir -p %D/lib/vmware-tools/modules/input
41
@exec mkdir -p %D/lib/vmware-tools/modules/input
43
sbin/mount_vmhgfs
42
sbin/mount_vmhgfs
44
%%X11%%bin/vmware-toolbox
45
%%X11%%bin/vmware-user-suid-wrapper
43
%%X11%%bin/vmware-user-suid-wrapper
46
share/vmware-tools/poweroff-vm-default
44
share/vmware-tools/poweroff-vm-default
47
share/vmware-tools/poweron-vm-default
45
share/vmware-tools/poweron-vm-default
48
share/vmware-tools/resume-vm-default
46
share/vmware-tools/resume-vm-default
49
share/vmware-tools/suspend-vm-default
47
share/vmware-tools/suspend-vm-default
50
share/vmware-tools/vm-support
48
share/vmware-tools/vm-support
51
share/open-vm-tools/messages/de/toolbox.vmsg
52
share/open-vm-tools/messages/ja/toolbox.vmsg
53
share/open-vm-tools/messages/zh_CN/toolbox.vmsg
54
share/vmware-tools/statechange.subr
49
share/vmware-tools/statechange.subr
55
share/vmware-tools/scripts/vmware/network
50
share/vmware-tools/scripts/vmware/network
56
@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
51
@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true

Return to bug 180471