- Fix build with new gcc version (patch-tvchannels.c)

- Remove s/gawk/awk/ patches and introduce build time dependecy to gawk
  because one of the scripts uses `strftime' which is not available in
  our base systems awk.

Approved by:	portmgr (clement)

8 files changed, 14 insertions, 128 deletions

diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 63a01e4758d7..015e3ac836e3 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -14,7 +14,9 @@ MASTER_SITES=	http://elektra.e-technik.uni-ulm.de/~mbuck/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11/Xview TV Videotext/Teletext page viewer (.vtx files)
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT} \
+		gawk:${PORTSDIR}/lang/gawk
+
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		xview.3:${PORTSDIR}/x11-toolkits/xview
 
@@ -25,10 +27,4 @@ MAN1=		tunerctl.1 videotext.1 vtxget.1
 FONTSDIR=	lib/X11/fonts/local
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502102
-BROKEN=		"Does not build"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/videotext/files/patch-aa b/misc/videotext/files/patch-aa
deleted file mode 100644
index f0533324e0fb..000000000000
--- a/misc/videotext/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scripts/check-help.orig	Tue Jun  8 16:10:07 1999
---- scripts/check-help	Tue Jun  8 16:10:07 1999
-*************** INFOFILE="$1"
-*** 24,30 ****
-  shift
-  
-  egrep -h 'XV_HELP_DATA.*"videotext:[a-zA-Z0-9_]+"' "$@" |
-!   gawk '
-      BEGIN {
-        RS = "[ \t,]"
-      }
---- 24,30 ----
-  shift
-  
-  egrep -h 'XV_HELP_DATA.*"videotext:[a-zA-Z0-9_]+"' "$@" |
-!   awk '
-      BEGIN {
-        RS = "[ \t,]"
-      }
diff --git a/misc/videotext/files/patch-ab b/misc/videotext/files/patch-ab
deleted file mode 100644
index 3ce89ca54a29..000000000000
--- a/misc/videotext/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scripts/install-magic.orig	Tue Jun  8 16:10:07 1999
---- scripts/install-magic	Tue Jun  8 16:10:07 1999
-*************** fi
-*** 21,27 ****
-  trap 'rm -f "$1.vtxnew"' 0
-  
-  cp -p "$1" "$1.vtxnew"
-! gawk '
-    /^#.*Id: Localstuff/ {
-      localfound++
-    }
---- 21,27 ----
-  trap 'rm -f "$1.vtxnew"' 0
-  
-  cp -p "$1" "$1.vtxnew"
-! awk '
-    /^#.*Id: Localstuff/ {
-      localfound++
-    }
diff --git a/misc/videotext/files/patch-ac b/misc/videotext/files/patch-ac
deleted file mode 100644
index bc31792704a6..000000000000
--- a/misc/videotext/files/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-*** scripts/mkpsprolog.orig	Tue Jun  8 16:10:07 1999
---- scripts/mkpsprolog	Tue Jun  8 16:10:07 1999
-***************
-*** 8,17 ****
-  # Read COPYING for more information
-  
-  # Maybe sed would be more suitable for such a simple task, but you already
-! # need gawk for mktitlepage & mkvtxfont, so why not use it here...
-  
-  
-! exec gawk '
-    BEGIN {
-      print "/* This file was created automatically by mkpsprolog. DO NOT EDIT */"
-      print ""
---- 8,17 ----
-  # Read COPYING for more information
-  
-  # Maybe sed would be more suitable for such a simple task, but you already
-! # need awk for mktitlepage & mkvtxfont, so why not use it here...
-  
-  
-! exec awk '
-    BEGIN {
-      print "/* This file was created automatically by mkpsprolog. DO NOT EDIT */"
-      print ""
diff --git a/misc/videotext/files/patch-ad b/misc/videotext/files/patch-ad
deleted file mode 100644
index bcad311d4a66..000000000000
--- a/misc/videotext/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scripts/mktitlepage.orig	Tue Jun  8 16:10:07 1999
---- scripts/mktitlepage	Tue Jun  8 16:10:07 1999
-***************
-*** 14,20 ****
-  # by 2 hex-digits, so currently we can only set the lower 16 bits of the attributes.
-  
-  
-! exec gawk '
-    BEGIN {
-      print "/* This file was created automatically by mktitlepage. DO NOT EDIT */"
-    }
---- 14,20 ----
-  # by 2 hex-digits, so currently we can only set the lower 16 bits of the attributes.
-  
-  
-! exec awk '
-    BEGIN {
-      print "/* This file was created automatically by mktitlepage. DO NOT EDIT */"
-    }
diff --git a/misc/videotext/files/patch-ae b/misc/videotext/files/patch-ae
deleted file mode 100644
index b2acef23a7c6..000000000000
--- a/misc/videotext/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scripts/mkvtxfont.orig	Tue Jun  8 16:10:07 1999
---- scripts/mkvtxfont	Tue Jun  8 16:10:07 1999
-*************** if [ $# -ne 4 ]; then
-*** 18,24 ****
-    exit 1
-  fi
-  
-! exec gawk -v "nfile=$2" -v "dfile=$3" -v "vfile=$4" -f - << "THIS_IS_THE_END" "$1"
-  
-  function print_header(xsize, ysize, ptsize, width, file) { # Print BDF-File header
-    print "STARTFONT 2.1" > file
---- 18,24 ----
-    exit 1
-  fi
-  
-! exec awk -v "nfile=$2" -v "dfile=$3" -v "vfile=$4" -f - << "THIS_IS_THE_END" "$1"
-  
-  function print_header(xsize, ysize, ptsize, width, file) { # Print BDF-File header
-    print "STARTFONT 2.1" > file
diff --git a/misc/videotext/files/patch-af b/misc/videotext/files/patch-af
deleted file mode 100644
index edb726c1e467..000000000000
--- a/misc/videotext/files/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-*** scripts/uninstall-magic.orig	Tue Jun  8 16:10:07 1999
---- scripts/uninstall-magic	Tue Jun  8 16:10:07 1999
-*************** fi
-*** 21,27 ****
-  trap 'rm -f "$1.vtxnew"' 0
-  
-  cp -p "$1" "$1.vtxnew"
-! gawk '
-    /^#.*VideoteXt/ {
-      skip = 1
-      next
---- 21,27 ----
-  trap 'rm -f "$1.vtxnew"' 0
-  
-  cp -p "$1" "$1.vtxnew"
-! awk '
-    /^#.*VideoteXt/ {
-      skip = 1
-      next
diff --git a/misc/videotext/files/patch-tvchannels.c b/misc/videotext/files/patch-tvchannels.c
new file mode 100644
index 000000000000..8239c1aedd19
--- /dev/null
+++ b/misc/videotext/files/patch-tvchannels.c
@@ -0,0 +1,10 @@
+--- tvchannels.c.orig	Tue Aug 16 20:12:35 2005
++++ tvchannels.c	Tue Aug 16 20:17:07 2005
+@@ -106,6 +106,7 @@
+           (*chan)->freq = freq;
+           (*chan)->next = NULL;
+ chan_done:
++	  ;
+         } else {
+           fprintf(stderr, "%s:%d: Warning: Frequency out of range, line ignored:\n%s\n",
+               FNAME, lcount, line);