Date: Sun, 27 Jul 2014 15:27:05 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363075 - in head/archivers: 9e/files arc/files bzip2/files ha/files hpack.non-usa.only/files lha/files libarc/files libcabinet/files macutils/files ppunpack/files squsq/files zip/files Message-ID: <201407271527.s6RFR5qE064028@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Jul 27 15:27:04 2014 New Revision: 363075 URL: http://svnweb.freebsd.org/changeset/ports/363075 QAT: https://qat.redports.org/buildarchive/r363075/ Log: Start cleaning up some of the uselessly ambigious patches named patch-xy, and giving them proper names. Added: head/archivers/9e/files/patch-9e.c - copied unchanged from r363060, head/archivers/9e/files/patch-ab head/archivers/arc/files/patch-Makefile - copied unchanged from r363060, head/archivers/arc/files/patch-aa head/archivers/arc/files/patch-arc.c - copied unchanged from r363060, head/archivers/arc/files/patch-ad head/archivers/arc/files/patch-arc.h - copied unchanged from r363060, head/archivers/arc/files/patch-ae head/archivers/arc/files/patch-arcadd.c - copied unchanged from r363060, head/archivers/arc/files/patch-af head/archivers/arc/files/patch-arccvt.c - copied unchanged from r363060, head/archivers/arc/files/patch-ag head/archivers/arc/files/patch-arcdata.c - copied unchanged from r363060, head/archivers/arc/files/patch-ah head/archivers/arc/files/patch-arcdos.c - copied unchanged from r363060, head/archivers/arc/files/patch-ab head/archivers/arc/files/patch-arcext.c - copied unchanged from r363060, head/archivers/arc/files/patch-ai head/archivers/arc/files/patch-arcio.c - copied unchanged from r363060, head/archivers/arc/files/patch-aj head/archivers/arc/files/patch-arclzw.c - copied unchanged from r363060, head/archivers/arc/files/patch-ak head/archivers/arc/files/patch-arcrun.c - copied unchanged from r363060, head/archivers/arc/files/patch-al head/archivers/arc/files/patch-arcunp.c - copied unchanged from r363060, head/archivers/arc/files/patch-am head/archivers/bzip2/files/patch-Makefile - copied unchanged from r363060, head/archivers/bzip2/files/patch-aa head/archivers/ha/files/patch-nix_machine.c - copied unchanged from r363060, head/archivers/ha/files/patch-aa head/archivers/hpack.non-usa.only/files/patch-archive.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-al head/archivers/hpack.non-usa.only/files/patch-cli.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ak head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ab head/archivers/hpack.non-usa.only/files/patch-defs.h - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ag head/archivers/hpack.non-usa.only/files/patch-hpacklib.h - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ah head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ad head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ac head/archivers/hpack.non-usa.only/files/patch-language_language.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ae head/archivers/hpack.non-usa.only/files/patch-makefile - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-aj head/archivers/hpack.non-usa.only/files/patch-system.h - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-ai head/archivers/hpack.non-usa.only/files/patch-system_unix.c - copied unchanged from r363060, head/archivers/hpack.non-usa.only/files/patch-af head/archivers/lha/files/patch-Makefile - copied unchanged from r363060, head/archivers/lha/files/patch-aa head/archivers/lha/files/patch-src_lha.h - copied unchanged from r363060, head/archivers/lha/files/patch-af head/archivers/lha/files/patch-src_lhadd.c - copied unchanged from r363060, head/archivers/lha/files/patch-ae head/archivers/libarc/files/patch-Makefile - copied unchanged from r363060, head/archivers/libarc/files/patch-aa head/archivers/macutils/files/patch-crc_makefile - copied unchanged from r363060, head/archivers/macutils/files/patch-ao head/archivers/macutils/files/patch-hexbin_globals.h - copied unchanged from r363060, head/archivers/macutils/files/patch-ak head/archivers/macutils/files/patch-macunpack_cpt.h - copied unchanged from r363060, head/archivers/macutils/files/patch-am head/archivers/macutils/files/patch-macunpack_dd.c - copied unchanged from r363060, head/archivers/macutils/files/patch-aj head/archivers/macutils/files/patch-macunpack_dd.h - copied unchanged from r363060, head/archivers/macutils/files/patch-ai head/archivers/macutils/files/patch-macunpack_jdw.h - copied unchanged from r363060, head/archivers/macutils/files/patch-ac head/archivers/macutils/files/patch-macunpack_lzc.h - copied unchanged from r363060, head/archivers/macutils/files/patch-al head/archivers/macutils/files/patch-macunpack_lzh.c - copied, changed from r363060, head/archivers/macutils/files/patch-lzh.c head/archivers/macutils/files/patch-macunpack_lzh.h - copied unchanged from r363060, head/archivers/macutils/files/patch-ah head/archivers/macutils/files/patch-macunpack_sit.c - copied unchanged from r363060, head/archivers/macutils/files/patch-ae head/archivers/macutils/files/patch-macunpack_sit.h - copied unchanged from r363060, head/archivers/macutils/files/patch-ad head/archivers/macutils/files/patch-macunpack_stf.h - copied unchanged from r363060, head/archivers/macutils/files/patch-af head/archivers/macutils/files/patch-macunpack_zma.h - copied unchanged from r363060, head/archivers/macutils/files/patch-an head/archivers/macutils/files/patch-makefile - copied unchanged from r363060, head/archivers/macutils/files/patch-aa head/archivers/macutils/files/patch-util_transname.c - copied unchanged from r363060, head/archivers/macutils/files/patch-ab head/archivers/ppunpack/files/patch-depack.h - copied unchanged from r363060, head/archivers/ppunpack/files/patch-aa head/archivers/squsq/files/patch-usq.c - copied unchanged from r363060, head/archivers/squsq/files/patch-aa head/archivers/zip/files/patch-unix_Makefile - copied unchanged from r363060, head/archivers/zip/files/patch-ab head/archivers/zip/files/patch-unix_configure - copied unchanged from r363060, head/archivers/zip/files/patch-aa Deleted: head/archivers/9e/files/patch-ab head/archivers/arc/files/patch-aa head/archivers/arc/files/patch-ab head/archivers/arc/files/patch-ad head/archivers/arc/files/patch-ae head/archivers/arc/files/patch-af head/archivers/arc/files/patch-ag head/archivers/arc/files/patch-ah head/archivers/arc/files/patch-ai head/archivers/arc/files/patch-aj head/archivers/arc/files/patch-ak head/archivers/arc/files/patch-al head/archivers/arc/files/patch-am head/archivers/bzip2/files/patch-aa head/archivers/ha/files/patch-aa head/archivers/hpack.non-usa.only/files/patch-ab head/archivers/hpack.non-usa.only/files/patch-ac head/archivers/hpack.non-usa.only/files/patch-ad head/archivers/hpack.non-usa.only/files/patch-ae head/archivers/hpack.non-usa.only/files/patch-af head/archivers/hpack.non-usa.only/files/patch-ag head/archivers/hpack.non-usa.only/files/patch-ah head/archivers/hpack.non-usa.only/files/patch-ai head/archivers/hpack.non-usa.only/files/patch-aj head/archivers/hpack.non-usa.only/files/patch-ak head/archivers/hpack.non-usa.only/files/patch-al head/archivers/lha/files/patch-aa head/archivers/lha/files/patch-ae head/archivers/lha/files/patch-af head/archivers/libarc/files/patch-aa head/archivers/libcabinet/files/patch-ab head/archivers/macutils/files/patch-aa head/archivers/macutils/files/patch-ab head/archivers/macutils/files/patch-ac head/archivers/macutils/files/patch-ad head/archivers/macutils/files/patch-ae head/archivers/macutils/files/patch-af head/archivers/macutils/files/patch-ag head/archivers/macutils/files/patch-ah head/archivers/macutils/files/patch-ai head/archivers/macutils/files/patch-aj head/archivers/macutils/files/patch-ak head/archivers/macutils/files/patch-al head/archivers/macutils/files/patch-am head/archivers/macutils/files/patch-an head/archivers/macutils/files/patch-ao head/archivers/macutils/files/patch-lzh.c head/archivers/ppunpack/files/patch-aa head/archivers/squsq/files/patch-aa head/archivers/zip/files/patch-aa head/archivers/zip/files/patch-ab Modified: head/archivers/libcabinet/files/patch-bstring.cpp Copied: head/archivers/9e/files/patch-9e.c (from r363060, head/archivers/9e/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/9e/files/patch-9e.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/9e/files/patch-ab) @@ -0,0 +1,23 @@ +--- 9e.c.orig Thu Jun 15 13:40:52 2000 ++++ 9e.c Fri Jun 23 04:16:00 2000 +@@ -139,17 +139,16 @@ + } + + if(Hdrs) { +- fprintf(stderr, "%s %lo %s %s %ld %ld\n", namebuf, mode, ++ fprintf(stderr, "%s %lo %s %s %ld %ld\n", name, mode, + owner, group, mtime, size); + fout = NULL; + } else { + if (Verbose) +- fprintf(stderr, "%s %d\n", namebuf, size); ++ fprintf(stderr, "%s\n", name); + if(mode & CHDIR) { + assert(size == 0); + /* Give ourselves read, write, and execute permission */ +- if(mkdir(name, (mode & ~CHDIR) | 0700) < 0) +- warn("mkdir(2) failed for", name); ++ mkdir(name, (mode & ~CHDIR) | 0700); + continue; + } + if((fout=fopen(name, "w+b")) == NULL) Copied: head/archivers/arc/files/patch-Makefile (from r363060, head/archivers/arc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-Makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-aa) @@ -0,0 +1,20 @@ +--- Makefile.orig Fri Oct 31 05:32:51 2003 ++++ Makefile Wed Nov 5 13:53:51 2003 +@@ -38,14 +38,14 @@ + OPT = -O + # For MWC 3.0 on the Atari ST, use: + #CFLAGS = -VCOMPAC -VPEEP +-CFLAGS = $(OPT) $(SYSTEM) ++CFLAGS+=$(SYSTEM) + + # GNU's gcc is very nice, if you've got it. Otherwise just cc. + #CC = cgcc -mshort -mbaserel +-CC = cc ++#CC = cc + + # tmclock is only needed on Unix systems... +-TMCLOCK = tmclock.o ++TMCLOCK = #tmclock.o + + # Integer-only stdio routines for Atari ST. + #LIBS=-liio16 Copied: head/archivers/arc/files/patch-arc.c (from r363060, head/archivers/arc/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arc.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ad) @@ -0,0 +1,20 @@ +--- arc.c.orig Sun Oct 9 03:38:22 2005 ++++ arc.c Fri Oct 14 14:22:38 2005 +@@ -290,7 +290,7 @@ + keepbak = 1; + + else if (*a == 'W') /* suppress warnings */ +- warn = 0; ++ arcwarn = 0; + #if !DOS + else if (*a == 'I') /* image mode, no ASCII/EBCDIC x-late */ + image = !image; +@@ -426,7 +426,7 @@ + expandlst(n) /* expand an indirect reference */ + int n; /* number of entry to expand */ + { +- FILE *lf, *fopen(); /* list file, opener */ ++ FILE *lf; /* list file, opener */ + char buf[100]; /* input buffer */ + int x; /* index */ + char *p = lst[n] + 1; /* filename pointer */ Copied: head/archivers/arc/files/patch-arc.h (from r363060, head/archivers/arc/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arc.h Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ae) @@ -0,0 +1,11 @@ +--- ./arc.h.orig Tue Aug 10 23:03:24 1999 ++++ ./arc.h Tue Aug 10 23:01:55 1999 +@@ -106,7 +106,7 @@ + #if GEMDOS + extern int hold; /* hold screen before exiting */ + #endif +-extern int warn; /* true to print warnings */ ++extern int arcwarn; /* true to print warnings */ + extern int note; /* true to print comments */ + extern int bose; /* true to be verbose */ + extern int nocomp; /* true to suppress compression */ Copied: head/archivers/arc/files/patch-arcadd.c (from r363060, head/archivers/arc/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcadd.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-af) @@ -0,0 +1,47 @@ +--- ./arcadd.c.orig Tue Aug 10 23:03:24 1999 ++++ ./arcadd.c Tue Aug 10 23:01:55 1999 +@@ -119,7 +119,7 @@ + } + #endif + } +- if (notemp && warn) ++ if (notemp && arcwarn) + printf("No files match: %s\n", arg[n]); + } + +@@ -133,7 +133,7 @@ + free(path); + free(name); + } +- if (nowork && warn) ++ if (nowork && arcwarn) + printf("No files were added.\n"); + } + +@@ -227,7 +227,7 @@ + if (move) { /* if this was a move */ + for (n = 0; n < nfiles; n++) { /* then delete each file + * added */ +- if (unlink(path[n]) && warn) { ++ if (unlink(path[n]) && arcwarn) { + printf("Cannot unsave %s\n", path[n]); + nerrs++; + } +@@ -259,7 +259,7 @@ + if (!f) + #endif + { +- if (warn) { ++ if (arcwarn) { + printf("Cannot read file: %s\n", path); + nerrs++; + } +@@ -267,7 +267,7 @@ + } + #if !DOS + if (strlen(name) >= FNLEN) { +- if (warn) { ++ if (arcwarn) { + char buf[STRLEN]; + printf("WARNING: File %s name too long!\n", name); + name[FNLEN-1]='\0'; Copied: head/archivers/arc/files/patch-arccvt.c (from r363060, head/archivers/arc/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arccvt.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ag) @@ -0,0 +1,11 @@ +--- ./arccvt.c.orig Tue Aug 10 23:03:24 1999 ++++ ./arccvt.c Tue Aug 10 23:01:55 1999 +@@ -120,7 +120,7 @@ + writehdr(hdr, new); /* write out real header */ + fseek(new, hdr->size, 1); /* skip over data to next header */ + fclose(tmp); /* all done with the file */ +- if (unlink(tempname) && warn) { ++ if (unlink(tempname) && arcwarn) { + printf("Cannot unsave %s\n", tempname); + nerrs++; + } Copied: head/archivers/arc/files/patch-arcdata.c (from r363060, head/archivers/arc/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcdata.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ah) @@ -0,0 +1,11 @@ +--- ./arcdata.c.orig Tue Aug 10 23:03:24 1999 ++++ ./arcdata.c Tue Aug 10 23:01:56 1999 +@@ -35,7 +35,7 @@ + #if GEMDOS + int hold = 0; /* true to pause before exit */ + #endif +-int warn = 1; /* true to print warnings */ ++int arcwarn = 1; /* true to print warnings */ + int note = 1; /* true to print comments */ + int bose = 0; /* true to be verbose */ + int nocomp = 0; /* true to suppress compression */ Copied: head/archivers/arc/files/patch-arcdos.c (from r363060, head/archivers/arc/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcdos.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ab) @@ -0,0 +1,25 @@ +*** arcdos.c.old Wed Apr 15 02:58:21 1992 +--- arcdos.c Sat Dec 31 20:32:25 1994 +*************** +*** 173,186 **** +--- 173,192 ---- + struct tm tm; + struct timeval tvp[2]; + int utimes(); ++ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) + long tmclock(); ++ #endif + tm.tm_sec = (time & 31) * 2; + tm.tm_min = (time >> 5) & 63; + tm.tm_hour = (time >> 11); + tm.tm_mday = date & 31; + tm.tm_mon = ((date >> 5) & 15) - 1; + tm.tm_year = (date >> 9) + 80; ++ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + tvp[0].tv_sec = tmclock(&tm); ++ #else ++ tvp[0].tv_sec = timelocal(&tm); ++ #endif + tvp[1].tv_sec = tvp[0].tv_sec; + tvp[0].tv_usec = tvp[1].tv_usec = 0; + utimes(f, tvp); Copied: head/archivers/arc/files/patch-arcext.c (from r363060, head/archivers/arc/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcext.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ai) @@ -0,0 +1,20 @@ +--- arcext.c.orig Sat Oct 8 22:24:37 2005 ++++ arcext.c Fri Oct 14 00:52:14 2005 +@@ -143,7 +143,7 @@ + if (note) + printf("Extracting file: %s\n", fix); + +- if (warn && !overlay) { ++ if (arcwarn && !overlay) { + if ((f = fopen(fix, "r"))) { /* see if it exists */ + fclose(f); + printf("WARNING: File %s already exists!", fix); +@@ -190,7 +190,7 @@ + if (!f) + #endif + { +- if (warn) { ++ if (arcwarn) { + printf("Cannot create %s\n", fix); + nerrs++; + } Copied: head/archivers/arc/files/patch-arcio.c (from r363060, head/archivers/arc/files/patch-aj) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcio.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-aj) @@ -0,0 +1,34 @@ +--- arcio.c.orig Wed Apr 15 02:58:26 1992 ++++ arcio.c Sat Aug 11 22:10:55 2001 +@@ -46,7 +46,7 @@ + return 0; /* then signal end of archive */ + + if (hdrver != ARCMARK) { /* check archive validity */ +- if (warn) { ++ if (arcwarn) { + printf("An entry in %s has a bad header.\n", arcname); + nerrs++; + } +@@ -63,10 +63,10 @@ + if (feof(f) && first) + arcdie("%s is not an archive", arcname); + +- if (changing && warn) ++ if (changing && arcwarn) + arcdie("%s is corrupted -- changes disallowed", arcname); + +- if (warn) ++ if (arcwarn) + printf(" %d bytes skipped.\n", try); + + if (feof(f)) +@@ -110,7 +110,8 @@ + hdr->crc = (short) ((dummy[22] << 8) + dummy[21]); + for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++); + #endif +- ++ if (hdr->size < 0) ++ arcdie("Invalid header in archive %s", arcname); + if (hdr->date > olddate + || (hdr->date == olddate && hdr->time > oldtime)) { + olddate = hdr->date; Copied: head/archivers/arc/files/patch-arclzw.c (from r363060, head/archivers/arc/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arclzw.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-ak) @@ -0,0 +1,11 @@ +--- ./arclzw.c.orig Tue Aug 10 23:03:25 1999 ++++ ./arclzw.c Tue Aug 10 23:01:57 1999 +@@ -546,7 +546,7 @@ + */ + if (code >= free_ent) { + if (code > free_ent) { +- if (warn) { ++ if (arcwarn) { + printf("Corrupted compressed file.\n"); + printf("Invalid code %d when max is %d.\n", + code, free_ent); Copied: head/archivers/arc/files/patch-arcrun.c (from r363060, head/archivers/arc/files/patch-al) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcrun.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-al) @@ -0,0 +1,38 @@ +--- arcrun.c.orig Wed Oct 12 19:22:18 2005 ++++ arcrun.c Sat May 27 03:47:30 2006 +@@ -98,7 +98,7 @@ + strcpy(sys, buf); + + else { +- if (warn) { ++ if (arcwarn) { + printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n", + hdr->name); + nerrs++; +@@ -112,7 +112,7 @@ + && strcmp(i, ".TTP") + && strcmp(i, ".TOS")) + { +- if (warn) { ++ if (arcwarn) { + printf("File %s is not a .PRG, .TOS, or .TTP\n", + hdr->name); + nerrs++; +@@ -122,7 +122,7 @@ + } + #endif + +- if (warn) ++ if (arcwarn) + if ((tmp = fopen(buf, "r"))) + arcdie("Temporary file %s already exists", buf); + if (!(tmp = tmpopen(buf))) +@@ -146,7 +146,7 @@ + if (system(buf)) /* try to invoke it */ + arcdie("Execution failed for %s", buf); + #endif +- if (unlink(buf) && warn) { ++ if (unlink(buf) && arcwarn) { + printf("Cannot unsave temporary file %s\n", buf); + nerrs++; + } Copied: head/archivers/arc/files/patch-arcunp.c (from r363060, head/archivers/arc/files/patch-am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/arc/files/patch-arcunp.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/arc/files/patch-am) @@ -0,0 +1,20 @@ +--- ./arcunp.c.orig Tue Aug 10 23:03:25 1999 ++++ ./arcunp.c Tue Aug 10 23:01:57 1999 +@@ -123,7 +123,7 @@ + break; + + default: /* unknown method */ +- if (warn) { ++ if (arcwarn) { + printf("I don't know how to unpack file %s\n", hdr->name); + printf("I think you need a newer version of ARC\n"); + nerrs++; +@@ -135,7 +135,7 @@ + /* cleanups common to all methods */ + + if (crcval != hdr->crc) { +- if (warn || kludge) { ++ if (arcwarn || kludge) { + printf("WARNING: File %s fails CRC check\n", hdr->name); + nerrs++; + } Copied: head/archivers/bzip2/files/patch-Makefile (from r363060, head/archivers/bzip2/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/bzip2/files/patch-Makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/bzip2/files/patch-aa) @@ -0,0 +1,80 @@ +--- Makefile.orig Tue Jan 2 22:49:21 2007 ++++ Makefile Sat Jan 27 12:02:14 2007 +@@ -15,13 +15,15 @@ + SHELL=/bin/sh + + # To assist in cross-compiling +-CC=gcc ++CC?=gcc + AR=ar + RANLIB=ranlib + LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS?=-O2 ++CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) ++SOFLAGS=-fPIC -fpic -DPIC + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +@@ -35,10 +37,18 @@ + decompress.o \ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++SO_OBJS= blocksort.so \ ++ huffman.so \ ++ crctable.so \ ++ randtable.so \ ++ compress.so \ ++ decompress.so \ ++ bzlib.so + +-bzip2: libbz2.a bzip2.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 ++all: libbz2.so.1 libbz2.a bzip2 bzip2recover test ++ ++bzip2: libbz2.so.1 libbz2.a bzip2.o ++ $(CC) $(CFLAGS) -o bzip2 bzip2.o libbz2.a + + bzip2recover: bzip2recover.o + $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o +@@ -52,6 +62,10 @@ + $(RANLIB) libbz2.a ; \ + fi + ++libbz2.so.1: $(SO_OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1 $(SO_OBJS) ++ ln -sf libbz2.so.1 libbz2.so ++ + check: test + test: bzip2 + @cat words1 +@@ -109,9 +123,25 @@ + echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 + + clean: +- rm -f *.o libbz2.a bzip2 bzip2recover \ ++ rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst ++ ++blocksort.so: blocksort.c ++ @cat words0 ++ $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so ++huffman.so: huffman.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c huffman.c -o huffman.so ++crctable.so: crctable.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c crctable.c -o crctable.so ++randtable.so: randtable.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c randtable.c -o randtable.so ++compress.so: compress.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c compress.c -o compress.so ++decompress.so: decompress.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so ++bzlib.so: bzlib.c ++ $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so + + blocksort.o: blocksort.c + @cat words0 Copied: head/archivers/ha/files/patch-nix_machine.c (from r363060, head/archivers/ha/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/ha/files/patch-nix_machine.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/ha/files/patch-aa) @@ -0,0 +1,19 @@ +*** nix/machine.c.bak Thu Jan 12 09:53:00 1995 +--- nix/machine.c Tue Jan 24 19:38:07 1995 +*************** +*** 417,423 **** + if (plainname!=NULL) free(plainname),plainname=NULL; + if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) + error(1,ERR_MEM,"md_stripname()"); +! for (i=strlen(mdfullpath)-1;i>0;i--) { + if (mdfullpath[i]=='/') { + i++; + break; +--- 417,423 ---- + if (plainname!=NULL) free(plainname),plainname=NULL; + if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) + error(1,ERR_MEM,"md_stripname()"); +! for (i=strlen(mdfullpath)-1;i>=0;i--) { + if (mdfullpath[i]=='/') { + i++; + break; Copied: head/archivers/hpack.non-usa.only/files/patch-archive.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-al) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-archive.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-al) @@ -0,0 +1,25 @@ +--- archive.c.orig Tue Jun 29 05:27:52 1993 ++++ archive.c Tue Dec 28 20:01:38 1999 +@@ -326,12 +326,22 @@ + + void getFileName( char *fileName ) + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ int len; ++#endif + hprintf( MESG_s_ALREADY_EXISTS_ENTER_NEW_NAME, fileName ); + + /* Nasty input routine - should check for illegal chars and suchlike. + Will also overflow if anyone enters more than 16K chars */ + hflush( stdout ); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + hgets( ( char * ) mrglBuffer ); ++#else /* gets depricated in FreeBSD */ ++ fgets( mrglBuffer, MAX_PATH, stdin ); ++ len = strlen(mrglBuffer); ++ if (mrglBuffer[len - 1] == '\n') ++ mrglBuffer[len - 1] = '\0'; ++#endif + mrglBuffer[ MAX_PATH - 1 ] = '\0'; + strcpy( fileName, ( char * ) mrglBuffer ); + Copied: head/archivers/hpack.non-usa.only/files/patch-cli.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-cli.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ak) @@ -0,0 +1,23 @@ +--- cli.c.orig Sat Sep 4 22:23:48 1993 ++++ cli.c Tue Dec 28 20:01:38 1999 +@@ -724,12 +724,18 @@ + + void doConfigFile( void ) + { +- char *configFileName; ++ char *configFileName, *s; + FD configFileFD; + WORD oldFlags = flags; + ++ if (( s = getenv( HPACKPATH )) == NULL) ++#ifdef __UNIX__ ++ s = "%%PREFIX%%/etc:%%PREFIX%%/lib/hpack"; ++#else ++ ; ++#endif + /* Build path to config file and try and process it */ +- configFileName = getFirstKeyPath( getenv( HPACKPATH ), CONFIGFILENAME ); ++ configFileName = getFirstKeyPath( s, CONFIGFILENAME ); + while( configFileName != NULL ) + { + /* Try and read the seed from the seedfile */ Copied: head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ab) @@ -0,0 +1,29 @@ +--- crypt/keymgmt.c.orig Tue Aug 17 16:56:14 1993 ++++ crypt/keymgmt.c Tue Dec 28 20:01:38 1999 +@@ -495,11 +495,24 @@ + FD keyFileFD, savedInFD = getInputFD(); + BOOLEAN matched, firstTime = TRUE; + char *matchID, firstChar; +- char *keyFilePath; ++ char *keyFilePath, *s; + int userIDlength, i; ++#ifdef __UNIX__ ++ char *h, buf[ MAX_PATH ]; ++#endif + ++ if ((s = getenv( PGPPATH )) == NULL) ++#ifdef __UNIX__ ++ if ((h = getenv( "HOME" )) != NULL) { ++ strcpy(buf, h); ++ strcat(buf, "/.pgp"); ++ s = buf; ++ } ++#else ++ ; ++#endif + /* Use the keyID to get the public key from a key file */ +- keyFilePath = getFirstKeyPath( getenv( PGPPATH ), keyFileName ); ++ keyFilePath = getFirstKeyPath( s, keyFileName ); + while( keyFilePath != NULL ) + { + /* Open key file */ Copied: head/archivers/hpack.non-usa.only/files/patch-defs.h (from r363060, head/archivers/hpack.non-usa.only/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-defs.h Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ag) @@ -0,0 +1,11 @@ +--- defs.h.orig Mon May 31 10:17:00 1993 ++++ defs.h Tue Dec 28 20:01:38 1999 +@@ -43,7 +43,7 @@ + + /* 'inline' patch for compilers which can't handle this */ + +-#if !( defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ ) ++#if !( defined( __GNUC__ ) || defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ ) + #define inline + #endif /* !( __CPLUSPLUS__ || __cplusplus ) */ + Copied: head/archivers/hpack.non-usa.only/files/patch-hpacklib.h (from r363060, head/archivers/hpack.non-usa.only/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-hpacklib.h Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ah) @@ -0,0 +1,17 @@ +--- hpacklib.h.orig Thu Aug 5 04:10:40 1993 ++++ hpacklib.h Tue Dec 28 20:01:38 1999 +@@ -26,12 +26,12 @@ + + #include <stdio.h> /* Prototypes for generic functions */ + #if defined( __UNIX__ ) && !( defined( BSD386 ) || defined( CONVEX ) || \ +- defined( NEXT ) || defined( ULTRIX_OLD ) ) ++ defined( NEXT ) || defined( ULTRIX_OLD ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )) + #include <malloc.h> /* Needed for mem.functions on some systems */ + #endif /* __UNIX__ && !( BSD386 || CONVEX || NEXT || ULTRIX_OLD ) */ + #if defined( AIX386 ) || ( defined( __AMIGA__ ) && !defined( LATTICE ) ) || \ + defined( __ARC__ ) || defined( __ATARI__ ) || defined( __MSDOS16__ ) || \ +- defined( __MSDOS32__ ) ++ defined( __MSDOS32__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + #include <stdlib.h> /* Needed for mem.functions */ + #endif /* AIX386 || ( __AMIGA__ && !LATTICE ) || __ARC__ || __ATARI__ || __MSDOS16__ || __MSDOS32__ */ + #if defined( __ATARI__ ) || ( defined( __OS2__ ) && !defined( __GCC__ ) ) Copied: head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ad) @@ -0,0 +1,75 @@ +--- keycvt/keycvt.c.orig Fri Aug 13 15:06:28 1993 ++++ keycvt/keycvt.c Tue Dec 28 20:01:38 1999 +@@ -582,11 +582,21 @@ + + static void getPassword( void ) + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ int len; ++#endif + puts( "Please enter password for this private key." ); + puts( "Warning: Password will be echoed to screen!" ); + printf( "Password: " ); + fflush( stdout ); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + gets( password ); ++#else /* gets depricated in FreeBSD */ ++ fgets( password, sizeof(password), stdin); ++ len = strlen(password); ++ if (password[len - 1] == '\n') ++ password[len - 1] = '\0'; ++#endif + } + + void initCrypt( void ) +@@ -1020,27 +1030,46 @@ + + /* Try and find the PGP seed file */ + if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL ) ++#ifdef __UNIX__ ++ if( ( pgpPath = getenv( "HOME" ) ) != NULL ) { ++ strcpy( tempFileName, pgpPath ); ++ strcat( tempFileName, "/.pgp"); ++ pgpPath = tempFileName; ++ } ++ else ++#endif + pgpPath = ""; + pathLen = strlen( pgpPath ); ++#ifdef __UNIX__ ++ if (pgpPath != tempFileName) ++#endif + strcpy( tempFileName, pgpPath ); + #if defined( __ARC__ ) +- if( pathLen && tempFileName[ pathLen - 1 ] != '.' ) ++ if( pathLen && tempFileName[ pathLen - 1 ] != '.' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '.'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed" ); + #elif defined( __AMIGA__ ) +- if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != ':' && ch != '/' ) ++ if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != ':' && ch != '/' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '/'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed.bin" ); + #else +- if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != '\\' && ch != '/' ) ++ if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != '\\' && ch != '/' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '/'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed.bin" ); + #endif /* __ARC__ */ +- if( ( inFilePtr = fopen( tempFileName, "rb" ) ) == NULL ) ++ if( ( inFilePtr = fopen( tempFileName, "rb" ) ) == NULL ) { ++ perror( tempFileName ); + puts( "Cannot find PGP seed file, HPACK seed file not created" ); ++ } + else + { + /* See if the output file exists */ Copied: head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile (from r363060, head/archivers/hpack.non-usa.only/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ac) @@ -0,0 +1,41 @@ +--- keycvt/makefile.orig Tue May 18 00:43:30 1993 ++++ keycvt/makefile Sun Jul 21 17:32:13 2002 +@@ -48,7 +48,7 @@ + + PROJ = keycvt + +-CFLAGS = -c $(DEFINES) -O -I. $(CMDC) # Flags for compiler ++CFLAGS += -c $(DEFINES) -I. $(CMDC) # Flags for compiler + + LFLAGS = -o $(PROJ) $(CMDL) # Flags for linker + +@@ -60,6 +60,7 @@ + LS = ls -l # Directory command + ECHO = echo # Echo to screen command + MAKE = make # The make command ++PREFIX ?= /usr/local + + #**************************************************************************** + #* * +@@ -71,7 +72,7 @@ + @$(ECHO) + @$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build" + @$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex," +- @$(ECHO) "irix, hpux, isc, linux, mint, next, qnx, sun, svr4, ultrix, ultrix_old" ++ @$(ECHO) "freebsd, irix, hpux, isc, linux, mint, next, qnx, sun, svr4, ultrix, ultrix_old" + @$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try" + @$(ECHO) "'make generic', and send a copy of any changes necessary to the author," + @$(ECHO) "pgut1@cs.aukuni.ac.nz" +@@ -128,6 +129,12 @@ + + convex: + @$(MAKE) keycvt CC="cc" ++ ++freebsd: ++ @$(MAKE) $(PROJ) ++ ++freebsd.install: ++ $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin + + # Generic: Generic BSD-ish system running gcc. Can't continue, we really + # need user intervention here. Copied: head/archivers/hpack.non-usa.only/files/patch-language_language.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-language_language.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ae) @@ -0,0 +1,31 @@ +--- language/language.c.orig Wed Sep 22 21:23:20 1993 ++++ language/language.c Tue Dec 28 20:01:38 1999 +@@ -188,7 +188,7 @@ + /* Process user response */ + response = hgetch(); + response = toupper( response ); /* Damn macros */ +- blankLine( screenWidth ); ++ blankLine( screenWidth - 1 ); + if( response == RESPONSE_QUIT ) + return; + lineNo -= ( response == ' ' ) ? screenHeight : 1; +@@ -268,6 +268,9 @@ + if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR ) + return( ERROR ); + #elif defined( __UNIX__ ) ++ fileNamePtr = getFirstKeyPath( "%%PREFIX%%/lib/hpack", DATA_FILENAME ); ++ if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) != ERROR ) ++ goto found; + /* Build path to language file and try and process it */ + fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME ); + while( fileNamePtr != NULL ) +@@ -290,6 +293,9 @@ + return( ERROR ); /* Couldn't find/open input file */ + } + #endif /* System-specific handling of how to find language defn.file */ ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++found: ++#endif + setInputFD( inFD ); + resetFastIn(); + Copied: head/archivers/hpack.non-usa.only/files/patch-makefile (from r363060, head/archivers/hpack.non-usa.only/files/patch-aj) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-aj) @@ -0,0 +1,50 @@ +--- makefile.orig Tue Aug 10 18:47:06 1993 ++++ makefile Tue Jun 4 13:56:54 2002 +@@ -42,7 +42,7 @@ + + PROJ = hpack + +-CFLAGS = -c -D__UNIX__ -O -I. $(CMDC) # Flags for compiler ++CFLAGS += -c -D__UNIX__ -I. $(CMDC) # Flags for compiler + + LFLAGS = -o $(PROJ) -lcurses $(CMDL) # Flags for linker + +@@ -55,6 +55,7 @@ + ECHO = echo # Echo to screen command + MAKE = make # The make command + MV = mv # Rename command ++PREFIX ?= /usr/local + + #**************************************************************************** + #* * +@@ -68,7 +69,7 @@ + @$(ECHO) + @$(ECHO) "To create HPACK, you have to enter the Unix system type you want to build it" + @$(ECHO) "for. Possible options are: aix (RS6000), aix370, aix386, bsd386, convex," +- @$(ECHO) "irix, hpux, hpux-gcc, isc, linux, mint, next, osf1, qnx, sun, svr4, ultrix," ++ @$(ECHO) "freebsd, irix, hpux, hpux-gcc, isc, linux, mint, next, osf1, qnx, sun, svr4, ultrix," + @$(ECHO) "ultrix_old (Ultrix 3.x or earlier), and uts4. If none of the above fit," + @$(ECHO) "try 'make generic', and send a copy of any changes necessary to the author," + @$(ECHO) "pgut1@cs.aukuni.ac.nz" +@@ -317,6 +318,21 @@ + + convex: + @$(MAKE) hpack CMDC="-DCONVEX" CC="cc" ++ ++freebsd: ++ @make $(PROJ) LFLAGS="-o $(PROJ) -ltermcap" ++ cd keycvt; make freebsd ++ ++freebsd.install: ++ -@mkdir -p ${PREFIX}/bin ++ -@mkdir -p ${PREFIX}/etc ++ -@mkdir -p ${PREFIX}/lib/hpack ++ -@mkdir -p ${PREFIX}/man/man1 ++ $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin ++ $(BSD_INSTALL_DATA) language.dat $(PREFIX)/lib/hpack ++ $(BSD_INSTALL_DATA) docs/$(PROJ).1 $(PREFIX)/man/man1 ++ -[ ! -f $(PREFIX)/etc/hpack.cfg ] && $(BSD_INSTALL_DATA) -m 644 docs/hpack.cfg $(PREFIX)/etc ++ cd keycvt; $(MAKE) freebsd.install + + # Generic: Generic BSD-ish system running gcc + Copied: head/archivers/hpack.non-usa.only/files/patch-system.h (from r363060, head/archivers/hpack.non-usa.only/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-system.h Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-ai) @@ -0,0 +1,38 @@ +--- system.h.orig Fri Aug 27 12:16:40 1993 ++++ system.h Tue Dec 28 20:01:38 1999 +@@ -788,7 +788,10 @@ + #elif defined( CONVEX ) + #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) + #define MAX_FILENAME ( 254 + 1 ) +-#elif defined( POSIX ) ++#elif defined( POSIX ) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) ++ #if defined( __FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #include <limits.h> ++ #endif + #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) + #define MAX_FILENAME ( NAME_MAX + 1 ) + #elif defined( SVR4 ) +@@ -875,7 +878,8 @@ + #if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \ + defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \ + defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \ +- defined( ULTRIX ) || defined( ULTRIX_OLD ) || defined( UTS4 ) ++ defined( ULTRIX ) || defined( ULTRIX_OLD ) || defined( UTS4 ) || \ ++ defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) + #define SPACE_OK TRUE + #else + #define SPACE_OK FALSE +@@ -948,6 +952,13 @@ + #elif defined( UTS4 ) /* Amdahl UTS4 */ + #define NEED_STRLWR + #define NEED_STRICMP ++#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) /* Amdahl UTS4 */ ++ #include <unistd.h> ++ #define tell(fd) lseek((fd),(off_t)0,SEEK_CUR) ++ #define NEED_STRLWR ++ #define stricmp strcasecmp ++ #define strnicmp strncasecmp ++ #define USE_TERMCAP + #elif defined( ESIX ) /* Esix */ + #define NEED_HELP + #endif /* Various mutation-specific defines */ Copied: head/archivers/hpack.non-usa.only/files/patch-system_unix.c (from r363060, head/archivers/hpack.non-usa.only/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/hpack.non-usa.only/files/patch-system_unix.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/hpack.non-usa.only/files/patch-af) @@ -0,0 +1,38 @@ +--- system/unix.c.orig Fri Aug 27 12:20:56 1993 ++++ system/unix.c Tue Dec 28 20:01:38 1999 +@@ -123,7 +123,7 @@ + + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( SVR4 ) || defined( UTS4 ) ++ defined( SVR4 ) || defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + + #include <termios.h> + +@@ -144,7 +144,7 @@ + tcgetattr( ttyFD, &ttyInfo ); + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + ttyInfo.c_lflag &= ~ECHO; + ttyInfo.c_lflag &= ~ICANON; + #else +@@ -183,7 +183,7 @@ + tcgetattr( ttyFD, &ttyInfo ); + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + ttyInfo.c_lflag |= ECHO; + ttyInfo.c_lflag |= ICANON; + #else +@@ -728,7 +728,7 @@ + defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \ + defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \ + defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + + int htruncate( const FD theFD ) + { Copied: head/archivers/lha/files/patch-Makefile (from r363060, head/archivers/lha/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/lha/files/patch-Makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/lha/files/patch-aa) @@ -0,0 +1,52 @@ +--- Makefile.orig Fri Dec 15 14:13:16 2000 ++++ Makefile Sun Jul 21 17:24:46 2002 +@@ -10,28 +10,36 @@ + # SWITCHES macro definitions ... see config.eng or config.jpn. + #----------------------------------------------------------------------- + +-SHELL=/bin/sh +-MAKE = make ++#SHELL=/bin/sh ++#MAKE = make + + #CC = cc +-CC = gcc +-SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ +- -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" ++#CC = gcc ++#SWITCHES = -DNEED_INCREMENTAL_INDICATOR \ ++# -DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\"" ++SWITCHES = -DNEED_INCREMENTAL_INDICATOR + + #MACHINE = -DSYSTIME_HAS_NO_TM -DFTIME -DEUC + #MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DHAVE_TM_ZONE -DSYSV_SYSTEM_DIR +-MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME ++#MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DMKTIME ++MACHINE = -DSYSTIME_HAS_NO_TM -DEUC -DSYSV_SYSTEM_DIR -DTIMELOCAL -DUSESTRCASECMP + + #OPTIMIZE = -O2 -fstrength-reduce -fomit-frame-pointer +-OPTIMIZE = -O2 -DSUPPORT_LH7 -DMKSTEMP ++#OPTIMIZE = -O2 -DSUPPORT_LH7 -DMKSTEMP ++# mkstemp() usage is wrong ++OPTIMIZE = ${CFLAGS} -DSUPPORT_LH7 + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man +-MANSECT = n ++#BINDIR = /usr/local/bin ++#MANDIR = /usr/local/man ++#MANSECT = n ++PREFIX ?= /usr/local ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/ja ++MANSECT = 1 + +-INSTALL = install +-INSTALLBIN = -s -m 755 +-INSTALLMAN = -m 644 ++INSTALL = ++INSTALLBIN = ${BSD_INSTALL_PROGRAM} ++INSTALLMAN = ${BSD_INSTALL_MAN} + + SUBDIRS = src man + Copied: head/archivers/lha/files/patch-src_lha.h (from r363060, head/archivers/lha/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/lha/files/patch-src_lha.h Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/lha/files/patch-af) @@ -0,0 +1,11 @@ +diff -ru src.orig/lha.h src/lha.h +--- src.orig/lha.h Thu Oct 5 10:35:38 2000 ++++ src/lha.h Sun May 11 00:31:53 2003 +@@ -11,6 +11,7 @@ + lharc.h interface.h slidehuf.h + */ + #include <stdio.h> ++#include <stdlib.h> + #include <errno.h> + #include <ctype.h> + #include <sys/types.h> Copied: head/archivers/lha/files/patch-src_lhadd.c (from r363060, head/archivers/lha/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/lha/files/patch-src_lhadd.c Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/lha/files/patch-ae) @@ -0,0 +1,40 @@ +--- src/lhadd.c.orig Mon Jul 31 18:09:53 2000 ++++ src/lhadd.c Mon Jul 31 18:14:20 2000 +@@ -270,13 +270,35 @@ + { + int old_umask; + FILE *afp; ++ int tempfd; ++ ++ #ifdef TMP_FILENAME_TEMPLATE ++ if (extract_directory == NULL) { ++ strcpy(temporary_name, TMP_FILENAME_TEMPLATE); ++ } ++ else { ++ sprintf(temporary_name, "%s/lhXXXXXX", extract_directory); ++ } ++ tempfd = mkstemp(temporary_name); ++ #else ++ char *p, *s; ++ ++ strcpy(temporary_name, archive_name); ++ for (p = temporary_name, s = (char *) 0; *p; p++) ++ if (*p == '/') ++ s = p; ++ strcpy((s ? s + 1 : temporary_name), "lhXXXXXX"); ++ tempfd = mkstemp(temporary_name); ++ #endif ++ if (tempfd == -1) ++ return NULL; + +- build_temporary_name(); + signal(SIGINT, interrupt); + signal(SIGHUP, interrupt); + + old_umask = umask(077); +- afp = xfopen(temporary_name, WRITE_BINARY); ++ /*afp = xfopen(temporary_name, WRITE_BINARY);*/ ++ afp = fdopen(tempfd, "w+"); + remove_temporary_at_error = TRUE; + temporary_fp = afp; + umask(old_umask); Copied: head/archivers/libarc/files/patch-Makefile (from r363060, head/archivers/libarc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/libarc/files/patch-Makefile Sun Jul 27 15:27:04 2014 (r363075, copy of r363060, head/archivers/libarc/files/patch-aa) @@ -0,0 +1,38 @@ +--- Makefile Tue Jun 13 07:21:19 2000 ++++ Makefile Tue Jun 20 17:44:24 2000 +@@ -14,20 +15,30 @@ + url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \ + arc_mime.o + ++SOOBJS = $(OBJS:S/.o/.so/g) ++ + # readdir_win.o (for Windows) + + LIB=libarc.a + +- +-all:: $(LIB) ++all:: $(LIB) $(SOLIB) arccat + + $(LIB): $(OBJS) + $(AR) $@ $(OBJS) + $(RANLIB) $@ + +-arccat: arccat.o $(LIB) +- $(CC) -o $@ arccat.o $(LIB) ++$(SOLIB): $(SOOBJS) ++ $(CC) -shared -Wl,-soname -Wl,$@.$(SOVERSION) -o $@.$(SOVERSION) $(SOOBJS) ++ $(LN) $@.$(SOVERSION) $@ ++ ++arccat: arccat.o $(SOLIB) ++ $(CC) $(CFLAGS) -o $@ arccat.o -L. -larc + + clean:: +- $(RM) $(LIB) *.o arccat *~ libarc/*~ ++ $(RM) $(LIB) $(SOLIB).$(SOVERSION) *.o *.so arccat *~ libarc/*~ + ++ ++.SUFFIXES: .so .c ++ ++.c.so: ++ $(CC) $(CFLAGS) -fPIC -fpic -DPIC -c $(.IMPSRC) -o $(.TARGET) Modified: head/archivers/libcabinet/files/patch-bstring.cpp ============================================================================== --- head/archivers/libcabinet/files/patch-bstring.cpp Sun Jul 27 15:22:35 2014 (r363074) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407271527.s6RFR5qE064028>