Attachment #69574 for bug #101771

View | Details | Raw Unified | Return to bug 101771
Collapse All | Expand All

Lines 7-12 Link Here

(-)Makefile (-4 / +29 lines)
7		7
8	PORTNAME= arc	8	PORTNAME= arc
9	PORTVERSION= 5.21o	9	PORTVERSION= 5.21o
		10	PORTREVISION= 1
10	CATEGORIES= archivers	11	CATEGORIES= archivers
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-26 Link Here
15	MAINTAINER= ache@FreeBSD.org	16	MAINTAINER= ache@FreeBSD.org
16	COMMENT= Create & extract files from DOS .ARC files	17	COMMENT= Create & extract files from DOS .ARC files
17		18
		19	PLIST_FILES= bin/arc bin/marc
		20	PORTDOCS= Arc521.doc
18	MAN1= arc.1	21	MAN1= arc.1
19		22
		23	post-patch:
		24	@${REINPLACE_CMD} -e 's\| = $$(OPT) $$(SYSTEM)\|+=$$(SYSTEM)\|' \
		25	-e "s\|CC = cc\|CC?= cc\|" \
		26	-e "s\|TMCLOCK = tmclock.o\|TMCLOCK =\|" \
		27	${WRKSRC}/Makefile
		28	@${REINPLACE_CMD} "s\|warn;\|arcwarn;\|" ${WRKSRC}/arc.h
		29	@${REINPLACE_CMD} "s\|warn =\|arcwarn =\|" ${WRKSRC}/arcdata.c
		30	@${REINPLACE_CMD} -e "s\|long tmclock();\|\|" \
		31	-e "s\|tmclock(\|timelocal(\|" \
		32	${WRKSRC}/arcdos.c
		33	@${REINPLACE_CMD} -e "s\|warn = 0;\|arcwarn = 0;\|" \
		34	-e 's\|\lf\, \fopen();\|\*lf;\|' \
		35	${WRKSRC}/arc.c
		36	.for i in arcadd.c arccvt.c arclzw.c arcrun.c
		37	@${REINPLACE_CMD} "s\|warn)\|arcwarn)\|" ${WRKSRC}/${i}
		38	.endfor
		39	.for i in arcext.c arcunp.c
		40	@${REINPLACE_CMD} "s\|(warn\|(arcwarn\|" ${WRKSRC}/${i}
		41	.endfor
		42
