diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -123,10 +123,6 @@ CONFLICTS_INSTALL+= virtualbox-ose .endif -.if ${ARCH} == "amd64" -_ELF32!= kldstat -q -m elf32 && echo yes || echo no -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug @@ -196,14 +192,7 @@ PLIST_SUB+= SDK="@comment " .endif -.if ${ARCH} == i386 -KMK_ARCH= freebsd.x86 -PLIST_SUB+= I386="" -.else KMK_ARCH= freebsd.${ARCH} -PLIST_SUB+= I386="@comment " -.endif - PLIST_SUB+= ARCH="${KMK_ARCH}" KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} @@ -254,19 +243,6 @@ CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" .endif -pre-everything:: -.if ${ARCH} == "amd64" -.if ${_ELF32} != yes - @${ECHO_MSG} 'Requires 32-bit runtime support in kernel.' - @${ECHO_MSG} 'Rebuild kernel with "options COMPAT_FREEBSD32" and reboot.' - @${FALSE} -.elif !exists(/usr/lib32/libc.so) - @${ECHO_MSG} 'Requires 32-bit libraries installed under /usr/lib32.' - @${ECHO_MSG} 'Do: cd /usr/src; make build32 install32; service ldconfig restart' - @${FALSE} -.endif -.endif - post-patch: @${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ ${WRKSRC}/LocalConfig.kmk diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist --- a/emulators/virtualbox-ose/pkg-plist +++ b/emulators/virtualbox-ose/pkg-plist @@ -402,8 +402,6 @@ lib/virtualbox/VBoxNetDHCP.so @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT lib/virtualbox/VBoxNetNAT.so -%%I386%%lib/virtualbox/VBoxREM32.so -%%I386%%lib/virtualbox/VBoxREM64.so lib/virtualbox/VBoxRT.so %%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL %%X11%%lib/virtualbox/VBoxSDL.so