head	1.5;
access;
symbols
	RELEASE_8_3_0:1.5
	RELEASE_9_0_0:1.5
	RELEASE_7_4_0:1.5
	RELEASE_8_2_0:1.5
	RELEASE_6_EOL:1.5
	RELEASE_8_1_0:1.5
	RELEASE_7_3_0:1.5
	RELEASE_8_0_0:1.5
	RELEASE_7_2_0:1.5
	RELEASE_7_1_0:1.5
	RELEASE_6_4_0:1.5
	RELEASE_5_EOL:1.5
	RELEASE_7_0_0:1.5
	RELEASE_6_3_0:1.5
	PRE_XORG_7:1.5
	RELEASE_4_EOL:1.5
	RELEASE_6_2_0:1.5
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.4
	RELEASE_5_1_0:1.4
	RELEASE_4_8_0:1.4
	RELEASE_5_0_0:1.4
	RELEASE_4_7_0:1.4
	RELEASE_4_6_2:1.4
	RELEASE_4_6_1:1.4
	RELEASE_4_6_0:1.4
	RELEASE_5_0_DP1:1.4
	RELEASE_4_5_0:1.4
	RELEASE_4_4_0:1.4
	RELEASE_4_3_0:1.4
	RELEASE_4_2_0:1.4
	RELEASE_4_1_1:1.4
	RELEASE_4_1_0:1.4
	RELEASE_3_5_0:1.4
	RELEASE_4_0_0:1.4
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	RELEASE_3_2_0:1.4
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.4
	RELEASE_3_0_0:1.4
	RELEASE_2_2_7:1.4
	RELEASE_2_2_6:1.3
	RELEASE_2_2_5:1.3
	RELEASE_2_2_1:1.3
	RELEASE_2_2_2:1.3
	ache:1.1.1.1;
locks; strict;
comment	@# @;


1.5
date	2003.11.05.11.16.23;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	98.06.14.23.33.16;	author hoek;	state Exp;
branches;
next	1.3;

1.3
date	97.02.16.21.10.45;	author obrien;	state Exp;
branches;
next	1.2;

1.2
date	96.12.22.17.01.12;	author imp;	state Exp;
branches;
next	1.1;

1.1
date	94.12.31.18.07.45;	author ache;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.12.31.18.07.46;	author ache;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Upgrade to 5.21j
@
text
@--- 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
@


1.4
log
@1) Break-up the mega-patch-aa.
2) Fix install for non-root users.
3) "See work/Arc521.doc" is not considered a good pkg/DESCR.
4) install ad. doc., too.
@
text
@d1 20
a20 34
*** Makefile.old	Wed Apr 15 02:57:58 1992
--- Makefile	Sat Dec 31 20:36:07 1994
***************
*** 32,45 ****
  OPT = -O
  # For MWC 3.0 on the Atari ST, use:
  #CFLAGS = -VCOMPAC -VPEEP
! CFLAGS = $(OPT) $(SYSTEM)
  
  # GNU's gcc is very nice, if you've got it. Otherwise just cc.
  #CC = cgcc -mshort
! CC = cc
  
  # tmclock is only needed on Unix systems...
! TMCLOCK = tmclock.o
  
  # Files needed for System V 
  #SYSVOBJ =	getwd.o rename.o scandir.o utimes.o
--- 32,46 ----
  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
! #CC = cc
  
  # tmclock is only needed on Unix systems...
! TMCLOCK = #tmclock.o
  
  # Files needed for System V 
  #SYSVOBJ =	getwd.o rename.o scandir.o utimes.o
@


1.3
log
@A quick purousal thru our port's patches directory shows a *WAY* over use of
__FreeBSD__.

That said, add __OpenBSD__ and __NetBSD__ where approapiate.
@
text
@a34 60
***************
*** 61,66 ****
--- 62,71 ----
  
  clean:
  	-rm *.o arc$(PROG) marc$(PROG)
+ 
+ install:
+ 	install -cs -o bin -g bin arc marc ${PREFIX}/bin
+ 	install -c -o bin -g bin arc.1 ${PREFIX}/man/man1
  
  arc.o:	$(SRCDIR)arc.c	$(HEADER)
  	$(CC) $(CFLAGS) -c $(SRCDIR)arc.c
*** 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(__FreeSBD__) && !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);
*** marc.c.old	Wed Apr 15 02:59:21 1992
--- marc.c	Sat Dec 31 20:40:30 1994
***************
*** 35,40 ****
--- 35,41 ----
  #endif
  VOID	arcdie();
  static VOID expandlst(), merge();
+ char *makefnam();                  /* filename fixup routine */
  
  FILE *src;			       /* source archive */
  char srcname[STRLEN];		       /* source archive name */
***************
*** 47,53 ****
  int nargs;			       /* number of arguments */
  char *arg[];			       /* pointers to arguments */
  {
-     char *makefnam();		       /* filename fixup routine */
      char *envfind();
  #if	!_MTS
      char *arctemp2, *mktemp();		/* temp file stuff */
--- 48,53 ----
@


1.2
log
@Apply minor patch from the OpenBSD folks to allow this to compile and
work on both FreeBSD and OpenBSD.

Specifically, both FreeBSD and OpenBSD have the timelocal() function.  In
fact most unixes have this function, so I'm not sure what the best fix
generically would be.  This fix is no worse than the one that was there
before, however.

Submitted by:	Niklas Hallqvist <niklas@@filippa.appli.se>
Obtained from:	OpenBSD by way of Niklas
@
text
@d65 1
a65 1
+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
@


1.1
log
@Initial revision
@
text
@d56 1
a56 1
+ #ifndef __FreeBSD__
d65 1
a65 1
+ #ifndef __FreeBSD__
@


1.1.1.1
log
@ARC archiver
@
text
@@
