o Update to 0.7.7

o Remove BROKEN tag for ARCH alpha 5.x: a trial, we might have to
  add this back later on
o Uphold NOPORTDOCS
o Un"echo" do-install target
o Remove PLIST, replace with PLIST_{BIN,DOCS} in Makefile

4 files changed, 30 insertions, 21 deletions

diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 72f71705bee0..5143f64d7250 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	goggles
-PORTVERSION=	0.7.4.1
-PORTREVISION=	3
+PORTVERSION=	0.7.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.fifthplanet.net/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1//}
@@ -33,9 +32,9 @@ pre-everything::
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha" && ${OSVERSION} >= 502102
-BROKEN=		"Does not compile on alpha 5.x"
-.endif
+#.if ${ARCH} == "alpha" && ${OSVERSION} >= 502102
+#BROKEN=		"Does not compile on alpha 5.x"
+#.endif
 
 .ifdef(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
@@ -47,8 +46,20 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 .endif
 .endif
 
+PLIST_BIN=	\
+		bin/goggles \
+		bin/ogle_gui_goggles
+#
+.ifndef(NOPORTDOCS)
+PLIST_DOCS=	\
+		goggles_manual.pdf
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/gb
+	@${REINPLACE_CMD} -E \
+		-e 's|make|${GMAKE}|g' \
+		-e 's|function print_help|print_help|' \
+		${WRKSRC}/gb
 
 do-configure:
 	@${REINPLACE_CMD} -e 's|%%DVDDEVICE%%|${DEFAULT_DVD_DEVICE}|g' \
@@ -61,9 +72,11 @@ 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}
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/desktop/goggles_manual.pdf ${DOCSDIR}
+.endif
+	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/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 0c04c3e60c20..fd2798ff10aa 100644
--- a/multimedia/goggles/distinfo
+++ b/multimedia/goggles/distinfo
@@ -1,2 +1,2 @@
-MD5 (goggles-0.7.4.tar.bz2) = d0ef875a6559829ba131bfc0d3b2bfdf
-SIZE (goggles-0.7.4.tar.bz2) = 704793
+MD5 (goggles-0.7.7.tar.bz2) = d175c7770ceb10e715390dfedfd6fa13
+SIZE (goggles-0.7.7.tar.bz2) = 709916
diff --git a/multimedia/goggles/files/patch-build-config.linux b/multimedia/goggles/files/patch-build-config.linux
index 463bd05d626e..053d7be1af0c 100644
--- a/multimedia/goggles/files/patch-build-config.linux
+++ b/multimedia/goggles/files/patch-build-config.linux
@@ -1,5 +1,5 @@
---- build/config.linux.orig	Thu Jul  8 04:56:18 2004
-+++ build/config.linux	Sun Jul 11 03:20:58 2004
+--- 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}
@@ -30,10 +30,10 @@
  
  # Libraries we need
  #----------------------------------------------------------------------------------------------------------------
-@@ -85,8 +85,8 @@
+@@ -91,8 +91,8 @@
  
- export CFLAGS="-Wall -O2 -march=i586 -mcpu=i586"
- export CXXFLAGS="-Wall -O2 -march=i586 -mcpu=i586"
+ 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"
diff --git a/multimedia/goggles/pkg-plist b/multimedia/goggles/pkg-plist
deleted file mode 100644
index df72db83cca4..000000000000
--- a/multimedia/goggles/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/goggles
-bin/ogle_gui_goggles
-%%DOCSDIR%%/goggles_manual.pdf
-@dirrm %%DOCSDIR%%