4 files changed, 165 insertions, 113 deletions

diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 62753339f77a..0e52d0e0dabf 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -1,33 +1,25 @@
-# New ports collection makefile for:	vbidecode
+# New ports collection makefile for:	videotext
 # Date created:		Tue June 8 15:11:00 BST 1999
-# Whom:			Roger Hardiman <roger@freebsd.org>
+# Whom:			Roger Hardiman <roger@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	videotext
-PORTVERSION=	0.6.971023
+PORTVERSION=	0.6.19991029
 CATEGORIES=	misc
 MASTER_SITES=	http://elektra.e-technik.uni-ulm.de/~mbuck/download/
 
-MAINTAINER=	roger@freebsd.org
+MAINTAINER=	roger@FreeBSD.org
 
 LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 		xview.3:${PORTSDIR}/x11-toolkits/xview
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-MAN1=		videotext.1 tunerctl.1 vtxget.1
+MAN1=		tunerctl.1 videotext.1 vtxget.1
 
-.include <bsd.port.pre.mk>
+FONTSDIR=	lib/X11/fonts/local
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-pre-install:
-.if !exists(${X11BASE}/lib/X11/fonts/local)
-	@${ECHO} "*********************************************************"
-	@${ECHO} "Please update your XFree86 to version 3.3.3 or later"
-	@${ECHO} "or add ${X11BASE}/lib/X11/fonts/local to your font path"
-	@${ECHO} "in /etc/XF86Config."
-	@${ECHO} "*********************************************************"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/videotext/distinfo b/misc/videotext/distinfo
index d8883822e416..94c5cfc4a79e 100644
--- a/misc/videotext/distinfo
+++ b/misc/videotext/distinfo
@@ -1 +1 @@
-MD5 (videotext-0.6.971023.tar.gz) = 2a6d760d007d0049040b0de0aa43a7a6
+MD5 (videotext-0.6.19991029.tar.gz) = dfff7f5f3a5ad3353d5c47154d521bb2
diff --git a/misc/videotext/files/patch-ba b/misc/videotext/files/patch-ba
index 62f47a20bfab..4f95ae68f243 100644
--- a/misc/videotext/files/patch-ba
+++ b/misc/videotext/files/patch-ba
@@ -1,75 +1,147 @@
-*** Makefile.orig	Wed Oct 22 18:55:44 1997
---- Makefile	Thu Feb 17 16:07:45 2000
-***************
-*** 22,35 ****
-  
-  # Set the installation-directories & permissions here
-  
-! LIBDIR = /usr/local/lib/vtx
-! SPOOLDIR = /var/spool/vtx
-  
-! BINDIR = /usr/local/bin
-! XBINDIR = /usr/local/bin/X11
-! FONTDIR = /usr/lib/X11/fonts/local
-! MANDIR = /usr/local/man
-! XMANDIR = /usr/local/man
-  
-  DIRPERM = 755
-  SPOOLDIRPERM = 777
---- 22,42 ----
-  
-  # Set the installation-directories & permissions here
-  
-! #LIBDIR = /usr/local/lib/vtx
-! #SPOOLDIR = /var/spool/vtx
-! #BINDIR = /usr/local/bin
-! #XBINDIR = /usr/local/bin/X11
-! #FONTDIR = /usr/lib/X11/fonts/local
-! #MANDIR = /usr/local/man
-! #XMANDIR = /usr/local/man
-  
-! SPOOLDIR = /var/spool/vtx
-! LIBDIR = ${X11BASE}/lib/X11/vtx
-! BINDIR = ${X11BASE}/bin
-! XBINDIR = ${X11BASE}/bin
-! FONTDIR = ${X11BASE}/lib/X11/fonts/local
-! MANDIR = ${X11BASE}/man
-! XMANDIR = ${X11BASE}/man
-  
-  DIRPERM = 755
-  SPOOLDIRPERM = 777
-***************
-*** 73,88 ****
-  # useful if you want to distribute VideoteXt and want to avoid trouble with
-  # Unisys' stupid licensing conditions.
-  
-! GIF_SUPPORT = -DGIF_SUPPORT
-  
-  
-  # Uncomment the next lines if you want PNG support and have libpng and libz
-  # installed.
-  
-! #PNG_SUPPORT = -DPNG_SUPPORT
-! #PNG_LIBS = -lpng -lz -lm
-! #PNG_INCLUDEDIRS = -I/usr/local/include
-! #PNG_LIBDIRS = -L/usr/local/lib
-  
-  
-  # Uncomment the following line if you want to get coredumps when an
---- 80,95 ----
-  # useful if you want to distribute VideoteXt and want to avoid trouble with
-  # Unisys' stupid licensing conditions.
-  
-! #GIF_SUPPORT = -DGIF_SUPPORT
-  
-  
-  # Uncomment the next lines if you want PNG support and have libpng and libz
-  # installed.
-  
-! PNG_SUPPORT = -DPNG_SUPPORT
-! PNG_LIBS = -lpng -lz -lm
-! PNG_INCLUDEDIRS = -I/usr/local/include
-! PNG_LIBDIRS = -L/usr/local/lib
-  
-  
-  # Uncomment the following line if you want to get coredumps when an
+--- Makefile.orig	Fri Oct 29 07:06:32 1999
++++ Makefile	Wed Feb 16 03:23:53 2000
+@@ -22,14 +22,21 @@
+ 
+ # Set the installation-directories & permissions here
+ 
+-LIBDIR = /usr/local/lib/vtx
+-SPOOLDIR = /var/spool/vtx
++#LIBDIR = /usr/local/lib/vtx
++#SPOOLDIR = /var/spool/vtx
++#BINDIR = /usr/local/bin
++#XBINDIR = /usr/local/bin/X11
++#FONTDIR = /usr/lib/X11/fonts/local
++#MANDIR = /usr/local/man
++#XMANDIR = /usr/local/man
+ 
+-BINDIR = /usr/local/bin
+-XBINDIR = /usr/local/bin/X11
+-FONTDIR = /usr/lib/X11/fonts/local
+-MANDIR = /usr/local/man
+-XMANDIR = /usr/local/man
++SPOOLDIR = /var/spool/vtx
++LIBDIR = ${PREFIX}/lib/X11/vtx
++BINDIR = ${PREFIX}/bin
++XBINDIR = ${PREFIX}/bin
++FONTDIR = ${PREFIX}/lib/X11/fonts/local
++MANDIR = ${PREFIX}/man
++XMANDIR = ${PREFIX}/man
+ 
+ DIRPERM = 755
+ SPOOLDIRPERM = 777
+@@ -58,11 +65,11 @@
+ 
+ # Compiler options
+ 
+-INCLUDEDIRS = -I/usr/openwin/include -I/usr/X11R6/include
+-LIBDIRS = -L/usr/openwin/lib -L/usr/X11R6/lib
++INCLUDEDIRS = -I${X11BASE}/include
++LIBDIRS = -L${X11BASE}/lib
+ 
+-CC = gcc
+-CCFLAGS = -O2 -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes
++CC ?= gcc
++CCFLAGS = -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes
+ 
+ LDFLAGS =
+ CLIBS =
+@@ -79,10 +86,10 @@
+ # Uncomment the next lines if you want PNG support and have libpng and libz
+ # installed.
+ 
+-#PNG_SUPPORT = -DPNG_SUPPORT
+-#PNG_LIBS = -lpng -lz -lm
+-#PNG_INCLUDEDIRS = -I/usr/local/include
+-#PNG_LIBDIRS = -L/usr/local/lib
++PNG_SUPPORT = -DPNG_SUPPORT
++PNG_LIBS = -lpng -lz -lm
++PNG_INCLUDEDIRS = -I${LOCALBASE}/include
++PNG_LIBDIRS = -L${LOCALBASE}/lib
+ 
+ 
+ # Uncomment the following line if you want to get coredumps when an
+@@ -131,7 +138,7 @@
+ #####################################################################
+ 
+ DEFINES += -DVTX_LIBDIR=\"$(LIBDIR)\" -DVTX_SPOOLDIR=\"$(SPOOLDIR)\"
+-CFLAGS = $(DEFINES) $(GIF_SUPPORT) $(PNG_SUPPORT) $(CCFLAGS) $(INCLUDEDIRS) $(PNG_INCLUDEDIRS) \
++CFLAGS += $(DEFINES) $(GIF_SUPPORT) $(PNG_SUPPORT) $(CCFLAGS) $(INCLUDEDIRS) $(PNG_INCLUDEDIRS) \
+          -I. -Ibitmaps $(XCFLAGS)
+ LDFLAGS += $(XLDFLAGS)
+ 
+@@ -246,37 +253,33 @@
+ 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(XMANDIR) \
+ 	  $(DESTDIR)$(XMANDIR)/man1
+ 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
+-	install $(STRIP) $(_BINGRP) -m $(BINPERM) videotext $(DESTDIR)$(XBINDIR)
+-	install $(_MANGRP) -m $(MANPERM) videotext.1 $(DESTDIR)$(XMANDIR)/man1
+-	install $(_LIBGRP) -m $(LIBPERM) $(HELP) $(DESTDIR)$(LIBDIR)/videotext.info
++	${BSD_INSTALL_PROGRAM} videotext $(DESTDIR)$(XBINDIR)
++	${BSD_INSTALL_MAN} videotext.1 $(DESTDIR)$(XMANDIR)/man1
++	${BSD_INSTALL_DATA} $(HELP) $(DESTDIR)$(LIBDIR)/videotext.info
+ 
+ install.vtxget: vtxget vtxget.1
+ 	-install -d $(_BINDIRGRP) -m $(BINDIRPERM) $(DESTDIR)$(BINDIR)
+ 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(MANDIR) \
+ 	  $(DESTDIR)$(MANDIR)/man1
+-	install $(STRIP) $(_BINGRP) -m $(BINPERM) vtxget $(DESTDIR)$(BINDIR)
+-	install $(_MANGRP) -m $(MANPERM) vtxget.1 $(DESTDIR)$(MANDIR)/man1
++	${BSD_INSTALL_PROGRAM} vtxget $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_MAN} vtxget.1 $(DESTDIR)$(MANDIR)/man1
+ 
+ install.tunerctl: tunerctl tunerctl.1
+ 	-install -d $(_BINDIRGRP) -m $(BINDIRPERM) $(DESTDIR)$(BINDIR)
+ 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(MANDIR) \
+ 	  $(DESTDIR)$(MANDIR)/man1
+-	install $(STRIP) $(_BINGRP) -m $(BINPERM) tunerctl $(DESTDIR)$(BINDIR)
+-	install $(_MANGRP) -m $(MANPERM) tunerctl.1 $(DESTDIR)$(MANDIR)/man1
++	${BSD_INSTALL_PROGRAM} tunerctl $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_MAN} tunerctl.1 $(DESTDIR)$(MANDIR)/man1
+ 
+ install.xfonts: $(PCFFONTS)
+ 	-install -d $(_FONTDIRGRP) -m $(FONTDIRPERM) $(DESTDIR)$(FONTDIR)
+-	install $(_FONTGRP) -m $(FONTPERM) $(PCFFONTS) $(DESTDIR)$(FONTDIR)
++	${BSD_INSTALL_DATA} $(PCFFONTS) $(DESTDIR)$(FONTDIR)
+ 	mkfontdir $(DESTDIR)$(FONTDIR)
+-	chmod $(FONTPERM) $(DESTDIR)$(FONTDIR)/fonts.dir
+-ifneq ($(FONTGRP),)
+-	chgrp $(FONTGRP) $(DESTDIR)$(FONTDIR)/fonts.dir
+-endif
+ 	-xset fp rehash
+ 
+ install.fonts: $(VTXFONTS)
+ 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
+-	install $(_LIBGRP) -m $(LIBPERM) $(VTXFONTS) $(DESTDIR)$(LIBDIR)
++	${BSD_INSTALL_DATA} $(VTXFONTS) $(DESTDIR)$(LIBDIR)
+ 
+ install.config:
+ 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
+@@ -286,7 +289,7 @@
+ 	@echo Do a \'make install.forceconfig\' to overwrite old version.
+ 	@echo
+ else
+-	install $(_LIBGRP) -m $(LIBPERM) data/vtxrc $(DESTDIR)$(LIBDIR)
++	${BSD_INSTALL_DATA} data/vtxrc $(DESTDIR)$(LIBDIR)
+ endif
+ ifeq ($(DESTDIR)$(LIBDIR)/vtx-hotlist,$(wildcard $(DESTDIR)$(LIBDIR)/vtx-hotlist))
+ 	@echo
+@@ -295,16 +298,16 @@
+ 	@echo Or do a \'make install.forceconfig\' to overwrite old version.
+ 	@echo
+ else
+-	install $(_LIBGRP) -m $(LIBPERM) data/vtx-hotlist $(DESTDIR)$(LIBDIR)
++	${BSD_INSTALL_DATA} data/vtx-hotlist $(DESTDIR)$(LIBDIR)
+ endif
+ 
+ install.forceconfig:
+ 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
+-	install $(_LIBGRP) -m $(LIBPERM) data/vtxrc data/vtx-hotlist $(DESTDIR)$(LIBDIR)
++	${BSD_INSTALL_DATA} data/vtxrc data/vtx-hotlist $(DESTDIR)$(LIBDIR)
+ 
+ install.lib:
+ 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
+-	install $(_LIBGRP) -m $(LIBPERM) data/tv-channels $(DESTDIR)$(LIBDIR)
++	${BSD_INSTALL_DATA} data/tv-channels $(DESTDIR)$(LIBDIR)
+ 
+ install.spooldirs:
+ 	-install -d -m $(BASESPOOLDIRPERM) $(DESTDIR)$(SPOOLDIR)
diff --git a/misc/videotext/pkg-plist b/misc/videotext/pkg-plist
index b77912099bfc..9b7039ad1cc9 100644
--- a/misc/videotext/pkg-plist
+++ b/misc/videotext/pkg-plist
@@ -1,7 +1,6 @@
-bin/vtxget
 bin/tunerctl
 bin/videotext
