Date: Tue, 16 Nov 1999 12:49:19 +0000 (GMT) From: Dom.Mitchell@palmerharvey.co.uk To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14921: new version of misc/display Message-ID: <19991116124919.AAD371CA@voodoo.pandhm.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 14921
>Category: ports
>Synopsis: New version of misc/display.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 16 05:00:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Dominic Mitchell
>Release: FreeBSD 3.3-STABLE i386
>Organization:
Palmer & Harvey McLane Ltd.
>Environment:
FreeBSD voodoo.pandhm.co.uk 3.3-STABLE FreeBSD 3.3-STABLE #3: Mon Nov 15 10:37:46 GMT 1999 dom@voodoo.pandhm.co.uk:/usr/src/sys/compile/VOODOO i386
>Description:
Update to latest version.
>How-To-Repeat:
n/a
>Fix:
Here's the patch: (NB: patches/patch-ac was removed)
diff -urP /usr/ports/misc/display/Makefile display/Makefile
--- /usr/ports/misc/display/Makefile Tue Aug 31 07:48:16 1999
+++ display/Makefile Tue Nov 16 12:45:21 1999
@@ -6,24 +6,14 @@
# $FreeBSD: ports/misc/display/Makefile,v 1.8 1999/08/31 06:48:16 mharo Exp $
#
-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 -urP /usr/ports/misc/display/files/md5 display/files/md5
--- /usr/ports/misc/display/files/md5 Mon Nov 2 03:59:50 1998
+++ display/files/md5 Tue Nov 16 12:30:01 1999
@@ -1,2 +1 @@
-MD5 (display.Z) = 5ee3e53bf0b99dd4b94b5329e8a0fd2e
-MD5 (display.pch.Z) = c77e579b4dcc07fbf2dee01113029f0d
+MD5 (display-1.1.tgz) = c73adec7c00fdbe2ab1484d1429b4408
diff -urP /usr/ports/misc/display/patches/patch-aa display/patches/patch-aa
--- /usr/ports/misc/display/patches/patch-aa Mon Nov 24 00:26:01 1997
+++ display/patches/patch-aa Tue Nov 16 12:37:56 1999
@@ -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 -urP /usr/ports/misc/display/patches/patch-ab display/patches/patch-ab
--- /usr/ports/misc/display/patches/patch-ab Sat Sep 19 23:44:16 1998
+++ display/patches/patch-ab Tue Nov 16 12:44:24 1999
@@ -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
--
**********************************************************************
This email and any files transmitted with it are intended solely for the use of the individual or entity to whom they are addressed.
The email has been swept by MIMEsweeper for the presence of computer viruses.
www.palmerharvey.co.uk
**********************************************************************
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991116124919.AAD371CA>