Some minor pkglint; split patch, fix typo, and use ${INSTALL_*} macros.

3 files changed, 50 insertions, 96 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 250325981f3..dc5ceb7edd8 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/06/18 16:06:37 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/22 19:54:08 tv Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp 
 #
 
@@ -12,4 +12,9 @@ MAINTAINER=     packages@netbsd.org
 
 NO_WRKSUBDIR=	yes
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/arc ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/marc ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/arc.1 ${PREFIX}/man/man1/
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/arc/patches/patch-aa b/archivers/arc/patches/patch-aa
index 8048f114687..44a5285104b 100644
--- a/archivers/arc/patches/patch-aa
+++ b/archivers/arc/patches/patch-aa
@@ -1,96 +1,20 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:47 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/05/22 19:54:09 tv Exp $
 
-*** 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
-***************
-*** 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 ----
+--- Makefile.orig	Tue Apr 14 18:57:58 1992
++++ Makefile	Sat May 22 15:44:36 1999
+@@ -32,14 +32,7 @@
+ 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
++CFLAGS += $(SYSTEM)
+ 
+ # Files needed for System V 
+ #SYSVOBJ =	getwd.o rename.o scandir.o utimes.o
diff --git a/archivers/arc/patches/patch-ab b/archivers/arc/patches/patch-ab
new file mode 100644
index 00000000000..d16ca3e6ddc
--- /dev/null
+++ b/archivers/arc/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 1999/05/22 19:54:09 tv Exp $
+
+--- arcdos.c.orig	Tue Apr 14 18:58:21 1992
++++ arcdos.c	Sat May 22 15:43:27 1999
+@@ -173,14 +173,20 @@
+ 	struct tm	tm;
+ 	struct timeval  tvp[2];
+ 	int	utimes();
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ 	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);