From 3fd5a826c43638bd5eadf2ced90fd8eef4f787be Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 8 Dec 1999 04:51:50 +0000 Subject: [PATCH] - convert patches to unified diffs - cleanup Makefile --- misc/xtar/Makefile | 10 ++-------- misc/xtar/patches/patch-aa | 22 ++++++++++----------- misc/xtar/patches/patch-ab | 30 +++++++++++----------------- misc/xtar/patches/patch-ac | 30 +++++++++++----------------- misc/xtar/patches/patch-ad | 24 +++++++++-------------- misc/xtar/patches/patch-ae | 40 +++++++++++++++----------------------- 6 files changed, 59 insertions(+), 97 deletions(-) diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile index 836f4692e1c..32181a0aad9 100644 --- a/misc/xtar/Makefile +++ b/misc/xtar/Makefile @@ -1,15 +1,9 @@ -# OpenBSD makefile for: xtar -# Version required: 1.4 -# Date created: May 20 1998 -# Whom: Angelos D. Keromytis -# -# $OpenBSD: Makefile,v 1.4 1999/11/03 05:18:21 kevlo Exp $ -# +# $OpenBSD: Makefile,v 1.5 1999/12/08 04:51:50 brad Exp $ DISTNAME= xtar-1.4 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= utilities +MASTER_SITE_SUBDIR= utilities MAINTAINER= angelos@openbsd.org diff --git a/misc/xtar/patches/patch-aa b/misc/xtar/patches/patch-aa index bbefe779d30..98f85b469ea 100644 --- a/misc/xtar/patches/patch-aa +++ b/misc/xtar/patches/patch-aa @@ -1,12 +1,10 @@ -*** common/str.c.orig Wed Jul 31 18:04:12 1996 ---- common/str.c Wed Jul 31 18:04:27 1996 -*************** -*** 283,289 **** - char *str_error(int errnum) - { - extern int sys_nerr; -- extern char *sys_errlist[]; - static char ebuf[40]; /* 64-bit number + slop */ - - if ((unsigned int)errnum < sys_nerr) ---- 283,288 ---- +--- common/str.c.orig Tue May 9 04:06:46 1995 ++++ common/str.c Thu Oct 21 17:18:00 1999 +@@ -283,7 +283,6 @@ + char *str_error(int errnum) + { + extern int sys_nerr; +- extern char *sys_errlist[]; + static char ebuf[40]; /* 64-bit number + slop */ + + if ((unsigned int)errnum < sys_nerr) diff --git a/misc/xtar/patches/patch-ab b/misc/xtar/patches/patch-ab index 7ffceb9efc1..db16badb98d 100644 --- a/misc/xtar/patches/patch-ab +++ b/misc/xtar/patches/patch-ab @@ -1,19 +1,11 @@ -*** xtar.c.orig Wed Jul 31 18:16:22 1996 ---- xtar.c Wed Jul 31 18:15:30 1996 -*************** -*** 1164,1170 **** - static int xtar_attributes(TAR_FILE *tf, char *filename) - { - int retval = 0; -! struct utimbuf utimbuf; - - /* If the file type is not a directory then try and set the access - permissions. We exclude directories because if write permission ---- 1164,1170 ---- - static int xtar_attributes(TAR_FILE *tf, char *filename) - { - int retval = 0; -! struct utimbuf {char utimbuf;} utimbuf; - - /* If the file type is not a directory then try and set the access - permissions. We exclude directories because if write permission +--- xtar.c.orig Mon Jul 17 07:44:19 1995 ++++ xtar.c Thu Oct 21 17:18:01 1999 +@@ -1164,7 +1164,7 @@ + static int xtar_attributes(TAR_FILE *tf, char *filename) + { + int retval = 0; +- struct utimbuf utimbuf; ++ struct utimbuf {char utimbuf;} utimbuf; + + /* If the file type is not a directory then try and set the access + permissions. We exclude directories because if write permission diff --git a/misc/xtar/patches/patch-ac b/misc/xtar/patches/patch-ac index 96fbacd05b6..31c5f56d24b 100644 --- a/misc/xtar/patches/patch-ac +++ b/misc/xtar/patches/patch-ac @@ -1,19 +1,11 @@ -*** XTar.tmpl.orig Mon Jul 17 14:04:17 1995 ---- XTar.tmpl Tue Nov 19 17:43:02 1996 -*************** -*** 27,33 **** - XMINC = -I/usr/include/Motif1.2 - XMLIB = -L/usr/lib/Motif1.2 -lXm -lPW - #else -! XMLIB = -lXm - #endif - - #ifdef SunArchitecture ---- 27,33 ---- - XMINC = -I/usr/include/Motif1.2 - XMLIB = -L/usr/lib/Motif1.2 -lXm -lPW - #else -! XMLIB = ${MOTIFLIB} - #endif - - #ifdef SunArchitecture +--- XTar.tmpl.orig Mon Jul 17 08:04:17 1995 ++++ XTar.tmpl Thu Oct 21 17:18:02 1999 +@@ -27,7 +27,7 @@ + XMINC = -I/usr/include/Motif1.2 + XMLIB = -L/usr/lib/Motif1.2 -lXm -lPW + #else +-XMLIB = -lXm ++XMLIB = ${MOTIFLIB} + #endif + + #ifdef SunArchitecture diff --git a/misc/xtar/patches/patch-ad b/misc/xtar/patches/patch-ad index 440f9a98007..dd740766382 100644 --- a/misc/xtar/patches/patch-ad +++ b/misc/xtar/patches/patch-ad @@ -1,15 +1,9 @@ -*** XTar.ad.orig Mon Jul 17 14:00:59 1995 ---- XTar.ad Tue Nov 19 17:46:59 1996 -*************** -*** 1,5 **** - !!!! Help document !!!! -! XTar*helpDoc: /usr/local/lib/X11/xtar/xtar.doc - - !!! Set this to true if you want push buttons !!! - XTar*showPB: False ---- 1,5 ---- - !!!! Help document !!!! -! XTar*helpDoc: /usr/X11R6/lib/X11/xtar/xtar.doc - - !!! Set this to true if you want push buttons !!! - XTar*showPB: False +--- XTar.ad.orig Mon Jul 17 08:00:59 1995 ++++ XTar.ad Thu Oct 21 17:18:02 1999 +@@ -1,5 +1,5 @@ + !!!! Help document !!!! +-XTar*helpDoc: /usr/local/lib/X11/xtar/xtar.doc ++XTar*helpDoc: /usr/X11R6/lib/X11/xtar/xtar.doc + + !!! Set this to true if you want push buttons !!! + XTar*showPB: False diff --git a/misc/xtar/patches/patch-ae b/misc/xtar/patches/patch-ae index 0aa7b9e9e60..2c94267c02f 100644 --- a/misc/xtar/patches/patch-ae +++ b/misc/xtar/patches/patch-ae @@ -1,24 +1,16 @@ -*** common/tmpfile.c.orig Wed May 20 02:47:47 1998 ---- common/tmpfile.c Wed May 20 02:51:16 1998 -*************** -*** 90,96 **** - char *tmpfile_create() - { - TMP_FILE *ptr, *tf; -! char *filename = strdup(tmpnam(NULL)); - - if(filename == NULL) - return(NULL); ---- 90,101 ---- - char *tmpfile_create() - { - TMP_FILE *ptr, *tf; -! char xxx[40]; -! char *filename; -! -! sprintf(xxx, "/tmp/tmpf.XXXXXXXX"); -! close(mkstemp(xxx)); -! filename = strdup(xxx); - - if(filename == NULL) - return(NULL); +--- common/tmpfile.c.orig Tue May 9 04:06:46 1995 ++++ common/tmpfile.c Thu Oct 21 20:43:13 1999 +@@ -90,7 +90,12 @@ + char *tmpfile_create() + { + TMP_FILE *ptr, *tf; +- char *filename = strdup(tmpnam(NULL)); ++ char xxx[40]; ++ char *filename; ++ ++ sprintf(xxx, "/tmp/tmpf.XXXXXXXX"); ++ close(mkstemp(xxx)); ++ filename = strdup(xxx); + + if(filename == NULL) + return(NULL);