- style
- make sure not to patch multiple files in one patch
This commit is contained in:
brad
parent
2e9cefa7e3
commit
f1fa59d786
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.5 1999/04/01 02:16:31 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 1999/08/10 02:09:41 brad Exp $
|
||||
|
||||
DISTNAME= arc521e.pl8
|
||||
PKGNAME= arc-5.21e
|
||||
@ -11,11 +11,4 @@ MAINTAINER= ports@openbsd.org
|
||||
|
||||
NO_WRKSUBDIR= yes
|
||||
|
||||
post-install:
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${PREFIX}/share/doc/arc
|
||||
${INSTALL_MAN} ${WRKDIR}/Arc521.doc ${WRKDIR}/Arcinfo \
|
||||
${PREFIX}/share/doc/arc
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,94 +1,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
|
||||
***************
|
||||
*** 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 Mon Aug 9 19:32:28 1999
|
||||
@@ -32,14 +32,15 @@
|
||||
OPT = -O
|
||||
# For MWC 3.0 on the Atari ST, use:
|
||||
#CFLAGS = -VCOMPAC -VPEEP
|
||||
-CFLAGS = $(OPT) $(SYSTEM)
|
||||
+#CFLAGS = $(OPT) $(SYSTEM)
|
||||
+CFLAGS += $(SYSTEM)
|
||||
|
||||
# GNU's gcc is very nice, if you've got it. Otherwise just cc.
|
||||
#CC = cgcc -mshort
|
||||
-CC = cc
|
||||
+#CC = cc
|
||||
|
||||
# tmclock is only needed on Unix systems...
|
||||
-TMCLOCK = tmclock.o
|
||||
+TMCLOCK = #tmclock.o
|
||||
|
||||
# Files needed for System V
|
||||
#SYSVOBJ = getwd.o rename.o scandir.o utimes.o
|
||||
@@ -61,6 +62,12 @@
|
||||
|
||||
clean:
|
||||
-rm *.o arc$(PROG) marc$(PROG)
|
||||
+
|
||||
+install:
|
||||
+ install -cs -o root -g wheel arc marc ${PREFIX}/bin
|
||||
+ install -c -o root -g wheel arc.1 ${PREFIX}/man/man1
|
||||
+ install -d -o root -g wheel ${PREFIX}/share/doc/arc
|
||||
+ install -c -o root -g wheel Arc521.doc Arcinfo ${PREFIX}/share/doc/arc
|
||||
|
||||
arc.o: $(SRCDIR)arc.c $(HEADER)
|
||||
$(CC) $(CFLAGS) -c $(SRCDIR)arc.c
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
--- arc.c.orig Mon Dec 29 07:10:22 1997
|
||||
+++ arc.c Mon Dec 29 07:11:13 1997
|
||||
@@ -110,7 +110,7 @@
|
||||
VOID upper();/* case conversion routine */
|
||||
char *envfind(); /* environment searcher */
|
||||
int n; /* index */
|
||||
- char *arctemp2, *mktemp();
|
||||
+ char *arctemp2, *mkstemp();
|
||||
#if GEMDOS
|
||||
VOID exitpause();
|
||||
int append;
|
||||
@@ -220,7 +220,7 @@
|
||||
#if !MSDOS
|
||||
{
|
||||
static char tempname[] = "AXXXXXX";
|
||||
- strcat(arctemp, mktemp(tempname));
|
||||
+ strcat(arctemp, mkstemp(tempname));
|
||||
}
|
||||
#else
|
||||
strcat(arctemp, "$ARCTEMP");
|
||||
--- arcdos.c.orig Tue Apr 14 18:58:21 1992
|
||||
+++ arcdos.c Mon Aug 9 11:19:46 1999
|
||||
@@ -173,14 +173,20 @@
|
||||
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);
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- marc.c.orig Tue Apr 14 18:59:21 1992
|
||||
+++ marc.c Mon Dec 29 07:12:33 1997
|
||||
@@ -50,7 +50,7 @@
|
||||
char *makefnam(); /* filename fixup routine */
|
||||
char *envfind();
|
||||
#if !_MTS
|
||||
- char *arctemp2, *mktemp(); /* temp file stuff */
|
||||
+ char *arctemp2, *mkstemp(); /* temp file stuff */
|
||||
#endif
|
||||
#if GEMDOS
|
||||
VOID exitpause();
|
||||
@@ -115,7 +115,7 @@
|
||||
#if !MSDOS
|
||||
{
|
||||
static char tempname[] = "AXXXXXX";
|
||||
- strcat(arctemp, mktemp(tempname));
|
||||
+ strcat(arctemp, mkstemp(tempname));
|
||||
}
|
||||
#else
|
||||
strcat(arctemp, "$ARCTEMP");
|
||||
@ -1,7 +1,6 @@
|
||||
bin/arc
|
||||
bin/marc
|
||||
man/man1/arc.1
|
||||
@exec mkdir -p %D/share/doc/arc
|
||||
share/doc/arc/Arc521.doc
|
||||
share/doc/arc/Arcinfo
|
||||
@dirrm share/doc/arc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user