4 files changed, 71 insertions, 21 deletions

diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index b003558ace86..79bb5c600907 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -5,32 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Goggles
-PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTNAME=	goggles
+PORTVERSION=	0.7.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.fifthplanet.net/files/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A FOX frontend to the Ogle DVD player
 
-BROKEN=		"Conflicts with x11-toolkits/fox-devel version 1.2.1"
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
 LIB_DEPENDS=	FOX-1.2.5:${PORTSDIR}/x11-toolkits/fox-devel
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--with-dvdcontrol=${LOCALBASE} \
-		--with-fox=${LOCALBASE} \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib
-WRKSRC=		${WRKDIR}/${PORTNAME:S/G/g/}-${PORTVERSION}
 
 pre-everything::
 .ifndef(WITH_DVD_DEVICE)
@@ -56,10 +45,26 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 .endif
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ./gb clean
+
 post-patch:
-# point to specific device
-	@${REINPLACE_CMD} -E -e \
-		's|\"/dev/acd0c\"|\"${DEFAULT_DVD_DEVICE}\"|' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/gb
+
+do-configure:
+	@${REINPLACE_CMD} -e 's|%%DVDDEVICE%%|${DEFAULT_DVD_DEVICE}|g' \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' \
+		-e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%PTHREADLIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/build/config.linux
+
+do-build:
+	@cd ${WRKSRC} && ./gb
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ogle_gui_goggles ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/goggles ${PREFIX}/bin
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/desktop/goggles_manual.pdf ${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/goggles/distinfo b/multimedia/goggles/distinfo
index b1348f756e8f..8533430686fb 100644
--- a/multimedia/goggles/distinfo
+++ b/multimedia/goggles/distinfo
@@ -1,2 +1,2 @@
-MD5 (Goggles-0.7.2.tar.gz) = 38dc3a2080cb2b530a397560dcccdaaf
-SIZE (Goggles-0.7.2.tar.gz) = 417094
+MD5 (goggles-0.7.4.tar.bz2) = f5772b217a1e19b4d1774c1938d6af7b
+SIZE (goggles-0.7.4.tar.bz2) = 2286061
diff --git a/multimedia/goggles/files/patch-build-config.linux b/multimedia/goggles/files/patch-build-config.linux
new file mode 100644
index 000000000000..a14debb0e754
--- /dev/null
+++ b/multimedia/goggles/files/patch-build-config.linux
@@ -0,0 +1,43 @@
+--- build/config.linux.orig	Mon May 17 06:08:59 2004
++++ build/config.linux	Mon Jun 28 01:03:04 2004
+@@ -1,17 +1,17 @@
+ # General Settings
+ #-------------------------------------------------------------------------------
+-CONFIG_DEVICE="/dev/dvd"                  # Initial default dvd device       
++CONFIG_DEVICE="%%DVDDEVICE%%"                  # Initial default dvd device       
+ CONFIG_XV=1                               # Include XV Support 
+ CONFIG_DXR3=0                             # Include DXR3 Support
+ 
+ 
+ # Search and Install Directories
+ #-------------------------------------------------------------------------------
+-FOX_PREFIX="/usr"                         # FOX Installation dir.
+-OGLE_PREFIX="/usr"                        # Ogle Installation dir
+-GOGGLES_PREFIX="$OGLE_PREFIX"             # Goggles Installation dir -
++FOX_PREFIX="%%LOCALBASE%%"                         # FOX Installation dir.
++OGLE_PREFIX="%%LOCALBASE%%"                        # Ogle Installation dir
++GOGGLES_PREFIX="%%PREFIX%%"             # Goggles Installation dir -
+                                           # Should be the same as ogle 
+-X11_PREFIX="/usr/X11R6"                   # X Server Installation dir.
++X11_PREFIX="%%X11BASE%%"                   # X Server Installation dir.
+ 
+ # Build Tools
+ #-------------------------------------------------------------------------------
+@@ -24,7 +24,7 @@
+ #-------------------------------------------------------------------------------
+ #CXXFLAGS="-O2 -Wall -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
+ CXXFLAGS="-Wall -g"
+-CPPFLAGS="-I../include -I$FOX_PREFIX/include/fox-1.2 -I$OGLE_PREFIX/include"
++CPPFLAGS="-I../include -I$FOX_PREFIX/include/fox-1.2 -I$OGLE_PREFIX/include -I$X11_PREFIX/include"
+ 
+ OGLE_LIBS="-L$OGLE_PREFIX/lib/ogle -Wl,-rpath $OGLE_PREFIX/lib/ogle -ldvdcontrol -lmsgevents"
+ OGLE_DEFS=""
+@@ -53,7 +53,7 @@
+ 
+ LIBS="$LIBS -lXext -lX11"
+ 
+-#LIBS="$LIBS -lpthread"
++LIBS="$LIBS %%PTHREADLIBS%%"
+ 
+ 
+ 
diff --git a/multimedia/goggles/pkg-plist b/multimedia/goggles/pkg-plist
index 36cf257749b5..df72db83cca4 100644
--- a/multimedia/goggles/pkg-plist
+++ b/multimedia/goggles/pkg-plist
@@ -1,2 +1,4 @@
 bin/goggles
-bin/goggles_gui
+bin/ogle_gui_goggles
+%%DOCSDIR%%/goggles_manual.pdf
+@dirrm %%DOCSDIR%%