Index: head/archivers/9e/files/patch-ab =================================================================== --- head/archivers/9e/files/patch-ab (revision 363074) +++ head/archivers/9e/files/patch-ab (nonexistent) @@ -1,23 +0,0 @@ ---- 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) Property changes on: head/archivers/9e/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/9e/files/patch-9e.c =================================================================== --- head/archivers/9e/files/patch-9e.c (nonexistent) +++ head/archivers/9e/files/patch-9e.c (revision 363075) @@ -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) Property changes on: head/archivers/9e/files/patch-9e.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-aa =================================================================== --- head/archivers/arc/files/patch-aa (revision 363074) +++ head/archivers/arc/files/patch-aa (nonexistent) @@ -1,20 +0,0 @@ ---- 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 Property changes on: head/archivers/arc/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ab =================================================================== --- head/archivers/arc/files/patch-ab (revision 363074) +++ head/archivers/arc/files/patch-ab (nonexistent) @@ -1,25 +0,0 @@ -*** 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); Property changes on: head/archivers/arc/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ad =================================================================== --- head/archivers/arc/files/patch-ad (revision 363074) +++ head/archivers/arc/files/patch-ad (nonexistent) @@ -1,20 +0,0 @@ ---- 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 */ Property changes on: head/archivers/arc/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ae =================================================================== --- head/archivers/arc/files/patch-ae (revision 363074) +++ head/archivers/arc/files/patch-ae (nonexistent) @@ -1,11 +0,0 @@ ---- ./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 */ Property changes on: head/archivers/arc/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-af =================================================================== --- head/archivers/arc/files/patch-af (revision 363074) +++ head/archivers/arc/files/patch-af (nonexistent) @@ -1,47 +0,0 @@ ---- ./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'; Property changes on: head/archivers/arc/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ag =================================================================== --- head/archivers/arc/files/patch-ag (revision 363074) +++ head/archivers/arc/files/patch-ag (nonexistent) @@ -1,11 +0,0 @@ ---- ./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++; - } Property changes on: head/archivers/arc/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ah =================================================================== --- head/archivers/arc/files/patch-ah (revision 363074) +++ head/archivers/arc/files/patch-ah (nonexistent) @@ -1,11 +0,0 @@ ---- ./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 */ Property changes on: head/archivers/arc/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ai =================================================================== --- head/archivers/arc/files/patch-ai (revision 363074) +++ head/archivers/arc/files/patch-ai (nonexistent) @@ -1,20 +0,0 @@ ---- 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++; - } Property changes on: head/archivers/arc/files/patch-ai ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-aj =================================================================== --- head/archivers/arc/files/patch-aj (revision 363074) +++ head/archivers/arc/files/patch-aj (nonexistent) @@ -1,34 +0,0 @@ ---- 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; Property changes on: head/archivers/arc/files/patch-aj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-ak =================================================================== --- head/archivers/arc/files/patch-ak (revision 363074) +++ head/archivers/arc/files/patch-ak (nonexistent) @@ -1,11 +0,0 @@ ---- ./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); Property changes on: head/archivers/arc/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-al =================================================================== --- head/archivers/arc/files/patch-al (revision 363074) +++ head/archivers/arc/files/patch-al (nonexistent) @@ -1,38 +0,0 @@ ---- 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++; - } Property changes on: head/archivers/arc/files/patch-al ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-am =================================================================== --- head/archivers/arc/files/patch-am (revision 363074) +++ head/archivers/arc/files/patch-am (nonexistent) @@ -1,20 +0,0 @@ ---- ./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++; - } Property changes on: head/archivers/arc/files/patch-am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-Makefile =================================================================== --- head/archivers/arc/files/patch-Makefile (nonexistent) +++ head/archivers/arc/files/patch-Makefile (revision 363075) @@ -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 Property changes on: head/archivers/arc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arc.c =================================================================== --- head/archivers/arc/files/patch-arc.c (nonexistent) +++ head/archivers/arc/files/patch-arc.c (revision 363075) @@ -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 */ Property changes on: head/archivers/arc/files/patch-arc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arc.h =================================================================== --- head/archivers/arc/files/patch-arc.h (nonexistent) +++ head/archivers/arc/files/patch-arc.h (revision 363075) @@ -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 */ Property changes on: head/archivers/arc/files/patch-arc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcadd.c =================================================================== --- head/archivers/arc/files/patch-arcadd.c (nonexistent) +++ head/archivers/arc/files/patch-arcadd.c (revision 363075) @@ -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'; Property changes on: head/archivers/arc/files/patch-arcadd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arccvt.c =================================================================== --- head/archivers/arc/files/patch-arccvt.c (nonexistent) +++ head/archivers/arc/files/patch-arccvt.c (revision 363075) @@ -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++; + } Property changes on: head/archivers/arc/files/patch-arccvt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcdata.c =================================================================== --- head/archivers/arc/files/patch-arcdata.c (nonexistent) +++ head/archivers/arc/files/patch-arcdata.c (revision 363075) @@ -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 */ Property changes on: head/archivers/arc/files/patch-arcdata.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcdos.c =================================================================== --- head/archivers/arc/files/patch-arcdos.c (nonexistent) +++ head/archivers/arc/files/patch-arcdos.c (revision 363075) @@ -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); Property changes on: head/archivers/arc/files/patch-arcdos.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcext.c =================================================================== --- head/archivers/arc/files/patch-arcext.c (nonexistent) +++ head/archivers/arc/files/patch-arcext.c (revision 363075) @@ -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++; + } Property changes on: head/archivers/arc/files/patch-arcext.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcio.c =================================================================== --- head/archivers/arc/files/patch-arcio.c (nonexistent) +++ head/archivers/arc/files/patch-arcio.c (revision 363075) @@ -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; Property changes on: head/archivers/arc/files/patch-arcio.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arclzw.c =================================================================== --- head/archivers/arc/files/patch-arclzw.c (nonexistent) +++ head/archivers/arc/files/patch-arclzw.c (revision 363075) @@ -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); Property changes on: head/archivers/arc/files/patch-arclzw.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcrun.c =================================================================== --- head/archivers/arc/files/patch-arcrun.c (nonexistent) +++ head/archivers/arc/files/patch-arcrun.c (revision 363075) @@ -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++; + } Property changes on: head/archivers/arc/files/patch-arcrun.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/arc/files/patch-arcunp.c =================================================================== --- head/archivers/arc/files/patch-arcunp.c (nonexistent) +++ head/archivers/arc/files/patch-arcunp.c (revision 363075) @@ -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++; + } Property changes on: head/archivers/arc/files/patch-arcunp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/bzip2/files/patch-aa =================================================================== --- head/archivers/bzip2/files/patch-aa (revision 363074) +++ head/archivers/bzip2/files/patch-aa (nonexistent) @@ -1,80 +0,0 @@ ---- 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 Property changes on: head/archivers/bzip2/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/bzip2/files/patch-Makefile =================================================================== --- head/archivers/bzip2/files/patch-Makefile (nonexistent) +++ head/archivers/bzip2/files/patch-Makefile (revision 363075) @@ -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 Property changes on: head/archivers/bzip2/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/ha/files/patch-aa =================================================================== --- head/archivers/ha/files/patch-aa (revision 363074) +++ head/archivers/ha/files/patch-aa (nonexistent) @@ -1,19 +0,0 @@ -*** 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; Property changes on: head/archivers/ha/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/ha/files/patch-nix_machine.c =================================================================== --- head/archivers/ha/files/patch-nix_machine.c (nonexistent) +++ head/archivers/ha/files/patch-nix_machine.c (revision 363075) @@ -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; Property changes on: head/archivers/ha/files/patch-nix_machine.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ab =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ab (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ab (nonexistent) @@ -1,29 +0,0 @@ ---- 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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ac =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ac (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ac (nonexistent) @@ -1,41 +0,0 @@ ---- 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. Property changes on: head/archivers/hpack.non-usa.only/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ad =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ad (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ad (nonexistent) @@ -1,75 +0,0 @@ ---- 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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ae =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ae (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ae (nonexistent) @@ -1,31 +0,0 @@ ---- 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(); - Property changes on: head/archivers/hpack.non-usa.only/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-af =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-af (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-af (nonexistent) @@ -1,38 +0,0 @@ ---- 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 - -@@ -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 ) - { Property changes on: head/archivers/hpack.non-usa.only/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ag =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ag (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ag (nonexistent) @@ -1,11 +0,0 @@ ---- 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 ) */ - Property changes on: head/archivers/hpack.non-usa.only/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ah =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ah (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ah (nonexistent) @@ -1,17 +0,0 @@ ---- hpacklib.h.orig Thu Aug 5 04:10:40 1993 -+++ hpacklib.h Tue Dec 28 20:01:38 1999 -@@ -26,12 +26,12 @@ - - #include /* 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 /* 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 /* Needed for mem.functions */ - #endif /* AIX386 || ( __AMIGA__ && !LATTICE ) || __ARC__ || __ATARI__ || __MSDOS16__ || __MSDOS32__ */ - #if defined( __ATARI__ ) || ( defined( __OS2__ ) && !defined( __GCC__ ) ) Property changes on: head/archivers/hpack.non-usa.only/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ai =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ai (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ai (nonexistent) @@ -1,38 +0,0 @@ ---- 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 -+ #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 -+ #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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-ai ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-aj =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-aj (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-aj (nonexistent) @@ -1,50 +0,0 @@ ---- 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 - Property changes on: head/archivers/hpack.non-usa.only/files/patch-aj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-ak =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-ak (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-ak (nonexistent) @@ -1,23 +0,0 @@ ---- 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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-al =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-al (revision 363074) +++ head/archivers/hpack.non-usa.only/files/patch-al (nonexistent) @@ -1,25 +0,0 @@ ---- 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 ); - Property changes on: head/archivers/hpack.non-usa.only/files/patch-al ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-archive.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-archive.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-archive.c (revision 363075) @@ -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 ); + Property changes on: head/archivers/hpack.non-usa.only/files/patch-archive.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-cli.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-cli.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-cli.c (revision 363075) @@ -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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-cli.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c (revision 363075) @@ -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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-defs.h =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-defs.h (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-defs.h (revision 363075) @@ -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 ) */ + Property changes on: head/archivers/hpack.non-usa.only/files/patch-defs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-hpacklib.h =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-hpacklib.h (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-hpacklib.h (revision 363075) @@ -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 /* 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 /* 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 /* Needed for mem.functions */ + #endif /* AIX386 || ( __AMIGA__ && !LATTICE ) || __ARC__ || __ATARI__ || __MSDOS16__ || __MSDOS32__ */ + #if defined( __ATARI__ ) || ( defined( __OS2__ ) && !defined( __GCC__ ) ) Property changes on: head/archivers/hpack.non-usa.only/files/patch-hpacklib.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c (revision 363075) @@ -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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile (revision 363075) @@ -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. Property changes on: head/archivers/hpack.non-usa.only/files/patch-keycvt_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-language_language.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-language_language.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-language_language.c (revision 363075) @@ -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(); + Property changes on: head/archivers/hpack.non-usa.only/files/patch-language_language.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-makefile =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-makefile (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-makefile (revision 363075) @@ -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 + Property changes on: head/archivers/hpack.non-usa.only/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-system.h =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-system.h (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-system.h (revision 363075) @@ -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 ++ #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 ++ #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 */ Property changes on: head/archivers/hpack.non-usa.only/files/patch-system.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/hpack.non-usa.only/files/patch-system_unix.c =================================================================== --- head/archivers/hpack.non-usa.only/files/patch-system_unix.c (nonexistent) +++ head/archivers/hpack.non-usa.only/files/patch-system_unix.c (revision 363075) @@ -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 + +@@ -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 ) + { Property changes on: head/archivers/hpack.non-usa.only/files/patch-system_unix.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-aa =================================================================== --- head/archivers/lha/files/patch-aa (revision 363074) +++ head/archivers/lha/files/patch-aa (nonexistent) @@ -1,52 +0,0 @@ ---- 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 - Property changes on: head/archivers/lha/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-ae =================================================================== --- head/archivers/lha/files/patch-ae (revision 363074) +++ head/archivers/lha/files/patch-ae (nonexistent) @@ -1,40 +0,0 @@ ---- 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); Property changes on: head/archivers/lha/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-af =================================================================== --- head/archivers/lha/files/patch-af (revision 363074) +++ head/archivers/lha/files/patch-af (nonexistent) @@ -1,11 +0,0 @@ -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 -+#include - #include - #include - #include Property changes on: head/archivers/lha/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-Makefile =================================================================== --- head/archivers/lha/files/patch-Makefile (nonexistent) +++ head/archivers/lha/files/patch-Makefile (revision 363075) @@ -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 + Property changes on: head/archivers/lha/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-src_lha.h =================================================================== --- head/archivers/lha/files/patch-src_lha.h (nonexistent) +++ head/archivers/lha/files/patch-src_lha.h (revision 363075) @@ -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 ++#include + #include + #include + #include Property changes on: head/archivers/lha/files/patch-src_lha.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/lha/files/patch-src_lhadd.c =================================================================== --- head/archivers/lha/files/patch-src_lhadd.c (nonexistent) +++ head/archivers/lha/files/patch-src_lhadd.c (revision 363075) @@ -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); Property changes on: head/archivers/lha/files/patch-src_lhadd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libarc/files/patch-aa =================================================================== --- head/archivers/libarc/files/patch-aa (revision 363074) +++ head/archivers/libarc/files/patch-aa (nonexistent) @@ -1,38 +0,0 @@ ---- 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) Property changes on: head/archivers/libarc/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/libarc/files/patch-Makefile =================================================================== --- head/archivers/libarc/files/patch-Makefile (nonexistent) +++ head/archivers/libarc/files/patch-Makefile (revision 363075) @@ -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) Property changes on: head/archivers/libarc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libcabinet/files/patch-ab =================================================================== --- head/archivers/libcabinet/files/patch-ab (revision 363074) +++ head/archivers/libcabinet/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- bstring.cpp 2000/11/30 14:50:57 1.1 -+++ bstring.cpp 2000/11/30 14:57:48 -@@ -150,7 +150,7 @@ - if(strlen(str) < strlen(s)) // If more memory is needed - *this = s; // Use assign function - else // If stpcpy can be used -- stpcpy(str, s); // Copy s into str -+ strcpy(str, s); // Copy s into str - } - - return *this; // Return a refrence to this object Property changes on: head/archivers/libcabinet/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/libcabinet/files/patch-bstring.cpp =================================================================== --- head/archivers/libcabinet/files/patch-bstring.cpp (revision 363074) +++ head/archivers/libcabinet/files/patch-bstring.cpp (revision 363075) @@ -1,27 +1,36 @@ ---- bstring.cpp.orig 2014-02-21 15:40:03.760303112 -0500 -+++ bstring.cpp 2014-02-21 15:41:19.474297650 -0500 +--- bstring.cpp.orig 2014-07-27 11:17:34.000000000 -0400 ++++ bstring.cpp 2014-07-27 11:17:37.000000000 -0400 @@ -15,7 +15,7 @@ #include "bstring.h" #include -#include +#include ///////////////////////////////////////*************************************** @@ -91,7 +91,7 @@ b_string b_string::operator + (const char* s) { - b_string temp = str; + b_string temp (str); return temp += s; } +@@ -150,7 +150,7 @@ + if(strlen(str) < strlen(s)) // If more memory is needed + *this = s; // Use assign function + else // If stpcpy can be used +- stpcpy(str, s); // Copy s into str ++ strcpy(str, s); // Copy s into str + } + + return *this; // Return a refrence to this object @@ -217,4 +217,4 @@ //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ -#endif \ No newline at end of file +#endif Index: head/archivers/macutils/files/patch-lzh.c =================================================================== --- head/archivers/macutils/files/patch-lzh.c (revision 363074) +++ head/archivers/macutils/files/patch-lzh.c (nonexistent) @@ -1,22 +0,0 @@ ---- macunpack/lzh.c.orig Thu Sep 28 13:10:04 2006 -+++ macunpack/lzh.c Thu Sep 28 13:11:27 2006 -@@ -40,13 +40,13 @@ - {"-lzs-", lzs} - }; - static char *lzh_archive; --static char *lzh_pointer; --static char *lzh_data; --static char *lzh_finfo; --static int lzh_fsize; --static int lzh_kind; -+char *lzh_pointer; -+char *lzh_data; -+char *lzh_finfo; -+int lzh_fsize; -+int lzh_kind; - static int oldsize; --static char *lzh_file; -+char *lzh_file; - static int lzh_filesize; - static char *lzh_current; - static char *tmp_out_ptr; Property changes on: head/archivers/macutils/files/patch-lzh.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ao =================================================================== --- head/archivers/macutils/files/patch-ao (revision 363074) +++ head/archivers/macutils/files/patch-ao (nonexistent) @@ -1,17 +0,0 @@ ---- crc/makefile.orig Sun Oct 19 01:17:42 2003 -+++ crc/makefile Sun Oct 19 01:18:15 2003 -@@ -1,4 +1,4 @@ --CFLAGS = -O $(CF) -+CFLAGS += $(CF) - CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c - CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o - -@@ -16,7 +16,7 @@ - ./makecrc - - makecrc: makecrc.o -- cc -O -o makecrc makecrc.o -+ $(CC) $(CFLAGS) -o makecrc makecrc.o - - arc.o: arc.c - ccitt.o: ccitt.c Property changes on: head/archivers/macutils/files/patch-ao ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-an =================================================================== --- head/archivers/macutils/files/patch-an (revision 363074) +++ head/archivers/macutils/files/patch-an (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/zma.h.orig Fri Apr 16 01:04:19 1999 -+++ macunpack/zma.h Fri Apr 16 01:04:29 1999 -@@ -20,7 +20,7 @@ - #define Z_RCRC 44 /* Resource crc */ - #define Z_FNAME 46 /* File name length and name */ - --typedef struct fileHdr { /* 78 bytes */ -+struct fileHdr { /* 78 bytes */ - char deleted; /* Not in original, split off from: */ - char what; /* What kind? Negative if deleted */ - unsigned char hlen ; /* Header length */ Property changes on: head/archivers/macutils/files/patch-an ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-am =================================================================== --- head/archivers/macutils/files/patch-am (revision 363074) +++ head/archivers/macutils/files/patch-am (nonexistent) @@ -1,20 +0,0 @@ ---- macunpack/cpt.h.orig Fri Apr 16 00:31:28 1999 -+++ macunpack/cpt.h Fri Apr 16 00:32:07 1999 -@@ -31,7 +31,7 @@ - - typedef long OSType; - --typedef struct cptHdr { /* 8 bytes */ -+struct cptHdr { /* 8 bytes */ - unsigned char signature; /* = 1 -- for verification */ - unsigned char volume; /* for multi-file archives */ - unsigned short xmagic; /* verification multi-file consistency*/ -@@ -42,7 +42,7 @@ - unsigned char commentsize; /* number of bytes comment that follow*/ - }; - --typedef struct fileHdr { /* 78 bytes */ -+struct fileHdr { /* 78 bytes */ - unsigned char fName[32]; /* a STR32 */ - unsigned char folder; /* set to 1 if a folder */ - unsigned short foldersize; /* number of entries in folder */ Property changes on: head/archivers/macutils/files/patch-am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-al =================================================================== --- head/archivers/macutils/files/patch-al (revision 363074) +++ head/archivers/macutils/files/patch-al (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/lzc.h.orig Fri Apr 16 00:29:28 1999 -+++ macunpack/lzc.h Fri Apr 16 00:29:36 1999 -@@ -12,7 +12,7 @@ - #define C_AUTHOFF 36 - #define C_FLAGOFF 40 - --typedef struct fileHdr { -+struct fileHdr { - unsigned long magic1; - unsigned long dataLength; - unsigned long dataCLength; Property changes on: head/archivers/macutils/files/patch-al ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ak =================================================================== --- head/archivers/macutils/files/patch-ak (revision 363074) +++ head/archivers/macutils/files/patch-ak (nonexistent) @@ -1,11 +0,0 @@ ---- hexbin/globals.h.orig Fri Apr 16 00:28:16 1999 -+++ hexbin/globals.h Fri Apr 16 00:28:25 1999 -@@ -13,7 +13,7 @@ - extern char info[]; - extern char trname[]; - --typedef struct macheader { -+struct macheader { - char m_name[128]; - char m_type[4]; - char m_author[4]; Property changes on: head/archivers/macutils/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-aj =================================================================== --- head/archivers/macutils/files/patch-aj (revision 363074) +++ head/archivers/macutils/files/patch-aj (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/dd.c.orig Fri Apr 16 00:26:39 1999 -+++ macunpack/dd.c Fri Apr 16 00:26:45 1999 -@@ -45,7 +45,7 @@ - #endif /* UNTESTED */ - static void dd_cpt_compat(); - --typedef struct methodinfo { -+struct methodinfo { - char *name; - int number; - }; Property changes on: head/archivers/macutils/files/patch-aj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ai =================================================================== --- head/archivers/macutils/files/patch-ai (revision 363074) +++ head/archivers/macutils/files/patch-ai (nonexistent) @@ -1,20 +0,0 @@ ---- macunpack/dd.h.orig Fri Apr 16 00:25:41 1999 -+++ macunpack/dd.h Fri Apr 16 00:25:55 1999 -@@ -52,7 +52,7 @@ - - typedef long OSType; - --typedef struct fileHdr { /* 124 bytes */ -+struct fileHdr { /* 124 bytes */ - unsigned char magic[4]; /* "DDAR" */ - unsigned char fill1[4]; /* ??? */ - unsigned char fName[64]; /* a STR63 */ -@@ -73,7 +73,7 @@ - unsigned short hdrcrc; /* true crc */ - }; - --typedef struct fileCHdr { /* 84 bytes */ -+struct fileCHdr { /* 84 bytes */ - unsigned char magic[4]; /* "\253\315\000\124" */ - unsigned long dataLength; /* lengths */ - unsigned long dataCLength; Property changes on: head/archivers/macutils/files/patch-ai ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ah =================================================================== --- head/archivers/macutils/files/patch-ah (revision 363074) +++ head/archivers/macutils/files/patch-ah (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/lzh.h.orig Fri Apr 16 00:24:44 1999 -+++ macunpack/lzh.h Fri Apr 16 00:24:58 1999 -@@ -30,7 +30,7 @@ - #define L_EEXTENDSZ 0 - #define L_EEXTEND 1 - --typedef struct fileHdr { /* 58 bytes */ -+struct fileHdr { /* 58 bytes */ - unsigned char hsize; - unsigned char hcrc; - char method[5]; Property changes on: head/archivers/macutils/files/patch-ah ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ag =================================================================== --- head/archivers/macutils/files/patch-ag (revision 363074) +++ head/archivers/macutils/files/patch-ag (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/lzh.c.orig Fri Apr 16 00:23:03 1999 -+++ macunpack/lzh.c Fri Apr 16 00:23:13 1999 -@@ -23,7 +23,7 @@ - extern unsigned char (*lzah_getbyte)(); - extern void de_lzh(); - --typedef struct methodinfo { -+struct methodinfo { - char *name; - int number; - }; Property changes on: head/archivers/macutils/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-af =================================================================== --- head/archivers/macutils/files/patch-af (revision 363074) +++ head/archivers/macutils/files/patch-af (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/stf.h.orig Fri Apr 16 00:22:12 1999 -+++ macunpack/stf.h Fri Apr 16 00:22:19 1999 -@@ -5,7 +5,7 @@ - #define S_RSRCLNGTH 3 /* + NAMELENGTH */ - #define S_DATALNGTH 7 /* + NAMELENGTH */ - --typedef struct fileHdr { -+struct fileHdr { - char magic[3]; - char flength; - char fname[32]; /* actually flength */ Property changes on: head/archivers/macutils/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ae =================================================================== --- head/archivers/macutils/files/patch-ae (revision 363074) +++ head/archivers/macutils/files/patch-ae (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/sit.c.orig Fri Apr 16 00:18:28 1999 -+++ macunpack/sit.c Fri Apr 16 00:18:34 1999 -@@ -19,7 +19,7 @@ - extern void de_lzah(); - extern unsigned char (*lzah_getbyte)(); - --typedef struct methodinfo { -+struct methodinfo { - char *name; - int number; - }; Property changes on: head/archivers/macutils/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ad =================================================================== --- head/archivers/macutils/files/patch-ad (revision 363074) +++ head/archivers/macutils/files/patch-ad (nonexistent) @@ -1,20 +0,0 @@ ---- macunpack/sit.h.orig Fri Apr 16 00:15:41 1999 -+++ macunpack/sit.h Fri Apr 16 00:15:56 1999 -@@ -24,7 +24,7 @@ - - typedef long OSType; - --typedef struct sitHdr { /* 22 bytes */ -+struct sitHdr { /* 22 bytes */ - OSType signature; /* = 'SIT!' -- for verification */ - unsigned short numFiles; /* number of files in archive */ - unsigned long arcLength; /* length of entire archive incl. -@@ -34,7 +34,7 @@ - char reserved[7]; - }; - --typedef struct fileHdr { /* 112 bytes */ -+struct fileHdr { /* 112 bytes */ - unsigned char compRMethod; /* rsrc fork compression method */ - unsigned char compDMethod; /* data fork compression method */ - unsigned char fName[64]; /* a STR63 */ Property changes on: head/archivers/macutils/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ac =================================================================== --- head/archivers/macutils/files/patch-ac (revision 363074) +++ head/archivers/macutils/files/patch-ac (nonexistent) @@ -1,11 +0,0 @@ ---- macunpack/jdw.h.orig Fri Apr 16 00:13:34 1999 -+++ macunpack/jdw.h Fri Apr 16 00:13:37 1999 -@@ -8,7 +8,7 @@ - #define J_MTIME 34 - #define J_FLENGTH 38 - --typedef struct fileHdr { -+struct fileHdr { - char magic[6]; - unsigned long type; - unsigned long auth; Property changes on: head/archivers/macutils/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-ab =================================================================== --- head/archivers/macutils/files/patch-ab (revision 363074) +++ head/archivers/macutils/files/patch-ab (nonexistent) @@ -1,9 +0,0 @@ ---- util/transname.c.orig Fri Apr 16 00:02:36 1999 -+++ util/transname.c Fri Apr 16 00:02:38 1999 -@@ -1,5 +1,5 @@ - #include --#include -+#include - - char *strncpy(); - Property changes on: head/archivers/macutils/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-aa =================================================================== --- head/archivers/macutils/files/patch-aa (revision 363074) +++ head/archivers/macutils/files/patch-aa (nonexistent) @@ -1,83 +0,0 @@ ---- makefile.orig Sun Oct 3 05:16:00 1993 -+++ makefile Sat Jun 10 13:35:16 2000 -@@ -1,5 +1,4 @@ - SHELL = /bin/sh --BINDIR = /ufs/dik/tmpbin - # Use the following flags on the CF macro definition as needed. - # - # -DBSD if you are on a BSD system -@@ -24,44 +23,44 @@ - # - # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system - # --CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DNODOT -DAPPLEDOUBLE -+CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DAUFSPLUS ${CFLAGS} - - all: -- (cd crc; make CF='$(CF)') -- (cd util; make CF='$(CF)') -- (cd fileio; make CF='$(CF)') -- (cd macunpack; make CF='$(CF)') -- (cd hexbin; make CF='$(CF)') -- (cd mixed; make CF='$(CF)') -- (cd binhex; make CF='$(CF)') -- (cd comm; make CF='$(CF)') -+ (cd crc; $(MAKE) CFLAGS='$(CF)') -+ (cd util; $(MAKE) CFLAGS='$(CF)') -+ (cd fileio; $(MAKE) CFLAGS='$(CF)') -+ (cd macunpack; $(MAKE) CFLAGS='$(CF)') -+ (cd hexbin; $(MAKE) CFLAGS='$(CF)') -+ (cd mixed; $(MAKE) CFLAGS='$(CF)') -+ (cd binhex; $(MAKE) CFLAGS='$(CF)') -+ (cd comm; $(MAKE) CFLAGS='$(CF)') - - clean: -- (cd crc; make clean) -- (cd util; make clean) -- (cd fileio; make clean) -- (cd macunpack; make clean) -- (cd hexbin; make clean) -- (cd mixed; make clean) -- (cd binhex; make clean) -- (cd comm; make clean) -+ (cd crc; $(MAKE) clean) -+ (cd util; $(MAKE) clean) -+ (cd fileio; $(MAKE) clean) -+ (cd macunpack; $(MAKE) clean) -+ (cd hexbin; $(MAKE) clean) -+ (cd mixed; $(MAKE) clean) -+ (cd binhex; $(MAKE) clean) -+ (cd comm; $(MAKE) clean) - - clobber: -- (cd crc; make clean) -- (cd util; make clean) -- (cd fileio; make clean) -- (cd macunpack; make clobber) -- (cd hexbin; make clobber) -- (cd mixed; make clobber) -- (cd binhex; make clobber) -- (cd comm; make clobber) -+ (cd crc; (MAKE) clean) -+ (cd util; (MAKE) clean) -+ (cd fileio; (MAKE) clean) -+ (cd macunpack; (MAKE) clobber) -+ (cd hexbin; (MAKE) clobber) -+ (cd mixed; (MAKE) clobber) -+ (cd binhex; (MAKE) clobber) -+ (cd comm; (MAKE) clobber) - - lint: -- (cd macunpack; make CF='$(CF)' lint) -- (cd hexbin; make CF='$(CF)' lint) -- (cd mixed; make CF='$(CF)' lint) -- (cd binhex; make CF='$(CF)' lint) -- (cd comm; make CF='$(CF)' lint) -+ (cd macunpack; (MAKE) CFLAGS='$(CF)' lint) -+ (cd hexbin; (MAKE) CFLAGS='$(CF)' lint) -+ (cd mixed; (MAKE) CFLAGS='$(CF)' lint) -+ (cd binhex; (MAKE) CFLAGS='$(CF)' lint) -+ (cd comm; (MAKE) CFLAGS='$(CF)' lint) - - install: - cp macunpack/macunpack $(BINDIR)/. Property changes on: head/archivers/macutils/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-crc_makefile =================================================================== --- head/archivers/macutils/files/patch-crc_makefile (nonexistent) +++ head/archivers/macutils/files/patch-crc_makefile (revision 363075) @@ -0,0 +1,17 @@ +--- crc/makefile.orig Sun Oct 19 01:17:42 2003 ++++ crc/makefile Sun Oct 19 01:18:15 2003 +@@ -1,4 +1,4 @@ +-CFLAGS = -O $(CF) ++CFLAGS += $(CF) + CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c + CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o + +@@ -16,7 +16,7 @@ + ./makecrc + + makecrc: makecrc.o +- cc -O -o makecrc makecrc.o ++ $(CC) $(CFLAGS) -o makecrc makecrc.o + + arc.o: arc.c + ccitt.o: ccitt.c Property changes on: head/archivers/macutils/files/patch-crc_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-hexbin_globals.h =================================================================== --- head/archivers/macutils/files/patch-hexbin_globals.h (nonexistent) +++ head/archivers/macutils/files/patch-hexbin_globals.h (revision 363075) @@ -0,0 +1,11 @@ +--- hexbin/globals.h.orig Fri Apr 16 00:28:16 1999 ++++ hexbin/globals.h Fri Apr 16 00:28:25 1999 +@@ -13,7 +13,7 @@ + extern char info[]; + extern char trname[]; + +-typedef struct macheader { ++struct macheader { + char m_name[128]; + char m_type[4]; + char m_author[4]; Property changes on: head/archivers/macutils/files/patch-hexbin_globals.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_cpt.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_cpt.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_cpt.h (revision 363075) @@ -0,0 +1,20 @@ +--- macunpack/cpt.h.orig Fri Apr 16 00:31:28 1999 ++++ macunpack/cpt.h Fri Apr 16 00:32:07 1999 +@@ -31,7 +31,7 @@ + + typedef long OSType; + +-typedef struct cptHdr { /* 8 bytes */ ++struct cptHdr { /* 8 bytes */ + unsigned char signature; /* = 1 -- for verification */ + unsigned char volume; /* for multi-file archives */ + unsigned short xmagic; /* verification multi-file consistency*/ +@@ -42,7 +42,7 @@ + unsigned char commentsize; /* number of bytes comment that follow*/ + }; + +-typedef struct fileHdr { /* 78 bytes */ ++struct fileHdr { /* 78 bytes */ + unsigned char fName[32]; /* a STR32 */ + unsigned char folder; /* set to 1 if a folder */ + unsigned short foldersize; /* number of entries in folder */ Property changes on: head/archivers/macutils/files/patch-macunpack_cpt.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_dd.c =================================================================== --- head/archivers/macutils/files/patch-macunpack_dd.c (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_dd.c (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/dd.c.orig Fri Apr 16 00:26:39 1999 ++++ macunpack/dd.c Fri Apr 16 00:26:45 1999 +@@ -45,7 +45,7 @@ + #endif /* UNTESTED */ + static void dd_cpt_compat(); + +-typedef struct methodinfo { ++struct methodinfo { + char *name; + int number; + }; Property changes on: head/archivers/macutils/files/patch-macunpack_dd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_dd.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_dd.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_dd.h (revision 363075) @@ -0,0 +1,20 @@ +--- macunpack/dd.h.orig Fri Apr 16 00:25:41 1999 ++++ macunpack/dd.h Fri Apr 16 00:25:55 1999 +@@ -52,7 +52,7 @@ + + typedef long OSType; + +-typedef struct fileHdr { /* 124 bytes */ ++struct fileHdr { /* 124 bytes */ + unsigned char magic[4]; /* "DDAR" */ + unsigned char fill1[4]; /* ??? */ + unsigned char fName[64]; /* a STR63 */ +@@ -73,7 +73,7 @@ + unsigned short hdrcrc; /* true crc */ + }; + +-typedef struct fileCHdr { /* 84 bytes */ ++struct fileCHdr { /* 84 bytes */ + unsigned char magic[4]; /* "\253\315\000\124" */ + unsigned long dataLength; /* lengths */ + unsigned long dataCLength; Property changes on: head/archivers/macutils/files/patch-macunpack_dd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_jdw.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_jdw.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_jdw.h (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/jdw.h.orig Fri Apr 16 00:13:34 1999 ++++ macunpack/jdw.h Fri Apr 16 00:13:37 1999 +@@ -8,7 +8,7 @@ + #define J_MTIME 34 + #define J_FLENGTH 38 + +-typedef struct fileHdr { ++struct fileHdr { + char magic[6]; + unsigned long type; + unsigned long auth; Property changes on: head/archivers/macutils/files/patch-macunpack_jdw.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_lzc.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_lzc.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_lzc.h (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/lzc.h.orig Fri Apr 16 00:29:28 1999 ++++ macunpack/lzc.h Fri Apr 16 00:29:36 1999 +@@ -12,7 +12,7 @@ + #define C_AUTHOFF 36 + #define C_FLAGOFF 40 + +-typedef struct fileHdr { ++struct fileHdr { + unsigned long magic1; + unsigned long dataLength; + unsigned long dataCLength; Property changes on: head/archivers/macutils/files/patch-macunpack_lzc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_lzh.c =================================================================== --- head/archivers/macutils/files/patch-macunpack_lzh.c (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_lzh.c (revision 363075) @@ -0,0 +1,31 @@ +--- macunpack/lzh.c.orig 2014-07-27 11:11:36.000000000 -0400 ++++ macunpack/lzh.c 2014-07-27 11:11:39.000000000 -0400 +@@ -23,7 +23,7 @@ + extern unsigned char (*lzah_getbyte)(); + extern void de_lzh(); + +-typedef struct methodinfo { ++struct methodinfo { + char *name; + int number; + }; +@@ -40,13 +40,13 @@ + {"-lzs-", lzs} + }; + static char *lzh_archive; +-static char *lzh_pointer; +-static char *lzh_data; +-static char *lzh_finfo; +-static int lzh_fsize; +-static int lzh_kind; ++char *lzh_pointer; ++char *lzh_data; ++char *lzh_finfo; ++int lzh_fsize; ++int lzh_kind; + static int oldsize; +-static char *lzh_file; ++char *lzh_file; + static int lzh_filesize; + static char *lzh_current; + static char *tmp_out_ptr; Property changes on: head/archivers/macutils/files/patch-macunpack_lzh.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_lzh.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_lzh.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_lzh.h (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/lzh.h.orig Fri Apr 16 00:24:44 1999 ++++ macunpack/lzh.h Fri Apr 16 00:24:58 1999 +@@ -30,7 +30,7 @@ + #define L_EEXTENDSZ 0 + #define L_EEXTEND 1 + +-typedef struct fileHdr { /* 58 bytes */ ++struct fileHdr { /* 58 bytes */ + unsigned char hsize; + unsigned char hcrc; + char method[5]; Property changes on: head/archivers/macutils/files/patch-macunpack_lzh.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_sit.c =================================================================== --- head/archivers/macutils/files/patch-macunpack_sit.c (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_sit.c (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/sit.c.orig Fri Apr 16 00:18:28 1999 ++++ macunpack/sit.c Fri Apr 16 00:18:34 1999 +@@ -19,7 +19,7 @@ + extern void de_lzah(); + extern unsigned char (*lzah_getbyte)(); + +-typedef struct methodinfo { ++struct methodinfo { + char *name; + int number; + }; Property changes on: head/archivers/macutils/files/patch-macunpack_sit.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_sit.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_sit.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_sit.h (revision 363075) @@ -0,0 +1,20 @@ +--- macunpack/sit.h.orig Fri Apr 16 00:15:41 1999 ++++ macunpack/sit.h Fri Apr 16 00:15:56 1999 +@@ -24,7 +24,7 @@ + + typedef long OSType; + +-typedef struct sitHdr { /* 22 bytes */ ++struct sitHdr { /* 22 bytes */ + OSType signature; /* = 'SIT!' -- for verification */ + unsigned short numFiles; /* number of files in archive */ + unsigned long arcLength; /* length of entire archive incl. +@@ -34,7 +34,7 @@ + char reserved[7]; + }; + +-typedef struct fileHdr { /* 112 bytes */ ++struct fileHdr { /* 112 bytes */ + unsigned char compRMethod; /* rsrc fork compression method */ + unsigned char compDMethod; /* data fork compression method */ + unsigned char fName[64]; /* a STR63 */ Property changes on: head/archivers/macutils/files/patch-macunpack_sit.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_stf.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_stf.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_stf.h (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/stf.h.orig Fri Apr 16 00:22:12 1999 ++++ macunpack/stf.h Fri Apr 16 00:22:19 1999 +@@ -5,7 +5,7 @@ + #define S_RSRCLNGTH 3 /* + NAMELENGTH */ + #define S_DATALNGTH 7 /* + NAMELENGTH */ + +-typedef struct fileHdr { ++struct fileHdr { + char magic[3]; + char flength; + char fname[32]; /* actually flength */ Property changes on: head/archivers/macutils/files/patch-macunpack_stf.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-macunpack_zma.h =================================================================== --- head/archivers/macutils/files/patch-macunpack_zma.h (nonexistent) +++ head/archivers/macutils/files/patch-macunpack_zma.h (revision 363075) @@ -0,0 +1,11 @@ +--- macunpack/zma.h.orig Fri Apr 16 01:04:19 1999 ++++ macunpack/zma.h Fri Apr 16 01:04:29 1999 +@@ -20,7 +20,7 @@ + #define Z_RCRC 44 /* Resource crc */ + #define Z_FNAME 46 /* File name length and name */ + +-typedef struct fileHdr { /* 78 bytes */ ++struct fileHdr { /* 78 bytes */ + char deleted; /* Not in original, split off from: */ + char what; /* What kind? Negative if deleted */ + unsigned char hlen ; /* Header length */ Property changes on: head/archivers/macutils/files/patch-macunpack_zma.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-makefile =================================================================== --- head/archivers/macutils/files/patch-makefile (nonexistent) +++ head/archivers/macutils/files/patch-makefile (revision 363075) @@ -0,0 +1,83 @@ +--- makefile.orig Sun Oct 3 05:16:00 1993 ++++ makefile Sat Jun 10 13:35:16 2000 +@@ -1,5 +1,4 @@ + SHELL = /bin/sh +-BINDIR = /ufs/dik/tmpbin + # Use the following flags on the CF macro definition as needed. + # + # -DBSD if you are on a BSD system +@@ -24,44 +23,44 @@ + # + # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system + # +-CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DNODOT -DAPPLEDOUBLE ++CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DAUFSPLUS ${CFLAGS} + + all: +- (cd crc; make CF='$(CF)') +- (cd util; make CF='$(CF)') +- (cd fileio; make CF='$(CF)') +- (cd macunpack; make CF='$(CF)') +- (cd hexbin; make CF='$(CF)') +- (cd mixed; make CF='$(CF)') +- (cd binhex; make CF='$(CF)') +- (cd comm; make CF='$(CF)') ++ (cd crc; $(MAKE) CFLAGS='$(CF)') ++ (cd util; $(MAKE) CFLAGS='$(CF)') ++ (cd fileio; $(MAKE) CFLAGS='$(CF)') ++ (cd macunpack; $(MAKE) CFLAGS='$(CF)') ++ (cd hexbin; $(MAKE) CFLAGS='$(CF)') ++ (cd mixed; $(MAKE) CFLAGS='$(CF)') ++ (cd binhex; $(MAKE) CFLAGS='$(CF)') ++ (cd comm; $(MAKE) CFLAGS='$(CF)') + + clean: +- (cd crc; make clean) +- (cd util; make clean) +- (cd fileio; make clean) +- (cd macunpack; make clean) +- (cd hexbin; make clean) +- (cd mixed; make clean) +- (cd binhex; make clean) +- (cd comm; make clean) ++ (cd crc; $(MAKE) clean) ++ (cd util; $(MAKE) clean) ++ (cd fileio; $(MAKE) clean) ++ (cd macunpack; $(MAKE) clean) ++ (cd hexbin; $(MAKE) clean) ++ (cd mixed; $(MAKE) clean) ++ (cd binhex; $(MAKE) clean) ++ (cd comm; $(MAKE) clean) + + clobber: +- (cd crc; make clean) +- (cd util; make clean) +- (cd fileio; make clean) +- (cd macunpack; make clobber) +- (cd hexbin; make clobber) +- (cd mixed; make clobber) +- (cd binhex; make clobber) +- (cd comm; make clobber) ++ (cd crc; (MAKE) clean) ++ (cd util; (MAKE) clean) ++ (cd fileio; (MAKE) clean) ++ (cd macunpack; (MAKE) clobber) ++ (cd hexbin; (MAKE) clobber) ++ (cd mixed; (MAKE) clobber) ++ (cd binhex; (MAKE) clobber) ++ (cd comm; (MAKE) clobber) + + lint: +- (cd macunpack; make CF='$(CF)' lint) +- (cd hexbin; make CF='$(CF)' lint) +- (cd mixed; make CF='$(CF)' lint) +- (cd binhex; make CF='$(CF)' lint) +- (cd comm; make CF='$(CF)' lint) ++ (cd macunpack; (MAKE) CFLAGS='$(CF)' lint) ++ (cd hexbin; (MAKE) CFLAGS='$(CF)' lint) ++ (cd mixed; (MAKE) CFLAGS='$(CF)' lint) ++ (cd binhex; (MAKE) CFLAGS='$(CF)' lint) ++ (cd comm; (MAKE) CFLAGS='$(CF)' lint) + + install: + cp macunpack/macunpack $(BINDIR)/. Property changes on: head/archivers/macutils/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/macutils/files/patch-util_transname.c =================================================================== --- head/archivers/macutils/files/patch-util_transname.c (nonexistent) +++ head/archivers/macutils/files/patch-util_transname.c (revision 363075) @@ -0,0 +1,9 @@ +--- util/transname.c.orig Fri Apr 16 00:02:36 1999 ++++ util/transname.c Fri Apr 16 00:02:38 1999 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + + char *strncpy(); + Property changes on: head/archivers/macutils/files/patch-util_transname.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/ppunpack/files/patch-aa =================================================================== --- head/archivers/ppunpack/files/patch-aa (revision 363074) +++ head/archivers/ppunpack/files/patch-aa (nonexistent) @@ -1,14 +0,0 @@ ---- depack.h.orig Sat May 22 21:55:32 1999 -+++ depack.h Sat May 22 21:56:18 1999 -@@ -4,8 +4,10 @@ - * see accompanying file README for distribution information - */ - -+#include -+ - typedef unsigned char ubyte; --typedef unsigned long ulong; -+#define ulong uint - - extern ulong depackedlen(ubyte *packed, ulong plen); - extern void ppdepack(ubyte *packed, ubyte *depacked, ulong plen, ulong unplen); Property changes on: head/archivers/ppunpack/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/ppunpack/files/patch-depack.h =================================================================== --- head/archivers/ppunpack/files/patch-depack.h (nonexistent) +++ head/archivers/ppunpack/files/patch-depack.h (revision 363075) @@ -0,0 +1,14 @@ +--- depack.h.orig Sat May 22 21:55:32 1999 ++++ depack.h Sat May 22 21:56:18 1999 +@@ -4,8 +4,10 @@ + * see accompanying file README for distribution information + */ + ++#include ++ + typedef unsigned char ubyte; +-typedef unsigned long ulong; ++#define ulong uint + + extern ulong depackedlen(ubyte *packed, ulong plen); + extern void ppdepack(ubyte *packed, ubyte *depacked, ulong plen, ulong unplen); Property changes on: head/archivers/ppunpack/files/patch-depack.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/squsq/files/patch-aa =================================================================== --- head/archivers/squsq/files/patch-aa (revision 363074) +++ head/archivers/squsq/files/patch-aa (nonexistent) @@ -1,20 +0,0 @@ ---- usq.c.orig Sun Jan 17 01:54:04 1988 -+++ usq.c Sun Jan 17 01:54:05 1988 -@@ -215,7 +215,7 @@ - goto closein; - } - --#ifdef C70 | TOPS20 -+#if defined(C70) || defined(TOPS20) - filecrc = getx16(inbuff); - #else - filecrc = getw16(inbuff); -@@ -239,7 +239,7 @@ - printf("%s -> %s: ", infile, outfile); - #endif - --#ifdef C70 | TOPS20 -+#if defined(C70) || defined(TOPS20) - numnodes = getx16(inbuff); - #else - numnodes = getw16(inbuff); Property changes on: head/archivers/squsq/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/squsq/files/patch-usq.c =================================================================== --- head/archivers/squsq/files/patch-usq.c (nonexistent) +++ head/archivers/squsq/files/patch-usq.c (revision 363075) @@ -0,0 +1,20 @@ +--- usq.c.orig Sun Jan 17 01:54:04 1988 ++++ usq.c Sun Jan 17 01:54:05 1988 +@@ -215,7 +215,7 @@ + goto closein; + } + +-#ifdef C70 | TOPS20 ++#if defined(C70) || defined(TOPS20) + filecrc = getx16(inbuff); + #else + filecrc = getw16(inbuff); +@@ -239,7 +239,7 @@ + printf("%s -> %s: ", infile, outfile); + #endif + +-#ifdef C70 | TOPS20 ++#if defined(C70) || defined(TOPS20) + numnodes = getx16(inbuff); + #else + numnodes = getw16(inbuff); Property changes on: head/archivers/squsq/files/patch-usq.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/zip/files/patch-aa =================================================================== --- head/archivers/zip/files/patch-aa (revision 363074) +++ head/archivers/zip/files/patch-aa (nonexistent) @@ -1,35 +0,0 @@ ---- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400 -+++ unix/configure 2008-08-03 06:35:03.000000000 +0400 -@@ -98,7 +98,6 @@ - _EOF_ - $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null - if test $? -eq 0; then -- CFLAGS_OPT='-O3' - echo " GNU C ($CFLAGS_OPT)" - # Special Mac OS X shared library "ld" option? - if test ` uname -s 2> /dev/null ` = 'Darwin'; then -@@ -110,7 +109,6 @@ - rm -f conftest - fi - else -- CFLAGS_OPT='-O' - echo " Other-unknown C ($CFLAGS_OPT)" - fi - fi -@@ -224,7 +222,6 @@ - [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" - [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp - [ -f /lib/cpp ] && CPP=/lib/cpp --[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp - [ -f /xenix ] && CPP="${CC} -E" - [ -f /lynx.os ] && CPP="${CC} -E" - -@@ -244,7 +241,7 @@ - echo "int foo() { return 0;}" > conftest.c - $CC -c conftest.c >/dev/null 2>/dev/null - echo Check if compiler generates underlines -- nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null -+ nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null - [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE" - if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then - if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ] Property changes on: head/archivers/zip/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/zip/files/patch-ab =================================================================== --- head/archivers/zip/files/patch-ab (revision 363074) +++ head/archivers/zip/files/patch-ab (nonexistent) @@ -1,20 +0,0 @@ ---- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400 -+++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400 -@@ -22,7 +22,6 @@ - LN = ln -s - - # (to use the GNU compiler, change cc to gcc in CC) --CC = cc - BIND = $(CC) - AS = $(CC) -c - CPP = /lib/cpp -@@ -57,8 +56,7 @@ - # CFLAGS flags for C compile - # LFLAGS1 flags after output file spec, before obj file list - # LFLAGS2 flags after obj file list (libraries, etc) --CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP) --CFLAGS = -O2 $(CFLAGS_NOOPT) -+CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP) - LFLAGS1 = - LFLAGS2 = -s - Property changes on: head/archivers/zip/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/zip/files/patch-unix_Makefile =================================================================== --- head/archivers/zip/files/patch-unix_Makefile (nonexistent) +++ head/archivers/zip/files/patch-unix_Makefile (revision 363075) @@ -0,0 +1,20 @@ +--- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400 ++++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400 +@@ -22,7 +22,6 @@ + LN = ln -s + + # (to use the GNU compiler, change cc to gcc in CC) +-CC = cc + BIND = $(CC) + AS = $(CC) -c + CPP = /lib/cpp +@@ -57,8 +56,7 @@ + # CFLAGS flags for C compile + # LFLAGS1 flags after output file spec, before obj file list + # LFLAGS2 flags after obj file list (libraries, etc) +-CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP) +-CFLAGS = -O2 $(CFLAGS_NOOPT) ++CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP) + LFLAGS1 = + LFLAGS2 = -s + Property changes on: head/archivers/zip/files/patch-unix_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/zip/files/patch-unix_configure =================================================================== --- head/archivers/zip/files/patch-unix_configure (nonexistent) +++ head/archivers/zip/files/patch-unix_configure (revision 363075) @@ -0,0 +1,35 @@ +--- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400 ++++ unix/configure 2008-08-03 06:35:03.000000000 +0400 +@@ -98,7 +98,6 @@ + _EOF_ + $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null + if test $? -eq 0; then +- CFLAGS_OPT='-O3' + echo " GNU C ($CFLAGS_OPT)" + # Special Mac OS X shared library "ld" option? + if test ` uname -s 2> /dev/null ` = 'Darwin'; then +@@ -110,7 +109,6 @@ + rm -f conftest + fi + else +- CFLAGS_OPT='-O' + echo " Other-unknown C ($CFLAGS_OPT)" + fi + fi +@@ -224,7 +222,6 @@ + [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" + [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp + [ -f /lib/cpp ] && CPP=/lib/cpp +-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp + [ -f /xenix ] && CPP="${CC} -E" + [ -f /lynx.os ] && CPP="${CC} -E" + +@@ -244,7 +241,7 @@ + echo "int foo() { return 0;}" > conftest.c + $CC -c conftest.c >/dev/null 2>/dev/null + echo Check if compiler generates underlines +- nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null ++ nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null + [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE" + if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then + if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ] Property changes on: head/archivers/zip/files/patch-unix_configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property