FreeBSD Bugzilla – Attachment 69574 Details for
Bug 101771
[patch] archivers/arc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
archivers-arc.diff
archivers-arc.diff (text/plain), 11.17 KB, created by
Gabor Kovesdan
on 2006-08-10 20:20:16 UTC
(
hide
)
Description:
archivers-arc.diff
Filename:
MIME Type:
Creator:
Gabor Kovesdan
Created:
2006-08-10 20:20:16 UTC
Size:
11.17 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /usr/cvs/ports/archivers/arc/Makefile,v >retrieving revision 1.19 >diff -u -r1.19 Makefile >--- Makefile 26 May 2006 23:53:36 -0000 1.19 >+++ Makefile 10 Aug 2006 19:09:06 -0000 >@@ -7,6 +7,7 @@ > > PORTNAME= arc > PORTVERSION= 5.21o >+PORTREVISION= 1 > CATEGORIES= archivers > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} >@@ -15,12 +16,36 @@ > MAINTAINER= ache@FreeBSD.org > COMMENT= Create & extract files from DOS .ARC files > >+PLIST_FILES= bin/arc bin/marc >+PORTDOCS= Arc521.doc > MAN1= arc.1 > >+post-patch: >+ @${REINPLACE_CMD} -e 's| = $$(OPT) $$(SYSTEM)|+=$$(SYSTEM)|' \ >+ -e "s|CC = cc|CC?= cc|" \ >+ -e "s|TMCLOCK = tmclock.o|TMCLOCK =|" \ >+ ${WRKSRC}/Makefile >+ @${REINPLACE_CMD} "s|warn;|arcwarn;|" ${WRKSRC}/arc.h >+ @${REINPLACE_CMD} "s|warn =|arcwarn =|" ${WRKSRC}/arcdata.c >+ @${REINPLACE_CMD} -e "s|long tmclock();||" \ >+ -e "s|tmclock(|timelocal(|" \ >+ ${WRKSRC}/arcdos.c >+ @${REINPLACE_CMD} -e "s|warn = 0;|arcwarn = 0;|" \ >+ -e 's|\*lf\, \*fopen();|\*lf;|' \ >+ ${WRKSRC}/arc.c >+.for i in arcadd.c arccvt.c arclzw.c arcrun.c >+ @${REINPLACE_CMD} "s|warn)|arcwarn)|" ${WRKSRC}/${i} >+.endfor >+.for i in arcext.c arcunp.c >+ @${REINPLACE_CMD} "s|(warn|(arcwarn|" ${WRKSRC}/${i} >+.endfor >+ > do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc ${PREFIX}/bin >- ${INSTALL_MAN} ${WRKSRC}/arc.1 ${PREFIX}/man/man1 >- ${MKDIR} ${PREFIX}/share/doc/arc >- ${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${PREFIX}/share/doc/arc >+ ${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc ${TARGETDIR}/bin >+ ${INSTALL_MAN} ${WRKSRC}/arc.1 ${MANPREFIX}/man/man1 >+.if !defined(NOPORTDOCS) >+ @${MKDIR} ${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${DOCSDIR} >+.endif > > .include <bsd.port.mk> >Index: pkg-plist >=================================================================== >RCS file: pkg-plist >diff -N pkg-plist >--- pkg-plist 21 Oct 2003 09:58:07 -0000 1.6 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,4 +0,0 @@ >-bin/arc >-bin/marc >-%%DOCSDIR%%/Arc521.doc >-@dirrm %%DOCSDIR%% >Index: files/patch-aa >=================================================================== >RCS file: files/patch-aa >diff -N files/patch-aa >--- files/patch-aa 5 Nov 2003 11:16:23 -0000 1.5 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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 >Index: files/patch-ab >=================================================================== >RCS file: files/patch-ab >diff -N files/patch-ab >--- files/patch-ab 5 Mar 2000 09:27:24 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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); >Index: files/patch-ad >=================================================================== >RCS file: files/patch-ad >diff -N files/patch-ad >--- files/patch-ad 14 Oct 2005 12:25:57 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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 */ >Index: files/patch-ae >=================================================================== >RCS file: files/patch-ae >diff -N files/patch-ae >--- files/patch-ae 5 Mar 2000 09:27:26 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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 */ >Index: files/patch-af >=================================================================== >RCS file: files/patch-af >diff -N files/patch-af >--- files/patch-af 5 Mar 2000 09:27:26 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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'; >Index: files/patch-ag >=================================================================== >RCS file: files/patch-ag >diff -N files/patch-ag >--- files/patch-ag 5 Mar 2000 09:27:26 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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++; >- } >Index: files/patch-ah >=================================================================== >RCS file: files/patch-ah >diff -N files/patch-ah >--- files/patch-ah 5 Mar 2000 09:27:27 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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 */ >Index: files/patch-ai >=================================================================== >RCS file: files/patch-ai >diff -N files/patch-ai >--- files/patch-ai 14 Oct 2005 12:25:57 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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++; >- } >Index: files/patch-ak >=================================================================== >RCS file: files/patch-ak >diff -N files/patch-ak >--- files/patch-ak 5 Mar 2000 09:27:28 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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); >Index: files/patch-al >=================================================================== >RCS file: files/patch-al >diff -N files/patch-al >--- files/patch-al 26 May 2006 23:53:37 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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++; >- } >Index: files/patch-am >=================================================================== >RCS file: files/patch-am >diff -N files/patch-am >--- files/patch-am 5 Mar 2000 09:27:28 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -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++; >- }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 101771
: 69574