4 files changed, 43 insertions, 55 deletions

diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 86c123996af9..929a56851591 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	goggles
-PORTVERSION=	0.7.7
+PORTVERSION=	0.7.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.fifthplanet.net/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1//}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A FOX frontend to the Ogle DVD player
@@ -21,6 +20,7 @@ RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_XLIB=	yes
 
 pre-everything::
 .ifndef(WITH_DVD_DEVICE)
@@ -57,31 +57,51 @@ PLIST_DOCS=	\
 
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e 's|make|${GMAKE}|g' \
+		-e 's|/bin/bash|${SH}|' \
+		-e 's|^(MAKE=).*$$|\1${GMAKE}|' \
 		-e 's|function print_help|print_help|' \
 		${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
+# fix dvd device
+# correct applnk location
+	@${REINPLACE_CMD} -E \
+		-e 's|^(CONFIG_DVD_DEVICE=).+$$|\1"${DEFAULT_DVD_DEVICE}"|' \
+		-e 's|applnk-mdk|applnk|' \
+		${WRKSRC}/build/config.linux
+# uphold PREFIX
 # uphold C{,XX}FLAGS
+# uphold C{C,XX}
 	@${REINPLACE_CMD} -E \
+		-e 's|/usr/share/|${PREFIX}/share/|' \
+		-e 's|^(export[[:space:]]+CC=).+$$|\1"${CC}"|' \
+		-e 's|^(export[[:space:]]+CXX=).+$$|\1"${CXX}"|' \
 		-e 's|^(export[[:space:]]+CFLAGS=).+$$|\1"${CFLAGS}"|' \
 		-e 's|^(export[[:space:]]+CXXFLAGS=).+$$|\1"${CXXFLAGS}"|' \
+		-e 's|^(export[[:space:]]+LIBLINK=)"ar (.+)$$|\1"${AR} \2|' \
 		${WRKSRC}/build/config.linux
 
 do-build:
-	@cd ${WRKSRC} && ./gb
+	@cd ${WRKSRC} && ./gb \
+		--prefix=${PREFIX} \
+		--fox-prefix=${LOCALBASE} \
+		--ogle-prefix=${LOCALBASE} \
+		--x-includes=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib \
+		--with-xv=yes
+
+post-build:
+	@${SED} -E \
+		-e 's|@prefix@|${PREFIX}|' \
+		${WRKSRC}/scripts/goggles.in > \
+			${WRKDIR}/goggles
 
 do-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/desktop/goggles_manual.pdf ${DOCSDIR}
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/goggles ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/goggles ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/ogle_gui_goggles ${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/goggles/distinfo b/multimedia/goggles/distinfo
index fd2798ff10aa..d3022fb3083d 100644
--- a/multimedia/goggles/distinfo
+++ b/multimedia/goggles/distinfo
@@ -1,2 +1,2 @@
-MD5 (goggles-0.7.7.tar.bz2) = d175c7770ceb10e715390dfedfd6fa13
-SIZE (goggles-0.7.7.tar.bz2) = 709916
+MD5 (goggles-0.7.10.tar.bz2) = 6803b6ea4840fa7a93844c1c2181a133
+SIZE (goggles-0.7.10.tar.bz2) = 711627
diff --git a/multimedia/goggles/files/patch-build-config.linux b/multimedia/goggles/files/patch-build-config.linux
deleted file mode 100644
index 053d7be1af0c..000000000000
--- a/multimedia/goggles/files/patch-build-config.linux
+++ /dev/null
@@ -1,43 +0,0 @@
---- build/config.linux.orig	Sat Nov 13 17:30:53 2004
-+++ build/config.linux	Sat Nov 13 17:44:09 2004
-@@ -2,7 +2,7 @@
- #-------------------------------------------------------------------------------
- CONFIG_XV=${CONFIG_XV:-1}
- CONFIG_DXR3=${CONFIG_DXR3:-0}
--CONFIG_DVD_DEVICE="/dev/dvd"
-+CONFIG_DVD_DEVICE="%%DVDDEVICE%%"
- 
- # Possible defaults for other platforms.
- #CONFIG_DVD_DEVICE="/cdrom/cdrom0"                      # Solaris
-@@ -15,13 +15,13 @@
- 
- # Search and Installation Directories
- #-------------------------------------------------------------------------------
--FOX_PREFIX="${FOX_PREFIX:-/usr}"
--OGLE_PREFIX="${OGLE_PREFIX:-/usr}"
--GOGGLES_PREFIX="${GOGGLES_PREFIX:-/usr}"
--XLIB_PREFIX="/usr/X11R6"
--MENU_FILE_DIR="/usr/share/applications"
--MENU_ICON_DIR="/usr/share/icons"
--MENU_LINK_DIR="/usr/share/applnk-mdk/Multimedia/Video"
-+FOX_PREFIX="%%LOCALBASE%%"
-+OGLE_PREFIX="%%LOCALBASE%%"
-+GOGGLES_PREFIX="%%PREFIX%%"
-+XLIB_PREFIX="%%X11BASE%%"
-+MENU_FILE_DIR="%%PREFIX%%/share/gnome/applications"
-+MENU_ICON_DIR="%%PREFIX%%/share/icons"
-+MENU_LINK_DIR="%%PREFIX%%/share/applnk-mdk/Multimedia/Video"
- 
- # Libraries we need
- #----------------------------------------------------------------------------------------------------------------
-@@ -91,8 +91,8 @@
- 
- export CFLAGS="-Wall -O2 -march=i586 -mtune=i586"
- export CXXFLAGS="-Wall -O2 -march=i586 -mtune=i586"
--export CPPFLAGS="-I../include $OGLE_INCLUDE $FOX_INCLUDE"
--export LIBS="$OGLE_LIB $XV_LIBS $FOX_LIB"
-+export CPPFLAGS="-I../include $OGLE_INCLUDE $FOX_INCLUDE -I%%X11BASE%%/include"
-+export LIBS="$OGLE_LIB $XV_LIBS $FOX_LIB %%PTHREADLIBS%%"
- export DEFS="-DLINUX $DXR3_DEFS $XV_DEFS"
- #----------------------------------------------------------------------------------------------------------------
- 
diff --git a/multimedia/goggles/files/patch-build::xvdetect b/multimedia/goggles/files/patch-build::xvdetect
new file mode 100644
index 000000000000..d69f547ebe44
--- /dev/null
+++ b/multimedia/goggles/files/patch-build::xvdetect
@@ -0,0 +1,11 @@
+--- build/xvdetect.orig	Tue Dec 14 09:37:27 2004
++++ build/xvdetect	Tue Dec 14 09:37:39 2004
+@@ -30,7 +30,7 @@
+ 	if [ -f ${XLIBDIR}/libXv.a ] || [ -f ${XLIBDIR}/libXv.so ] ; then
+ 		echo -e " Check XVideo Library: \033[32mFOUND\033[0m"
+     LIBS="${LIBS} -L${XLIBDIR} -lXext -lXv"
+-    DEFS="${DEFS} -DHAVE_XV" 
++    DEFS="${DEFS} -I${XINCLUDEDIR} -DHAVE_XV" 
+ 	else
+ 		echo -e " Check XVideo Library: \033[31mNot Found\033[0m"
+ 		exit -1