Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 81e8276 + 53badd9 commit e86d9c0c93fa4183bfc9f7594548732df386ce5b Ken Moore committed Oct 21, 2013
Showing with 10 additions and 881 deletions.
  1. +1 −0 build-files/conf/port-make.conf
  2. +0 −94 build-files/ports-overlay/emulators/open-vm-tools/Makefile
  3. +0 −2 build-files/ports-overlay/emulators/open-vm-tools/distinfo
  4. +0 −12 build-files/ports-overlay/emulators/open-vm-tools/files/patch-arch
  5. +0 −170 build-files/ports-overlay/emulators/open-vm-tools/files/patch-freebsd-8
  6. +0 −40 build-files/ports-overlay/emulators/open-vm-tools/files/patch-getpwnam
  7. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-guestApp.c
  8. +0 −22 build-files/ports-overlay/emulators/open-vm-tools/files/patch-hgfsmounter-Makefile.in
  9. +0 −10 build-files/ports-overlay/emulators/open-vm-tools/files/patch-hostinfoPosix.c
  10. +0 −22 build-files/ports-overlay/emulators/open-vm-tools/files/patch-libguestlib-Makefile
  11. +0 −19 build-files/ports-overlay/emulators/open-vm-tools/files/patch-modules-Makefile.in
  12. +0 −17 build-files/ports-overlay/emulators/open-vm-tools/files/patch-net_compat.h
  13. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-scripts-Makefile
  14. +0 −10 build-files/ports-overlay/emulators/open-vm-tools/files/patch-scripts-network
  15. +0 −20 build-files/ports-overlay/emulators/open-vm-tools/files/patch-util_misc.c
  16. +0 −10 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vm_basic_types.h
  17. +0 −24 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmblock-vnops.c
  18. +0 −51 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
  19. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h
  20. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c
  21. +0 −50 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmmemctl-os.c
  22. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmtoolsd-Makefile.in
  23. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/patch-wrapper-Makefile.am
  24. +0 −11 build-files/ports-overlay/emulators/open-vm-tools/files/pkg-message.in
  25. +0 −29 build-files/ports-overlay/emulators/open-vm-tools/files/vmware-guestd.in
  26. +0 −101 build-files/ports-overlay/emulators/open-vm-tools/files/vmware-kmod.in
  27. +0 −13 build-files/ports-overlay/emulators/open-vm-tools/pkg-descr
  28. +0 −78 build-files/ports-overlay/emulators/open-vm-tools/pkg-plist
  29. +8 −10 src-sh/pbi-manager10/pbi-manager
  30. +1 −0 src-sh/pbi-manager10/pbime/pbimount
