From 62d4ead4506b1ac8288139b83c3b37596af9b0be Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 15 Jun 2000 01:13:36 +0000
Subject: [PATCH] - remove license type - respect CFLAGS (don't always compile
 with -m486) - properly Fake this port

---
 graphics/fxtv/Makefile         | 28 ++++++++++++++--------------
 graphics/fxtv/patches/patch-aa | 16 +++++++++++-----
 graphics/fxtv/patches/patch-ak | 11 +++++++++++
 3 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 graphics/fxtv/patches/patch-ak

diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index a6f2bed263b..73339911cd2 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,24 +1,15 @@
-# $OpenBSD: Makefile,v 1.17 2000/06/14 16:13:38 angelos Exp $
+# $OpenBSD: Makefile,v 1.18 2000/06/15 01:13:36 brad Exp $
 # $FreeBSD: Makefile,v 1.17 1999/03/16 14:01:06 roger Exp $
 
 DISTNAME=	fxtv-1.02
 CATEGORIES=	graphics
-NEED_VERSION=	 1.230
+NEED_VERSION=	1.301
 MASTER_SITES=	http://www.ipass.net/~dbhopper/aa8vb/fxtv/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@openbsd.org
-
-LICENSE_TYPE=		BSD
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
 LIB_DEPENDS=	tiff.35::graphics/tiff \
 		jpeg.62::graphics/jpeg \
 		Xaw3d.6.1::x11/Xaw3d
-
 # This program does not actually require the programs below, but they are 
 # needed if you use digital video recording and playback.
 #RUN_DEPENDS=	sox::audio/sox \
@@ -27,11 +18,20 @@ LIB_DEPENDS=	tiff.35::graphics/tiff \
 #		mpeg_encode::graphics/mpeg_encode \
 #		mplex::graphics/mplex
 
-USE_X11=	Yes
+MAINTAINER=	ports@openbsd.org
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
 USE_GMAKE=      Yes
-MAKE_FLAGS=	-e
+MAKE_FLAGS=	CFLAGS="${CFLAGS}"
+FAKE_FLAGS=	PREFIX="${WRKINST}${PREFIX}"
 
 pre-build:
-	(cd $(WRKSRC)/videolib/; gmake clean; gmake)
+	@cd $(WRKSRC)/videolib && \
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKEFLAGS} -f ${MAKE_FILE} clean && \
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKEFLAGS} -f ${MAKE_FILE}
 
 .include <bsd.port.mk>
diff --git a/graphics/fxtv/patches/patch-aa b/graphics/fxtv/patches/patch-aa
index b318aeb16ad..ae7f339ba71 100644
--- a/graphics/fxtv/patches/patch-aa
+++ b/graphics/fxtv/patches/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun May 28 19:20:57 2000
-+++ Makefile	Sun May 28 19:21:49 2000
-@@ -40,6 +40,13 @@
+--- Makefile.orig	Thu Nov  4 19:43:51 1999
++++ Makefile	Wed Jun 14 13:39:28 2000
+@@ -40,12 +40,17 @@
  endif
  
  #
@@ -14,7 +14,13 @@
  # CFLAGS
  #
  ifneq ($(DEBUG),NO)
-@@ -74,7 +81,7 @@
+   override CFLAGS          = -DDEBUG -g
+-else
+-  override CFLAGS          = -O2 -m486
+ endif
+ C_WARN_FLAG                = -Wall
+ override CFLAGS           += $(C_WARN_FLAG) $(INC) $(CF_VERS)
+@@ -74,7 +79,7 @@
    override LDFLAGS        := -g $(LDFLAGS)
  endif
  
@@ -23,7 +29,7 @@
  
  override CSRC              = $(wildcard *.c)
  override PIXMAPS           = $(wildcard bitmaps/*.x?m)
-@@ -102,11 +109,11 @@
+@@ -102,11 +107,11 @@
  	mkdir -p $(FXTV_LIBDIR)/bitmaps
  	install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
  	install -c -m 444 -o root README $(FXTV_LIBDIR)
diff --git a/graphics/fxtv/patches/patch-ak b/graphics/fxtv/patches/patch-ak
new file mode 100644
index 00000000000..fb0f48a5158
--- /dev/null
+++ b/graphics/fxtv/patches/patch-ak
@@ -0,0 +1,11 @@
+--- videolib/Makefile.orig	Wed Jun 14 13:36:23 2000
++++ videolib/Makefile	Wed Jun 14 13:36:57 2000
+@@ -14,8 +14,6 @@
+ #
+ ifneq ($(DEBUG),NO)
+   override CFLAGS          = -DDEBUG -g
+-else
+-  override CFLAGS          = -DNDEBUG -O2 -m486
+ endif
+ C_WARN_FLAG                = -Wall
+ override CFLAGS           += $(C_WARN_FLAG) $(INC)