4 files changed, 54 insertions, 8 deletions

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 09ceb2d9f995..f90d97b2828f 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
 		http://download.handbrake.fr/handbrake/contrib/:contrib
@@ -34,7 +35,7 @@ DISTFILES=	HandBrake-${PORTVERSION}.tar.bz2 \
 		x264-r2146-bcd41db.tar.gz:contrib
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dmarion@FreeBSD.org
 COMMENT=	Versatile DVD ripper and video transcoder
 
 LICENSE=	GPLv2
@@ -46,11 +47,12 @@ USE_AUTOTOOLS=	libtool aclocal
 LIBTOOLFILES=	configure
 USE_GMAKE=	yes
 USE_PYTHON_BUILD=	yes
+WANT_GNOME=	yes
 
 WRKSRC=		${WRKDIR}/HandBrake-${PORTVERSION}
 PLIST_FILES=	bin/HandBrakeCLI
 
-CONFIGURE_ARGS=	--force --disable-gtk
+CONFIGURE_ARGS=	--force
 CONFIGURE_TARGET=	build
 
 BUILD_WRKSRC=	${WRKSRC}/build
@@ -59,15 +61,31 @@ ALL_TARGET=	#
 
 NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 
+OPTIONS_DEFINE=	GUI
+GUI_DESC=	Build GTK+2 based GUI program
+OPTIONS_DEFAULT=	GUI
+
 .include <bsd.port.pre.mk>
 
-# Recent binutils are required to handle inline SSSE3 asm (in x264)
-.if ${OSVERSION} < 802509 || ${OSVERSION} >= 900000 && ${OSVERSION} < 900033
+# Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
+# to support --exclude-libs option for ld(1) when building GUI program
+.if ${PORT_OPTIONS:MGUI} || ${OSVERSION} < 802509 || \
+	${OSVERSION} >= 900000 && ${OSVERSION} < 900033
 BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
+.if ${PORT_OPTIONS:MGUI}
+CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
+LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		notify:${PORTSDIR}/devel/libnotify
+USE_GNOME=	intltool
+PLIST_FILES+=	bin/HandBrake
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
+
 run-autotools-aclocal:
 	@${DO_NADA}
 
@@ -113,5 +131,8 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
+.if ${PORT_OPTIONS:MGUI}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${PREFIX}/bin/HandBrake
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/handbrake/files/patch-gtk_src_callbacks.c b/multimedia/handbrake/files/patch-gtk_src_callbacks.c
new file mode 100644
index 000000000000..889766b3c3c4
--- /dev/null
+++ b/multimedia/handbrake/files/patch-gtk_src_callbacks.c
@@ -0,0 +1,10 @@
+--- ./gtk/src/callbacks.c.orig	2012-08-23 21:44:53.000000000 +0800
++++ ./gtk/src/callbacks.c	2012-08-23 21:45:09.000000000 +0800
+@@ -34,6 +34,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
diff --git a/multimedia/handbrake/files/patch-make_include_main.defs b/multimedia/handbrake/files/patch-make_include_main.defs
new file mode 100644
index 000000000000..19eee7e980ff
--- /dev/null
+++ b/multimedia/handbrake/files/patch-make_include_main.defs
@@ -0,0 +1,14 @@
+--- ./make/include/main.defs.orig	2012-06-09 05:45:19.000000000 +0800
++++ ./make/include/main.defs	2012-08-23 16:08:07.000000000 +0800
+@@ -88,6 +88,11 @@
+     MODULES += gtk
+ endif
+ 
++ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system))
++    ## build gtk when gtk+freebsd
++    MODULES += gtk
++endif
++
+ ifeq (1,$(FEATURE.local_yasm))
+     MODULES += contrib/yasm
+ endif
diff --git a/multimedia/handbrake/pkg-descr b/multimedia/handbrake/pkg-descr
index ff61c44c8fb4..ce69ea716227 100644
--- a/multimedia/handbrake/pkg-descr
+++ b/multimedia/handbrake/pkg-descr
@@ -1,5 +1,6 @@
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
-transcoder with rich selection of features.
+transcoder with rich selection of features.  Both GUI and command-line only
+versions are available.
 
 Supported sources:
 
@@ -9,10 +10,10 @@ Supported sources:
 
 Outputs:
 
-  * File format: MP4 (M4V) and MKV
+  * File (container) format: MP4 (M4V) and MKV
   * Video: H.264 (x264), MPEG-2/MPEG-4 (ffmpeg), or Theora (libtheora)
-  * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, Flac, AC3, or Vorbis;
-    AC-3, DTS, DTS-HD, AAC, and MP3 pass-thru
+  * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, FLAC, AC3, or Vorbis;
+    AC-3, DTS, DTS-HD, AAC, and MP3 pass-through
 
 HandBrake also includes support for chapters, subtitles, advanced video
 filters, and more.  It is also useful for making videos compatible with