@@ -11,6 +11,7 @@ WITH_ACPI_PM=yes
WITH_PLASMA_PYTHON=yes
WITH_PLASMA_RUBY=yes
WITH_VDPAU=yes
+WITH_GALLIUM=YES
#Openoffice Language Options
ALL_LOCALIZED_LANGS=YES
@@ -1,94 +0,0 @@
-# Created by: mbr@FreeBSD.org
-# $FreeBSD: emulators/open-vm-tools/Makefile 327721 2013-09-20 16:43:52Z bapt $
-
-PORTNAME= open-vm-tools
-PORTVERSION= ${BUILD_VER}
-PORTREVISION= 3
-PORTEPOCH= 1
-CATEGORIES= emulators kld
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
-DISTNAME= open-vm-tools-${RELEASE_VER}-${BUILD_VER}
-
-MAINTAINER= swills@FreeBSD.org
-COMMENT?= Open VMware tools for FreeBSD VMware guests
-
-LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-RELEASE_VER= 9.2.3
-BUILD_VER= 1031360
-
-WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
-GNU_CONFIGURE= yes
-USES= pkgconfig
-USE_LDCONFIG= yes
-USE_GCC= 4.2
-CPPFLAGS+= -Wno-deprecated-declarations
-
-SSP_UNSAFE= kernel module does not support ssp
-
-CONFIGURE_ARGS+= --without-procps --sysconfdir=${LOCALBASE}/etc
-.if defined(WITHOUT_X11)
-LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20
-CONFIGURE_ARGS+= --without-x --without-gtk2 --without-gtkmm
-PLIST_SUB+= X11="@comment "
-CONFLICTS= open-vm-tools-[0-9]*
-.else
-.if !defined(WITHOUT_LIBNOTIFY)
-LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify
-.endif
-LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
-CONFIGURE_ARGS+= --with-x
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_XORG= x11 ice sm xext xineramaproto xinerama xrandr xrender \
- xtst
-USE_GNOME= gtk20 glib20
-PLIST_SUB+= X11=""
-CONFLICTS= open-vm-tools-nox11-[0-9]*
-.endif
-
-.if !defined(WITHOUT_FUSE)
-USES+= fuse
-PLIST_SUB+= FUSE=""
-.else
-PLIST_SUB+= FUSE="@comment "
-.endif
-
-CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]*
-SUB_FILES= pkg-message
-
-.if defined(WITHOUT_DNET)
-CONFIGURE_ARGS+= --without-dnet
-.else
-LIB_DEPENDS+= dnet:${PORTSDIR}/net/libdnet
-.endif
-
-.if defined(WITHOUT_ICU)
-CONFIGURE_ARGS+= --without-icu
-.else
-LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu
-.endif
-
-USE_RC_SUBR= vmware-guestd vmware-kmod
-
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-IGNORE= not yet ported to sparc64
-.endif
-
-post-build:
- (cd ${WRKSRC}/modules && ${MAKE})
-
-post-install:
- ${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>
@@ -1,2 +0,0 @@
-SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
-SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935
@@ -1,12 +0,0 @@
---- configure.orig 2008-03-28 10:36:13.000000000 +0100
-+++ configure 2008-03-28 10:36:45.000000000 +0100
-@@ -2259,6 +2259,9 @@
- x86_64)
- userSpaceBitness="64"
- ;;
-+ amd64)
-+ userSpaceBitness="64"
-+ ;;
- *)
- { { echo "$as_me:$LINENO: error: Unknown architecture." >&5
- echo "$as_me: error: Unknown architecture." >&2;}
@@ -1,170 +0,0 @@
---- modules/freebsd/vmhgfs/vnops.c.orig 2009-02-18 17:02:35.000000000 +0900
-+++ modules/freebsd/vmhgfs/vnops.c 2009-03-01 17:47:10.000000000 +0900
-@@ -325,7 +325,11 @@
- */
- {
- struct vnode *vp = ap->a_vp;
-+#if __FreeBSD_version >= 800001
-+ int mode = ap->a_accmode;
-+#else
- int mode = ap->a_mode;
-+#endif
- HgfsAccessMode accessMode = 0;
- Bool isDir = vp->v_type == VDIR;
- if (mode & VREAD) {
---- modules/freebsd/vmblock/vfsops.c.orig 2009-03-18 03:03:21.000000000 -0400
-+++ modules/freebsd/vmblock/vfsops.c 2009-05-23 02:25:50.892549675 -0400
-@@ -126,6 +126,11 @@
- char *target;
- int len, error = 0;
-
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-+
- VMBLOCKDEBUG("VMBlockVFSMount(mp = %p)\n", (void *)mp);
-
- /*
-@@ -273,6 +278,11 @@
- int error;
- int flags = 0, removed = 0;
-
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-+
- VMBLOCKDEBUG("VMBlockVFSUnmount: mp = %p\n", (void *)mp);
-
- xmp = MNTTOVMBLOCKMNT(mp);
-@@ -448,10 +458,15 @@
- VMBlockVFSSync(struct mount *mp, // Ignored
- int waitfor) // Ignored
- #else
-+#if __FreeBSD_version >= 800087
-+VMBlockVFSSync(struct mount *mp,
-+ int waitfor)
-+#else
- VMBlockVFSSync(struct mount *mp, // Ignored
- int waitfor, // Ignored
- struct thread *td) // Ignored
- #endif
-+#endif
- {
- return 0;
- }
---- modules/freebsd/vmhgfs/vfsops.c.orig 2009-03-18 03:03:26.000000000 -0400
-+++ modules/freebsd/vmhgfs/vfsops.c 2009-05-23 02:56:39.608109670 -0400
-@@ -109,8 +109,12 @@
- */
-
- static int
-+#if __FreeBSD_version >= 800087
-+HgfsVfsMount(struct mount *mp)
-+#else
- HgfsVfsMount(struct mount *mp, // IN: structure representing the file system
- struct thread *td) // IN: thread which is mounting the file system
-+#endif
- {
- HgfsSuperInfo *sip;
- struct vnode *vp;
-@@ -122,6 +126,10 @@
- int *uid = NULL;
- Bool *gidSet = NULL;
- int *gid = NULL;
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-
- /*
- * - Examine/validate mount flags from userland.
-@@ -145,7 +153,11 @@
- * Since Hgfs requires the caller to be root, only allow mount attempts made
- * by the superuser.
- */
-+#if __FreeBSD_version >= 800001
-+ if ((ret = priv_check(td, PRIV_VFS_MOUNT)) != 0) {
-+#else
- if ((ret = suser(td)) != 0) {
-+#endif
- return ret;
- }
-
-@@ -277,11 +289,19 @@
- */
-
- static int
-+#if __FreeBSD_version >= 800087
-+HgfsVfsUnmount(struct mount *mp, int mntflags)
-+#else
- HgfsVfsUnmount(struct mount *mp, int mntflags, struct thread *td)
-+#endif
- {
- HgfsSuperInfo *sip;
- int ret = 0;
- int flags = 0;
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-
- sip = (HgfsSuperInfo *)mp->mnt_data;
-
-@@ -348,10 +368,18 @@
- */
-
- static int
-+#if __FreeBSD_version >= 800087
-+HgfsVfsStatfs(struct mount *mp, struct statfs *sbp)
-+#else
- HgfsVfsStatfs(struct mount *mp, struct statfs *sbp, struct thread *td)
-+#endif
- {
- int ret = 0;
- struct vnode *vp;
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-
- /* We always want HGFS_BLOCKSIZE to be a power of two */
- ASSERT_ON_COMPILE(HGFS_IS_POWER_OF_TWO(HGFS_BLOCKSIZE));
-@@ -361,8 +389,11 @@
- * we got from a call to vfs_getnewfsid() in HgfsVfsMount()
- */
- bcopy(&mp->mnt_stat, sbp, sizeof mp->mnt_stat);
--
-+#if __FreeBSD_version >= 800087
-+ ret = HgfsVfsRoot(mp, LK_SHARED, &vp);
-+#else
- ret = HgfsVfsRoot(mp, LK_SHARED, &vp, td);
-+#endif
- if (ret) {
- DEBUG(VM_DEBUG_FAIL, "HgfsVfsRoot failed\n");
- return ret;
-@@ -397,13 +428,23 @@
- */
-
- static int
-+#if __FreeBSD_version >= 800087
-+HgfsVfsRoot(struct mount *mp,
-+ int flags,
-+ struct vnode **vpp)
-+#else
- HgfsVfsRoot(struct mount *mp, // IN: Filesystem structure
- int flags, // IN: Flags to vget
- struct vnode **vpp, // OUT: Address of root vnode
- struct thread *td) // IN: Thread structure
-+#endif
- {
- HgfsSuperInfo *sip = (HgfsSuperInfo *)mp->mnt_data;
- int ret = 0;
-+#if __FreeBSD_version >= 800087
-+ struct thread *td;
-+ td = curthread;
-+#endif
-
- *vpp = NULL;
-
@@ -1,40 +0,0 @@
---- lib/auth/authPosix.c 2008-03-19 08:49:49.000000000 +0100
-+++ lib/auth/authPosix.c 2008-03-27 11:20:20.000000000 +0100
-@@ -264,7 +264,11 @@
- #endif
- /* If this point is reached, the user has been authenticated. */
- setpwent();
-+#if defined(__FreeBSD__)
-+ pwd = getpwnam(user);
-+#else
- pwd = Posix_Getpwnam(user);
-+#endif
- endpwent();
-
- #else /* !USE_PAM */
-@@ -274,7 +278,11 @@
- corresponding #endif below. */
-
- setpwent(); //XXX can kill?
-+#if defined(__FreeBSD__)
-+ pwd = getpwnam(user);
-+#else
- pwd = Posix_Getpwnam(user);
-+#endif
- endpwent(); //XXX can kill?
-
- if (!pwd) {
---- lib/impersonate/impersonatePosix.c 2008-03-19 08:49:50.000000000 +0100
-+++ lib/impersonate/impersonatePosix.c 2008-03-27 11:21:38.000000000 +0100
-@@ -432,7 +432,11 @@
- struct passwd *ppw = &pw;
- int error;
-
-+#if defined(__FreeBSD__)
-+ if ((error = getpwnam_r(user, &pw, buffer, BUFSIZ, &ppw)) != 0 || !ppw) {
-+#else
- if ((error = Posix_Getpwnam_r(user, &pw, buffer, BUFSIZ, &ppw)) != 0 || !ppw) {
-+#endif
- if (error == 0) {
- error = ENOENT;
- }
@@ -1,11 +0,0 @@
---- lib/guestApp/guestApp.c.orig 2008-05-29 10:42:37.000000000 +0300
-+++ lib/guestApp/guestApp.c 2008-05-29 10:43:09.000000000 +0300
-@@ -65,7 +65,7 @@
- #elif defined __APPLE__
- # define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
- #else
--# define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
-+# define GUESTAPP_TOOLS_INSTALL_PATH "/usr/local/share/vmware-tools"
- #endif
-
- /*
@@ -1,22 +0,0 @@
---- hgfsmounter/Makefile.in.orig 2011-09-21 18:25:50.000000000 +0000
-+++ hgfsmounter/Makefile.in 2011-09-25 04:03:22.000000000 +0000
-@@ -606,14 +606,14 @@
- @FREEBSD_TRUE@ mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
- @FREEBSD_TRUE@ $(DESTDIR)$(sbindir)/mount_vmhgfs
- @FREEBSD_TRUE@ -$(MKDIR_P) $(DESTDIR)/sbin
--@FREEBSD_TRUE@ -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
--@FREEBSD_TRUE@ $(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
-+#@FREEBSD_TRUE@ -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
-+#@FREEBSD_TRUE@ $(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
- @FREEBSD_TRUE@uninstall-hook:
- @FREEBSD_TRUE@ rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
- @FREEBSD_FALSE@install-exec-hook:
--@FREEBSD_FALSE@ -$(MKDIR_P) $(DESTDIR)/sbin
--@FREEBSD_FALSE@ -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
--@FREEBSD_FALSE@ $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
-+#@FREEBSD_FALSE@ -$(MKDIR_P) $(DESTDIR)/sbin
-+#@FREEBSD_FALSE@ -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
-+#@FREEBSD_FALSE@ $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
- @FREEBSD_FALSE@uninstall-hook:
- @FREEBSD_FALSE@ rm -f $(DESTDIR)/sbin/mount.vmhgfs
-
@@ -1,10 +0,0 @@
---- ./lib/misc/hostinfoPosix.c.orig 2010-04-28 03:17:27.000000000 +0900
-+++ ./lib/misc/hostinfoPosix.c 2010-11-11 22:37:23.000000000 +0900
-@@ -31,7 +31,6 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/timeb.h>
- #include <pwd.h>
- #include <pthread.h>
- #include <sys/resource.h>
@@ -1,22 +0,0 @@
---- ./libguestlib/Makefile.am.orig 2010-04-28 03:17:28.000000000 +0900
-+++ ./libguestlib/Makefile.am 2010-11-11 22:21:38.000000000 +0900
-@@ -41,7 +41,7 @@
-
- EXTRA_DIST = vmguestlib.pc.in
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
- pkgconfig_DATA = vmguestlib.pc
-
- $(pkgconfig_DATA): $(top_builddir)/config.status
---- ./libguestlib/Makefile.in.orig 2010-04-28 03:18:19.000000000 +0900
-+++ ./libguestlib/Makefile.in 2010-11-11 22:22:04.000000000 +0900
-@@ -298,7 +298,7 @@
- $(top_srcdir)/lib/include/vmSessionId.h \
- $(top_srcdir)/lib/include/vm_basic_types.h
- EXTRA_DIST = vmguestlib.pc.in
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
- pkgconfig_DATA = vmguestlib.pc
- all: all-am
-
Oops, something went wrong.

0 comments on commit e86d9c0

Please sign in to comment.