20	do-install:	43	do-install:
21	${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc ${PREFIX}/bin	44	${INSTALL_PROGRAM} ${WRKSRC}/arc ${WRKSRC}/marc ${TARGETDIR}/bin
22	${INSTALL_MAN} ${WRKSRC}/arc.1 ${PREFIX}/man/man1	45	${INSTALL_MAN} ${WRKSRC}/arc.1 ${MANPREFIX}/man/man1
23	${MKDIR} ${PREFIX}/share/doc/arc	46	.if !defined(NOPORTDOCS)
24	${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${PREFIX}/share/doc/arc	47	@${MKDIR} ${DOCSDIR}
		48	${INSTALL_DATA} ${WRKSRC}/Arc521.doc ${DOCSDIR}
		49	.endif
25		50
26	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Removed Link Here

(-)pkg-plist (-4 lines)
1	bin/arc
2	bin/marc
3	%%DOCSDIR%%/Arc521.doc
4	@dirrm %%DOCSDIR%%




--- 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




*** 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);




--- 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 */

Removed Link Here

(-)files/patch-ae (-11 lines)
1	--- ./arc.h.orig Tue Aug 10 23:03:24 1999
2	+++ ./arc.h Tue Aug 10 23:01:55 1999
3	@@ -106,7 +106,7 @@
4	#if GEMDOS
5	extern int hold; /* hold screen before exiting */
6	#endif
7	-extern int warn; /* true to print warnings */
8	+extern int arcwarn; /* true to print warnings */
9	extern int note; /* true to print comments */
10	extern int bose; /* true to be verbose */
11	extern int nocomp; /* true to suppress compression */




--- ./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';

Removed Link Here

(-)files/patch-ag (-11 lines)
1	--- ./arccvt.c.orig Tue Aug 10 23:03:24 1999
2	+++ ./arccvt.c Tue Aug 10 23:01:55 1999
3	@@ -120,7 +120,7 @@
4	writehdr(hdr, new); /* write out real header */
5	fseek(new, hdr->size, 1); /* skip over data to next header */
6	fclose(tmp); /* all done with the file */
7	- if (unlink(tempname) && warn) {
8	+ if (unlink(tempname) && arcwarn) {
9	printf("Cannot unsave %s\n", tempname);
10	nerrs++;
11	}

Removed Link Here

(-)files/patch-ah (-11 lines)
1	--- ./arcdata.c.orig Tue Aug 10 23:03:24 1999
2	+++ ./arcdata.c Tue Aug 10 23:01:56 1999
3	@@ -35,7 +35,7 @@
4	#if GEMDOS
5	int hold = 0; /* true to pause before exit */
6	#endif
7	-int warn = 1; /* true to print warnings */
8	+int arcwarn = 1; /* true to print warnings */
9	int note = 1; /* true to print comments */
10	int bose = 0; /* true to be verbose */
11	int nocomp = 0; /* true to suppress compression */




--- 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++;
 		}

Removed Link Here

(-)files/patch-ak (-11 lines)
1	--- ./arclzw.c.orig Tue Aug 10 23:03:25 1999
2	+++ ./arclzw.c Tue Aug 10 23:01:57 1999
3	@@ -546,7 +546,7 @@
4	*/
5	if (code >= free_ent) {
6	if (code > free_ent) {
7	- if (warn) {
8	+ if (arcwarn) {
9	printf("Corrupted compressed file.\n");
10	printf("Invalid code %d when max is %d.\n",
11	code, free_ent);




--- 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++;
 	}




--- ./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++;
 		}

Return to bug 101771

Removed Link Here

(-)files/patch-aa (-20 lines)
1	--- Makefile.orig Fri Oct 31 05:32:51 2003
2	+++ Makefile Wed Nov 5 13:53:51 2003
3	@@ -38,14 +38,14 @@
4	OPT = -O
5	# For MWC 3.0 on the Atari ST, use:
6	#CFLAGS = -VCOMPAC -VPEEP
7	-CFLAGS = $(OPT) $(SYSTEM)
8	+CFLAGS+=$(SYSTEM)
9
10	# GNU's gcc is very nice, if you've got it. Otherwise just cc.
11	#CC = cgcc -mshort -mbaserel
12	-CC = cc
13	+#CC = cc
14
15	# tmclock is only needed on Unix systems...
16	-TMCLOCK = tmclock.o
17	+TMCLOCK = #tmclock.o
18
19	# Integer-only stdio routines for Atari ST.
20	#LIBS=-liio16

Removed Link Here

(-)files/patch-ab (-25 lines)
1	*** arcdos.c.old Wed Apr 15 02:58:21 1992
2	--- arcdos.c Sat Dec 31 20:32:25 1994
3	***************
4	* 173,186 **
5	--- 173,192 ----
6	struct tm tm;
7	struct timeval tvp[2];
8	int utimes();
9	+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
10	long tmclock();
11	+ #endif
12	tm.tm_sec = (time & 31) * 2;
13	tm.tm_min = (time >> 5) & 63;
14	tm.tm_hour = (time >> 11);
15	tm.tm_mday = date & 31;
16	tm.tm_mon = ((date >> 5) & 15) - 1;
17	tm.tm_year = (date >> 9) + 80;
18	+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
19	tvp[0].tv_sec = tmclock(&tm);
20	+ #else
21	+ tvp[0].tv_sec = timelocal(&tm);
22	+ #endif
23	tvp[1].tv_sec = tvp[0].tv_sec;
24	tvp[0].tv_usec = tvp[1].tv_usec = 0;
25	utimes(f, tvp);

Removed Link Here

(-)files/patch-ad (-20 lines)
1	--- arc.c.orig Sun Oct 9 03:38:22 2005
2	+++ arc.c Fri Oct 14 14:22:38 2005
3	@@ -290,7 +290,7 @@
4	keepbak = 1;
5
6	else if (a == 'W') / suppress warnings */
7	- warn = 0;
8	+ arcwarn = 0;
9	#if !DOS
10	else if (a == 'I') / image mode, no ASCII/EBCDIC x-late */
11	image = !image;
12	@@ -426,7 +426,7 @@
13	expandlst(n) /* expand an indirect reference */
14	int n; /* number of entry to expand */
15	{
16	- FILE lf, fopen(); /* list file, opener */
17	+ FILE lf; / list file, opener */
18	char buf[100]; /* input buffer */
19	int x; /* index */
20	char p = lst[n] + 1; / filename pointer */

Removed Link Here

(-)files/patch-af (-47 lines)
1	--- ./arcadd.c.orig Tue Aug 10 23:03:24 1999
2	+++ ./arcadd.c Tue Aug 10 23:01:55 1999
3	@@ -119,7 +119,7 @@
4	}
5	#endif
6	}
7	- if (notemp && warn)
8	+ if (notemp && arcwarn)
9	printf("No files match: %s\n", arg[n]);
10	}
11
12	@@ -133,7 +133,7 @@
13	free(path);
14	free(name);
15	}
16	- if (nowork && warn)
17	+ if (nowork && arcwarn)
18	printf("No files were added.\n");
19	}
20
21	@@ -227,7 +227,7 @@
22	if (move) { /* if this was a move */
23	for (n = 0; n < nfiles; n++) { /* then delete each file
24	* added */
25	- if (unlink(path[n]) && warn) {
26	+ if (unlink(path[n]) && arcwarn) {
27	printf("Cannot unsave %s\n", path[n]);
28	nerrs++;
29	}
30	@@ -259,7 +259,7 @@
31	if (!f)
32	#endif
33	{
34	- if (warn) {
35	+ if (arcwarn) {
36	printf("Cannot read file: %s\n", path);
37	nerrs++;
38	}
39	@@ -267,7 +267,7 @@
40	}
41	#if !DOS
42	if (strlen(name) >= FNLEN) {
43	- if (warn) {
44	+ if (arcwarn) {
45	char buf[STRLEN];
46	printf("WARNING: File %s name too long!\n", name);
47	name[FNLEN-1]='\0';

Removed Link Here

(-)files/patch-ai (-20 lines)
1	--- arcext.c.orig Sat Oct 8 22:24:37 2005
2	+++ arcext.c Fri Oct 14 00:52:14 2005
3	@@ -143,7 +143,7 @@
4	if (note)
5	printf("Extracting file: %s\n", fix);
6
7	- if (warn && !overlay) {
8	+ if (arcwarn && !overlay) {
9	if ((f = fopen(fix, "r"))) { /* see if it exists */
10	fclose(f);
11	printf("WARNING: File %s already exists!", fix);
12	@@ -190,7 +190,7 @@
13	if (!f)
14	#endif
15	{
16	- if (warn) {
17	+ if (arcwarn) {
18	printf("Cannot create %s\n", fix);
19	nerrs++;
20	}

Removed Link Here

(-)files/patch-al (-38 lines)
1	--- arcrun.c.orig Wed Oct 12 19:22:18 2005
2	+++ arcrun.c Sat May 27 03:47:30 2006
3	@@ -98,7 +98,7 @@
4	strcpy(sys, buf);
5
6	else {
7	- if (warn) {
8	+ if (arcwarn) {
9	printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n",
10	hdr->name);
11	nerrs++;
12	@@ -112,7 +112,7 @@
13	&& strcmp(i, ".TTP")
14	&& strcmp(i, ".TOS"))
15	{
16	- if (warn) {
17	+ if (arcwarn) {
18	printf("File %s is not a .PRG, .TOS, or .TTP\n",
19	hdr->name);
20	nerrs++;
21	@@ -122,7 +122,7 @@
22	}
23	#endif
24
25	- if (warn)
26	+ if (arcwarn)
27	if ((tmp = fopen(buf, "r")))
28	arcdie("Temporary file %s already exists", buf);
29	if (!(tmp = tmpopen(buf)))
30	@@ -146,7 +146,7 @@
31	if (system(buf)) /* try to invoke it */
32	arcdie("Execution failed for %s", buf);
33	#endif
34	- if (unlink(buf) && warn) {
35	+ if (unlink(buf) && arcwarn) {
36	printf("Cannot unsave temporary file %s\n", buf);
37	nerrs++;
38	}

Removed Link Here

(-)files/patch-am (-20 lines)
1	--- ./arcunp.c.orig Tue Aug 10 23:03:25 1999
2	+++ ./arcunp.c Tue Aug 10 23:01:57 1999
3	@@ -123,7 +123,7 @@
4	break;
5
6	default: /* unknown method */
7	- if (warn) {
8	+ if (arcwarn) {
9	printf("I don't know how to unpack file %s\n", hdr->name);
10	printf("I think you need a newer version of ARC\n");
11	nerrs++;
12	@@ -135,7 +135,7 @@
13	/* cleanups common to all methods */
14
15	if (crcval != hdr->crc) {
16	- if (warn \|\| kludge) {
17	+ if (arcwarn \|\| kludge) {
18	printf("WARNING: File %s fails CRC check\n", hdr->name);
19	nerrs++;
20	}