-
+bin/vtxget
 lib/X11/vtx/tv-channels
 lib/X11/vtx/videotext.info
 lib/X11/vtx/vtx-hotlist
@@ -10,23 +9,12 @@ lib/X11/vtx/vtx15x18.vtxfont
 lib/X11/vtx/vtx20x24.vtxfont
 lib/X11/vtx/vtxrc
 
-lib/X11/fonts/local/vtx10x12d.pcf
-lib/X11/fonts/local/vtx15x18d.pcf
-lib/X11/fonts/local/vtx20x24d.pcf
-lib/X11/fonts/local/vtx10x12.pcf
-lib/X11/fonts/local/vtx15x18.pcf
-lib/X11/fonts/local/vtx20x24.pcf
-
-@exec /bin/chmod u+w %D/lib/X11/fonts/local %D/lib/X11/fonts/local/fonts.dir
-@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
-@exec /bin/chmod u=rwx,go=rx %D/lib/X11/fonts/local
-@exec /bin/chmod a=r %D/lib/X11/fonts/local/fonts.dir
-
-
-@unexec /bin/chmod u+w %D/lib/X11/fonts/local %D/lib/X11/fonts/local/fonts.dir
-@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
-@unexec /bin/chmod u=rwx,go=rx %D/lib/X11/fonts/local
-@unexec /bin/chmod a=r %D/lib/X11/fonts/local/fonts.dir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
-
+%%FONTSDIR%%/vtx10x12d.pcf
+%%FONTSDIR%%/vtx15x18d.pcf
+%%FONTSDIR%%/vtx20x24d.pcf
+%%FONTSDIR%%/vtx10x12.pcf
+%%FONTSDIR%%/vtx15x18.pcf
+%%FONTSDIR%%/vtx20x24.pcf
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @dirrm lib/X11/vtx