Permalink
Browse files

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

  • Loading branch information...
2 parents 71d919d + 7e583de commit 66127c23553a3558e4aba659a55c3502d4d2f790 Ken Moore committed Oct 31, 2013
Showing with 20 additions and 925 deletions.
  1. +0 −197 build-files/ports-overlay/emulators/virtualbox-ose-additions/Makefile
  2. +0 −2 build-files/ports-overlay/emulators/virtualbox-ose-additions/distinfo
  3. +0 −18 ...mulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk
  4. +0 −40 ...ay/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk
  5. +0 −120 ...y/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-crOpenGL-fakedri_drv.c
  6. +0 −27 ...emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
  7. +0 −10 ...mulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
  8. +0 −20 ...rlay/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  9. +0 −16 ...ulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
  10. +0 −56 ...lators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  11. +0 −48 ...albox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
  12. +0 −132 ...-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
  13. +0 −20 ...mulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
  14. +0 −69 build-files/ports-overlay/emulators/virtualbox-ose-additions/files/vboxguest.in
  15. +0 −25 build-files/ports-overlay/emulators/virtualbox-ose-additions/files/vboxservice.in
  16. +0 −9 build-files/ports-overlay/emulators/virtualbox-ose-additions/pkg-descr
  17. +0 −21 build-files/ports-overlay/emulators/virtualbox-ose-additions/pkg-message
  18. +0 −31 build-files/ports-overlay/emulators/virtualbox-ose-additions/pkg-plist
  19. +1 −2 src-qt4/pc-bootconfig/i18n/pc-bootconfig_nl.ts
  20. +2 −0 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
  21. +3 −6 src-qt4/pc-mounttray/i18n/MountTray_nl.ts
  22. +8 −16 src-qt4/pc-pkgmanager/i18n/PackageManager_nl.ts
  23. +3 −6 src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
  24. +1 −2 src-qt4/pc-updategui/i18n/UpdateGui_nl.ts
  25. +1 −2 src-qt4/warden-gui/i18n/Warden_nl.ts
  26. +1 −0 src-sh/pbi-manager10/pbime/pbimount
  27. +0 −30 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/rc.d/bsdstats
