4 files changed, 87 insertions, 26 deletions

diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index df7b3c333bca..92807222e180 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	alevt
-# Version required:	1.4.9
+# Version required:	1.5.0
 # Date created:		Wed Aug 18 13:23:00 BST 1999
 # Whom:			Roger Hardiman <roger@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	alevt-1.4.9
+DISTNAME=	alevt-1.5.0
 CATEGORIES=	misc
-MASTER_SITES=	http://user.exit.de/froese/alevt/
+MASTER_SITES=	http://user.exit.de/froese/alevt/  \
+		ftp://metalab.unc.edu/pub/Linux/apps/video/
 
 MAINTAINER=	roger@freebsd.org
 
diff --git a/misc/alevt/distinfo b/misc/alevt/distinfo
index e36b3ada868e..5816ecab982c 100644
--- a/misc/alevt/distinfo
+++ b/misc/alevt/distinfo
@@ -1 +1 @@
-MD5 (alevt-1.4.9.tar.gz) = 25be258681308dc26883799cf1278018
+MD5 (alevt-1.5.0.tar.gz) = 40b0865b5f95eff5050c1ecdd2a1d5ce
diff --git a/misc/alevt/files/patch-aa b/misc/alevt/files/patch-aa
index a94038293c71..f76ba390a4df 100644
--- a/misc/alevt/files/patch-aa
+++ b/misc/alevt/files/patch-aa
@@ -1,9 +1,65 @@
-*** search.c.orig	Wed Aug 18 13:29:10 1999
---- search.c	Wed Aug 18 13:29:31 1999
-***************
-*** 1,3 ****
---- 1,4 ----
-+ #include <sys/types.h>
-  #include <stdlib.h>
-  #include "vt.h"
-  #include "misc.h"
+*** Makefile.orig	Fri Oct  8 22:49:26 1999
+--- Makefile	Tue Oct 12 10:54:23 1999
+*************** VER=1.5.0
+*** 2,8 ****
+  OPT=-O2 -s
+  DEFS=-DWITH_PNG
+  
+! CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -W
+  
+  EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
+  OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
+--- 2,8 ----
+  OPT=-O2 -s
+  DEFS=-DWITH_PNG
+  
+! CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
+  
+  EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
+  OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
+*************** TOBJS=alevt-date.o vbi.o fdset.o misc.o 
+*** 10,16 ****
+  COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
+  
+  ifneq ($(findstring WITH_PNG,$(DEFS)),)
+! EXPLIBS=-lpng -lz -lm
+  endif
+  
+  all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
+--- 10,16 ----
+  COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
+  
+  ifneq ($(findstring WITH_PNG,$(DEFS)),)
+! EXPLIBS=-L/usr/local/lib -lpng -lz -lm
+  endif
+  
+  all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
+*************** rpm-install: all
+*** 65,77 ****
+  # anything below this line is just for me!
+  
+  install: all
+! 	cp alevt	/usr/local/bin
+! 	cp alevt-date	/usr/local/bin
+! 	cp alevt-cap	/usr/local/bin
+! 	cp alevt.1x	/usr/local/man/man1
+! 	cp alevt-date.1	/usr/local/man/man1
+! 	cp alevt-cap.1	/usr/local/man/man1
+! 	cp contrib/mini-alevt.xpm /usr/include/X11/pixmaps
+  	sync
+  
+  depend:
+--- 65,77 ----
+  # anything below this line is just for me!
+  
+  install: all
+! 	cp alevt	$(X11BASE)/bin
+! 	cp alevt-date	$(X11BASE)/bin
+! 	cp alevt-cap	$(X11BASE)/bin
+! 	cp alevt.1x	$(X11BASE)/man/man1
+! 	cp alevt-date.1	$(X11BASE)/man/man1
+! 	cp alevt-cap.1	$(X11BASE)/man/man1
+! 	cp contrib/mini-alevt.xpm $(X11BASE)/include/X11/pixmaps
+  	sync
+  
+  depend:
diff --git a/misc/alevt/files/patch-ab b/misc/alevt/files/patch-ab
index eb7d948a2973..afcd06bafe68 100644
--- a/misc/alevt/files/patch-ab
+++ b/misc/alevt/files/patch-ab
@@ -1,15 +1,19 @@
-*** alevt-date.c.orig	Wed Aug 18 13:33:52 1999
---- alevt-date.c	Wed Aug 18 13:33:31 1999
-*************** chk_time(int t)
-*** 32,39 ****
---- 32,41 ----
+*** exp-txt.c.orig	Tue Oct 12 10:28:27 1999
+--- exp-txt.c	Tue Oct 12 10:31:59 1999
+*************** txt_option(struct export *e, int opt, ch
+*** 87,92 ****
+--- 87,100 ----
+      return 0;
+  }
   
-      t = t/100/100 * 60*60 + t/100%100 * 60 + t%100;
-      t += timezone;
-+ /*
-      if (daylight)
-  	t -= 60*60;
-+ */
++ /* stpcpy is only defined on Linux systems */
++ /* create a local function for BSD Unix systems */
++ char *stpcpy(char *dst, char *src)
++ {
++     while (*dst++ = *src++)
++       ;
++     return dst-1;
++ }
   
-      sys_t = time(0);
-      dt = t - sys_t % (24*60*60);
+  static void
+  put_attr(struct export *e, struct fmt_char *new)