Update to version 1.1.

PR:		14921
Submitted by:	Dominic Mitchell <dom@palmerharvey.co.uk>

4 files changed, 69 insertions, 87 deletions

diff --git a/misc/display/Makefile b/misc/display/Makefile
index a169147c1761..6a15c6b6de70 100644
--- a/misc/display/Makefile
+++ b/misc/display/Makefile
@@ -6,24 +6,14 @@
 # $FreeBSD$
 #
 
-DISTNAME=		display
-PKGNAME=		display-1.0
+DISTNAME=		display-1.1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_COMP_SOURCES}
-MASTER_SITE_SUBDIR=	unix/volume8
-EXTRACT_SUFX=		.Z
-
-PATCH_SITES=		${MASTER_SITES}
-PATCHFILES=		display.pch.Z
+MASTER_SITES=		http://www.ipsmart.com/src/
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		ports@FreeBSD.org
 
-BUILD_DEPENDS=		gunshar:${PORTSDIR}/archivers/gshar+gunshar
-
-NO_WRKSUBDIR=		yes
-EXTRACT_CMD=		zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	| gunshar -d ${WRKDIR}
+GNU_CONFIGURE=		yes
 
 MAN1=			display.1
 
diff --git a/misc/display/distinfo b/misc/display/distinfo
index bcc0efedc40b..c4cdb59323f9 100644
--- a/misc/display/distinfo
+++ b/misc/display/distinfo
@@ -1,2 +1 @@
-MD5 (display.Z) = 5ee3e53bf0b99dd4b94b5329e8a0fd2e
-MD5 (display.pch.Z) = c77e579b4dcc07fbf2dee01113029f0d
+MD5 (display-1.1.tgz) = c73adec7c00fdbe2ab1484d1429b4408
diff --git a/misc/display/files/patch-aa b/misc/display/files/patch-aa
index 7145aba69342..d99fef33c821 100644
--- a/misc/display/files/patch-aa
+++ b/misc/display/files/patch-aa
@@ -1,59 +1,45 @@
-*** ../display.c	Mon Aug 25 18:45:10 1997
---- display.c	Mon Aug 25 18:48:31 1997
-***************
-*** 8,13 ****
---- 8,14 ----
-  #include <curses.h>
-  #include <signal.h>
-  #include <ctype.h>
-+ #include <stdio.h>
-  
-  
-  #define		DEFAULT_DELAY	5
-***************
-*** 16,30 ****
-  static	char	*Command;
-  static	int	Delay;
-  
-  
-  main(argc, argv)
-  int	argc;
-  char	*argv[];
-  {
-- 	extern	void	parse_args(),
-- 			die(),
-- 			display();
-- 
-  	parse_args(argc, argv);
-  
-  	signal(SIGHUP, die);
---- 17,28 ----
-  static	char	*Command;
-  static	int	Delay;
-  
-+ static void die(), display(), parse_args(), usage();
-  
-  main(argc, argv)
-  int	argc;
-  char	*argv[];
-  {
-  	parse_args(argc, argv);
-  
-  	signal(SIGHUP, die);
-***************
-*** 54,60 ****
-  
-  static void display()
-  {
-! 	auto	FILE	*fp, *popen();
-  	auto	char	ch;
-  
-  	if (!(fp = popen(Command, "r"))) {
---- 52,58 ----
-  
-  static void display()
-  {
-! 	auto	FILE	*fp;
-  	auto	char	ch;
-  
-  	if (!(fp = popen(Command, "r"))) {
+--- display.c.orig	Tue Nov 16 12:34:12 1999
++++ display.c	Tue Nov 16 12:36:36 1999
+@@ -8,7 +8,7 @@
+ #include <curses.h>
+ #include <signal.h>
+ #include <ctype.h>
+-
++#include <stdio.h>
+ 
+ #define		DEFAULT_DELAY	5
+ 
+@@ -16,15 +16,13 @@
+ static	char	*Command;
+ static	int	Delay;
+ 
++static void die(), display(), parse_args(), usage();
+ 
+ main(argc, argv)
+ int	argc;
+ char	*argv[];
+ {
+   int i, c;
+-  extern	void	parse_args(),
+-    die(),
+-    display();
+   
+   parse_args(argc, argv);
+   
+@@ -68,7 +66,7 @@
+ 
+ static void display()
+ {
+-	FILE	*fp, *popen();
++	FILE	*fp;
+ 	char	ch;
+ 
+ 	if (!(fp = popen(Command, "r"))) {
+@@ -83,7 +81,6 @@
+ 		addch(ch);
+ 	}
+ 	clrtoeol();
+-	clrtobot();
+ 	refresh();
+ 	pclose(fp);
+ }
diff --git a/misc/display/files/patch-ab b/misc/display/files/patch-ab
index 1227a1fab267..b402d35369ea 100644
--- a/misc/display/files/patch-ab
+++ b/misc/display/files/patch-ab
@@ -1,12 +1,19 @@
-*** ../display.c	Fri Sep 11 21:17:39 1998
---- display.c	Thu Sep 10 20:51:23 1998
-***************
-*** 67,72 ****
---- 67,73 ----
-  		addch(ch);
-  	}
-  	clrtoeol();
-+ 	clrtobot();
-  	refresh();
-  	pclose(fp);
-  }
+--- Makefile.in.orig	Tue Nov 16 12:44:10 1999
++++ Makefile.in	Tue Nov 16 12:43:58 1999
+@@ -2,10 +2,12 @@
+ # vix 15dec86 [stolen from 'which']
+ 
+ # start changing
+-CFLAGS		=	-O
+-DEST_DIR	=	/usr/local/bin
+-CURSES_LIBS	=	-lcurses -ltermcap
+-MAN_DIR		=	/usr/man/man1
++prefix		=	@prefix@
++exec_prefix	=	@exec_prefix@
++CFLAGS		=	@CFLAGS@
++DEST_DIR	=	@bindir@
++CURSES_LIBS	=	-lncurses
++MAN_DIR		=	@mandir@/man1
+ MAN_SUFFIX	=	1
+ SHAR_ARGS	=	-b -c -v
+ # stop changing