@@ -1,197 +0,0 @@
-# Created by: Bernhard Froehlich <decke@bluelife.at>
-# $FreeBSD: emulators/virtualbox-ose-additions/Makefile 327721 2013-09-20 16:43:52Z bapt $
-
-PORTNAME= virtualbox-ose
-DISTVERSION= 4.2.18
-CATEGORIES= emulators kld
-MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
- http://tmp.chruetertee.ch/ \
- http://disasterarea.chruetertee.ch/
-PKGNAMESUFFIX= -additions
-DISTNAME= VirtualBox-${DISTVERSION}
-
-MAINTAINER= vbox@FreeBSD.org
-COMMENT= VirtualBox additions for FreeBSD guests
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
- as86:${PORTSDIR}/devel/dev86 \
- kmk:${PORTSDIR}/devel/kBuild
-
-UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
-USE_RC_SUBR= vboxguest vboxservice
-USES= iconv
-ONLY_FOR_ARCHS= i386 amd64
-FETCH_ARGS= -pRr
-USE_BZIP2= yes
-MAKE_JOBS_UNSAFE= yes
-
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
- --disable-xpcom --disable-sdl-ttf --disable-pulse \
- --disable-alsa --disable-dbus --disable-python
-
-CONFLICTS= bcc-[0-9]*
-CONFLICTS_INSTALL= virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]*
-
-OPTIONS_DEFINE= DEBUG X11 OPENGL
-OPTIONS_DEFAULT= X11
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-PLIST_SUB+= KMODDIR=${KMODDIR:C,^/,,}
-
-KMODDIR= /boot/modules
-SRC_BASE?= /usr/src
-VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers
-INPUTDIR= ${PREFIX}/lib/xorg/modules/input
-
-VBOX_BIN= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions
-
-KMK_BUILDTYPE= release
-KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE}
-KMK_FLAGS=
-
-MAKE_FLAGS= SYSDIR=${SRC_BASE}/sys
-
-.if ${PORT_OPTIONS:MDEBUG}
-KMK_FLAGS+= BUILD_TYPE=debug
-KMK_BUILDTYPE= debug
-MAKE_FLAGS+= DEBUG_FLAGS="-O1 -g"
-PLIST_SUB+= WITH_DEBUG=""
-.else
-PLIST_SUB+= WITH_DEBUG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MX11}
-VBOX_WITH_X11= 1
-USE_XORG= xcursor xmu inputproto xorg-server xrandr
-PLIST_SUB+= X11=""
-.else
-VBOX_WITH_X11=
-PLIST_SUB+= X11="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENGL}
-USE_XORG+= xcomposite xdamage xext xfixes
-USE_GL= gl
-PLIST_SUB+= OPENGL=""
-.else
-CONFIGURE_ARGS+=--disable-opengl
-PLIST_SUB+= OPENGL="@comment "
-.endif
-
-.if ${ARCH} == i386
-KMK_ARCH= freebsd.x86
-.else
-KMK_ARCH= freebsd.${ARCH}
-.endif
-
-XSERVER_ABI:= ${XSERVER_VER:S/.//:R}
-
-.if !exists(${SRC_BASE}/sys/kern/bus_if.m)
-IGNORE= requires kernel sources
-.endif
-
-.include <bsd.port.pre.mk>
-
-pre-everything::
-.if ${ARCH} == "amd64"
-.if !exists(/usr/lib32/libc.so)
- @${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.'
- @${ECHO} 'Do: cd /usr/src; make build32 install32; ldconfig -v -m -R /usr/lib32'
- @${FALSE}
-.endif
-.endif
-
-post-patch:
- @${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
- @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/Config.kmk \
- ${WRKSRC}/configure \
- ${WRKSRC}/kBuild/units/qt4.kmk \
- ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
- ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop
- @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure
-.if empty(ICONV_LIB)
- @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \
- ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
-.endif
-
-pre-build:
- @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
- ${WRKSRC}/env.sh \
- ${WRKSRC}/src/VBox/Additions/freebsd/Installer/vboxguest.sh
-
-do-build:
- cd ${WRKSRC} && ${SH} env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}
- cd ${VBOX_BIN}/src && make ${MAKE_FLAGS}
-
-do-install:
- ${MKDIR} ${KMODDIR}
- ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${KMODDIR}
-.if ${PORT_OPTIONS:MDEBUG}
- ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols ${KMODDIR}
-.endif
-.if ${PORT_OPTIONS:MX11}
- ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko ${KMODDIR}
-.if ${PORT_OPTIONS:MDEBUG}
- ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko.symbols ${KMODDIR}
-.endif
-.endif
- @/usr/sbin/kldxref ${KMODDIR}
-
- ${MKDIR} ${PREFIX}/etc/rc.d/
-
- ${MKDIR} ${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxControl ${PREFIX}/sbin/
- ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxService ${PREFIX}/sbin/
-
-.if ${PORT_OPTIONS:MX11}
- ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${PREFIX}/bin/
-
- ${MKDIR} ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- ${PREFIX}/bin/VBoxClient-all
-
- # X11 autostart
- ${MKDIR} ${PREFIX}/etc/xdg/autostart/
- ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
- ${PREFIX}/etc/xdg/autostart/
-
- # KDE autostart
- ${MKDIR} ${PREFIX}/share/autostart/
- ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
- ${PREFIX}/share/autostart/
-
- ${MKDIR} ${VIDEODIR}
- ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_${XSERVER_ABI}.so ${VIDEODIR}/vboxvideo_drv.so
-
- ${MKDIR} ${INPUTDIR}
- ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_${XSERVER_ABI}.so ${INPUTDIR}/vboxmouse_drv.so
-.endif
-
-.if ${PORT_OPTIONS:MOPENGL}
- ${MKDIR} ${PREFIX}/lib
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGL.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLarrayspu.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLcrutil.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLerrorspu.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLfeedbackspu.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLpackspu.so ${PREFIX}/lib/
- ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLpassthroughspu.so ${PREFIX}/lib/
-
- ${MKDIR} ${PREFIX}/lib/dri
- ${LN} -sf ${PREFIX}/lib/VBoxOGL.so ${PREFIX}/lib/dri/vboxvideo_dri.so
-.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
@@ -1,2 +0,0 @@
-SHA256 (VirtualBox-4.2.18.tar.bz2) = 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74
-SIZE (VirtualBox-4.2.18.tar.bz2) = 76893031
@@ -1,18 +0,0 @@
---- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2010-10-07 11:37:10.000000000 +0200
-+++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2010-10-07 11:36:16.000000000 +0200
-@@ -140,6 +140,7 @@
- # the X server runtime instead of IPRT, for use with old servers where the
- # C library is not available.
- #
-+ifdef VBOX_WITH_X11_ADDITIONS
- VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3XF86LIB
- VBoxGuestR3LibXFree86_DEFS = \
- VBOX_WITH_HGCM \
-@@ -163,6 +164,7 @@
- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
-
- VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-+endif
-
- include $(KBUILD_PATH)/subfooter.kmk
-
@@ -1,40 +0,0 @@
---- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2013-04-12 12:35:06.000000000 +0200
-+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-05-02 23:33:26.523212251 +0200
-@@ -42,7 +42,7 @@
-
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- #VBoxOGL_DRI = 1
-- ifn1of ($(KBUILD_TARGET),solaris freebsd) # No DRI on Solaris yet
-+ ifn1of ($(KBUILD_TARGET),solaris) # No DRI on Solaris yet
- VBoxOGL_FAKEDRI = 1
- endif
-
-@@ -209,8 +209,13 @@
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
- ifdef VBoxOGL_FAKEDRI
-- VBoxOGL_LIBS += \
-+ ifeq ($(KBUILD_TARGET), freebsd)
-+ VBoxOGL_LIBS += \
-+ elf
-+ else
-+ VBoxOGL_LIBS += \
- dl
-+ endif
- endif
- endif
- ifdef VBOX_WITH_CRHGSMI
-@@ -368,6 +373,13 @@
- | $$(dir $$@)
- $(call MSG_GENERATE,python,$@,$<)
- $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
-+ else ifeq ($(KBUILD_TARGET),freebsd)
-+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c: \
-+ $(PATH_SUB_CURRENT)/FreeBSD_exports.py \
-+ $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
-+ | $$(dir $$@)
-+ $(call MSG_GENERATE,python,$@,$<)
-+ $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
- else
- $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c: \
- $(PATH_SUB_CURRENT)/Linux_exports.py \
@@ -1,120 +0,0 @@
---- src/VBox/Additions/common/crOpenGL/fakedri_drv.c.orig 2012-12-19 13:25:04.000000000 -0500
-+++ src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-01-27 17:57:04.000000000 -0500
-@@ -29,6 +29,15 @@
- #include <dlfcn.h>
- #include <elf.h>
- #include <unistd.h>
-+
-+#include <sys/param.h>
-+#if defined(BSD)
-+#include <fcntl.h>
-+#include <gelf.h>
-+#include <libelf.h>
-+#include <string.h>
-+#endif
-+
- /** X server message type definitions. */
- typedef enum {
- X_PROBED, /* Value was probed */
-@@ -50,11 +59,11 @@
-
- //@todo this could be different...
- #ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-+# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- #else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-+# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
- #endif
-
- #ifdef DEBUG_DRI_CALLS
-@@ -209,6 +218,85 @@
-
- #define FAKEDRI_JMP64_PATCH_SIZE 13
-
-+#if defined(BSD)
-+/* Provide basic dladdr1 flags */
-+enum {
-+ RTLD_DL_SYMENT = 1
-+};
-+
-+/* Provide a minimal local version of dladdr1 */
-+static int
-+dladdr1(const void *address, Dl_info *dlip, void **info, int flags)
-+{
-+ static DRI_ELFSYM desym;
-+ GElf_Sym sym;
-+ GElf_Shdr shdr;
-+ Elf *elf;
-+ Elf_Scn *scn;
-+ Elf_Data *data;
-+ int ret, fd, count, i;
-+
-+ /* Initialize variables */
-+ fd = -1;
-+ elf = NULL;
-+
-+ /* Call dladdr first */
-+ ret = dladdr(address, dlip);
-+ if (ret == 0) goto err_exit;
-+
-+ /* Check for supported flags */
-+ if (flags != RTLD_DL_SYMENT) return 1;
-+
-+ /* Open shared library's ELF file */
-+ if (elf_version(EV_CURRENT) == EV_NONE) goto err_exit;
-+ fd = open(dlip->dli_fname, O_RDONLY);
-+ if (fd < 0) goto err_exit;
-+ elf = elf_begin(fd, ELF_C_READ, NULL);
-+ if (elf == NULL) goto err_exit;
-+
-+ /* Find the '.dynsym' section */
-+ scn = elf_nextscn(elf, NULL);
-+ while (scn != NULL) {
-+ if (gelf_getshdr(scn, &shdr) == NULL) goto err_exit;
-+ if (shdr.sh_type == SHT_DYNSYM) break;
-+ scn = elf_nextscn(elf, scn);
-+ }
-+ if (scn == NULL) goto err_exit;
-+
-+ /* Search for the requested symbol by name and offset */
-+ data = elf_getdata(scn, NULL);
-+ count = shdr.sh_size / shdr.sh_entsize;
-+ for (i = 0; i < count; i++) {
-+ gelf_getsym(data, i, &sym);
-+ if ((strcmp(dlip->dli_sname,
-+ elf_strptr(elf, shdr.sh_link, sym.st_name)) == 0) &&
-+ (sym.st_value == (dlip->dli_saddr - dlip->dli_fbase))) {
-+ break;
-+ }
-+ }
-+
-+ /* Close ELF file */
-+ elf_end(elf);
-+ close(fd);
-+
-+ /* Return symbol entry in native format */
-+ desym.st_name = sym.st_name;
-+ desym.st_info = sym.st_info;
-+ desym.st_other = sym.st_other;
-+ desym.st_shndx = sym.st_shndx;
-+ desym.st_value = sym.st_value;
-+ desym.st_size = sym.st_size;
-+ *info = &desym;
-+ return 1;
-+
-+ /* Error handler */
-+err_exit:
-+ if (elf != NULL) elf_end(elf);
-+ if (fd >= 0) close(fd);
-+ return 0;
-+}
-+#endif
-+
- static void
- vboxPatchMesaExport(const char* psFuncName, const void *pStart, const void *pEnd)
- {
Oops, something went wrong.

0 comments on commit 66127c2

Please sign in to comment.