Since updating Xaw3d to 1.5E, fxtv breaks (during startup) when

compiled with -O2 -- remove it. While here, do some minor cleanups
in the package Makefile.  Bump PKGREVISION so that working versions
can be identified.

3 files changed, 16 insertions, 18 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 35f8f8459b4..85aec8d869b 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/12/28 23:18:16 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/23 01:11:47 wiz Exp $
 
 DISTNAME=	fxtv-1.03
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tgz
@@ -10,9 +10,6 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~rhh/fxtv/
 COMMENT=	TV display application for Brooktree 848 compatible TV cards
 
-#ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-arm NetBSD-1.[5-9]*-arm32	\
-#			NetBSD-1.[5-9]*-atari NetBSD-1.[5-9]*-i386
-
 USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
@@ -21,14 +18,11 @@ XAW_TYPE?=	3d
 SUBST_CLASSES+=		ossaudio
 SUBST_MESSAGE.ossaudio=	"Fixing path to audio device."
 SUBST_STAGE.ossaudio=	pre-configure
-SUBST_FILES.ossaudio=	app_rsrc.h
-SUBST_FILES.ossaudio+=	Fxtv
+SUBST_FILES.ossaudio=	app_rsrc.h Fxtv README
 SUBST_SED.ossaudio=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_ENV+=	X11PREFIX=${X11PREFIX}
-
 # The purpose of this check is to make sure that there is a "Xaw3d"
 # compatible widget set installed because normal "Xaw" won't work.
 #
@@ -40,11 +34,6 @@ post-extract:
 	@${RM} -f ${WRKSRC}/videolib/videolib.o
 
 pre-configure:
-	cd ${WRKSRC}; for file in app_rsrc.h Fxtv; do			\
-		${SED}	-e "s,/dev/dsp,${DEVOSSAUDIO},g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
 	if [ -r /usr/include/machine/mouse.h ] ; then \
 		echo '#define HAVE_MOUSE_H 1' > ${WRKSRC}/netbsdconf.h; \
 	else \
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index 44f6bb0960a..1d542d18ed8 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/09/28 15:26:09 tron Exp $
+$NetBSD: distinfo,v 1.4 2005/02/23 01:11:47 wiz Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 Size (fxtv-1.03.tgz) = 198669 bytes
-SHA1 (patch-aa) = 6479f8e0930390dd5fcdf38c3f850ad355829db0
+SHA1 (patch-aa) = 19f9625dbfbacf06fdd7bb45b72a1806dc822568
 SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
 SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa
index 100139bb377..8c04f7a070a 100644
--- a/multimedia/fxtv/patches/patch-aa
+++ b/multimedia/fxtv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/09/28 15:26:09 tron Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/23 01:11:47 wiz Exp $
 
 --- Makefile.orig	2001-02-12 23:08:59.000000000 +0100
-+++ Makefile	2004-09-28 17:22:05.000000000 +0200
++++ Makefile	2005-02-23 02:00:43.000000000 +0100
 @@ -4,13 +4,10 @@
  
  HAVE_XFREE86 = YES
@@ -46,6 +46,15 @@ $NetBSD: patch-aa,v 1.2 2004/09/28 15:26:09 tron Exp $
  endif
  
  #
+@@ -62,7 +50,7 @@
+ ifneq ($(DEBUG),NO)
+   override CFLAGS          = -DDEBUG -g
+ else
+-  override CFLAGS          = -DNDEBUG -O2
++  override CFLAGS          = -DNDEBUG
+ endif
+ C_WARN_FLAG                = -Wall
+ override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
 @@ -72,6 +60,15 @@
  
  override CFLAGS           += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\"