3 files changed, 54 insertions, 9 deletions

diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 634ad3e26d79..b9dc9b0cf9df 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -49,10 +49,12 @@ GROUPS=		${VBOXGROUP}
 VBOX_FRONTENDS=	VBoxAutostart VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11 VPX PYTHON
-OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL VNC WEBSERVICE PYTHON
+OPTIONS_DEFINE=	DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \
+		QT4 UDPTUNNEL VDE VNC VPX WEBSERVICE X11
+OPTIONS_DEFAULT=	DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11
 OPTIONS_SUB=	yes
 DEBUG_DESC=	Debug symbols, additional logs and assertions
+MANUAL_DESC=	Build with user manual
 QT4_DESC=	Build with QT4 Frontend
 GUESTADDITIONS_DESC=	Build with Guest Additions
 UDPTUNNEL_DESC=	Build with UDP tunnel support
@@ -67,6 +69,8 @@ PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 DBUS_CONFIGURE_OFF=	--disable-dbus
 
+MANUAL_CONFIGURE_OFF=	--disable-docs
+
 VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
 VNC_CONFIGURE_ON=	--enable-vnc
 
@@ -147,6 +151,10 @@ KMK_BUILDTYPE=	debug
 KMK_FLAGS+=	BUILD_TYPE=debug
 .endif
 
+.if ${PORT_OPTIONS:MMANUAL}
+USE_TEX=	dvipsk:build formats:build texlive
+.endif
+
 .if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
 VBOX_WEB=	vboxwebsrv webtest
@@ -254,6 +262,11 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox
 	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${STAGEDIR}${PREFIX}/lib/virtualbox
 
+.if ${PORT_OPTIONS:MMANUAL}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR}
+.endif
+
 .if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif
diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk
index 47cb5f2067ef..f5bb9a607357 100644
--- a/emulators/virtualbox-ose/files/patch-Config.kmk
+++ b/emulators/virtualbox-ose/files/patch-Config.kmk
@@ -1,5 +1,14 @@
 --- Config.kmk.orig	2014-03-26 15:12:14.000000000 -0400
-+++ Config.kmk	2014-05-07 16:05:51.000000000 -0400
++++ Config.kmk	2014-05-09 14:58:40.000000000 -0400
+@@ -334,7 +334,7 @@
+ # Include documentation in the package
+ VBOX_WITH_DOCS_PACKING = 1
+ # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM)
+-ifn1of ($(KBUILD_TARGET), linux)
++ifn1of ($(KBUILD_TARGET), freebsd linux)
+  VBOX_WITH_DOCS_CHM = 1
+ endif
+ # Include translations
 @@ -584,7 +584,7 @@
  # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
  VBOX_WITH_VBOX_IMG =
@@ -9,7 +18,27 @@
   VBOX_WITH_VPX = 1
  endif
  # Enable shared folders
-@@ -3399,16 +3399,16 @@
+@@ -877,10 +877,6 @@
+  VBOX_WITH_VBOXSDL=
+ endif
+ 
+-ifeq ($(KBUILD_TARGET),freebsd)
+- VBOX_WITH_DOCS=
+-endif
+-
+ ifeq ($(KBUILD_TARGET),haiku)
+  # Don't bother with SDL ttf for now.
+  VBOX_WITH_SECURELABEL=
+@@ -1035,7 +1031,7 @@
+  VBOX_WITH_OS2_ADDITIONS_BIN=
+  VBOX_WITH_SECURELABEL=
+  VBOX_WITH_KCHMVIEWER=
+- ifn1of ($(KBUILD_TARGET), linux)
++ ifn1of ($(KBUILD_TARGET), freebsd linux)
+   VBOX_WITH_DOCS=
+   VBOX_WITH_DOCS_PACKING=
+  endif
+@@ -3399,16 +3395,16 @@
  	$(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
  	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
  	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
@@ -29,7 +58,7 @@
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
  	-nostdinc
  TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
-@@ -3642,8 +3642,6 @@
+@@ -3642,8 +3638,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXR3EXE_LIBPATH            += \
@@ -38,7 +67,7 @@
  	/usr/local/lib
   else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
-@@ -3880,7 +3878,7 @@
+@@ -3880,7 +3874,7 @@
  # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
  # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
  endif
@@ -47,7 +76,7 @@
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  endif
-@@ -4221,8 +4219,6 @@
+@@ -4221,8 +4215,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXMAINEXE_LIBPATH            += \
@@ -56,7 +85,7 @@
  	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
-@@ -4688,8 +4684,6 @@
+@@ -4688,8 +4680,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
      TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
@@ -65,7 +94,7 @@
  	/usr/local/lib
     endif
     ifeq ($(KBUILD_TARGET),solaris)
-@@ -4884,8 +4878,6 @@
+@@ -4884,8 +4874,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXBLDPROG_LIBPATH            += \
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index 032c2f5a65c8..176dfb5815db 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -122,6 +122,8 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml
+%%MANUAL%%%%DOCSDIR%%/UserManual.pdf
+%%MANUAL%%%%DOCSDIR%%/UserManual_fr_FR.pdf
 %%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm
@@ -664,6 +666,7 @@ include/virtualbox/xpcom/xpcom-config.h
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 %%NLS%%@dirrm %%DATADIR%%/nls
+%%MANUAL%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/idl
 @dirrm %%DATADIR%%
 @dirrm lib/virtualbox/components