- install bzlib.h and libbz2.a

- patch to allow `bzip -dc' to work on a symlink
This commit is contained in:
brad 1999-04-20 00:13:48 +00:00
parent 1981feef67
commit 2632eb2e88
4 changed files with 55 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 1999/04/01 02:16:36 brad Exp $
# $OpenBSD: Makefile,v 1.9 1999/04/20 00:13:48 brad Exp $
DISTNAME= bzip2-0.9.0c
PKGNAME= bzip2-0.9.0c
@ -16,6 +16,8 @@ do-install:
ln -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2
ln -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bzcat
${INSTALL_PROGRAM} ${WRKSRC}/bzip2recover ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/bzlib.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/libbz2.a ${PREFIX}/lib
${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1
ln -f ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bunzip2.1
ln -f ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzcat.1

View File

@ -1,5 +1,5 @@
--- Makefile.~1~ Wed Sep 9 04:30:41 1998
+++ Makefile Sun Sep 13 22:31:15 1998
--- Makefile.orig Thu Oct 22 21:27:22 1998
+++ Makefile Wed Oct 28 10:25:29 1998
@@ -20,6 +20,7 @@
lib: $(OBJS)
rm -f libbz2.a
@ -8,3 +8,12 @@
test: bzip2
@cat words1
@@ -38,7 +39,7 @@
clean:
rm -f *.o libbz2.a bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst
-.c.o: $*.o bzlib.h bzlib_private.h
+.c.o: bzlib.h bzlib_private.h
$(CC) $(CFLAGS) -c $*.c -o $*.o
tarfile:

View File

@ -0,0 +1,39 @@
--- bzip2.c.orig Sun Oct 18 03:34:28 1998
+++ bzip2.c Tue Feb 9 01:45:29 1999
@@ -160,8 +160,8 @@
# define PATH_SEP '/'
# define MY_LSTAT lstat
-# define MY_S_IFREG S_ISREG
# define MY_STAT stat
+# define MY_S_IFREG S_ISREG
# define APPEND_FILESPEC(root, name) \
root=snocString((root), (name))
@@ -777,6 +777,17 @@
return True;
}
+Bool notARegularFile ( Char* name )
+{
+ IntNative i;
+ struct MY_STAT statBuf;
+
+ i = MY_STAT ( name, &statBuf );
+ if (i != 0) return True;
+ if (MY_S_IFREG(statBuf.st_mode)) return False;
+ return True;
+}
+
/*---------------------------------------------*/
void copyDatePermissionsAndOwner ( Char *srcName, Char *dstName )
@@ -1002,7 +1013,7 @@
progName, inName );
return;
}
- if ( srcMode != SM_I2O && notAStandardFile ( inName )) {
+ if ( srcMode != SM_I2O && notARegularFile ( inName )) {
fprintf ( stderr, "%s: Input file %s is not a normal file, skipping.\n",
progName, inName );
return;

View File

@ -2,6 +2,8 @@ bin/bzip2
bin/bunzip2
bin/bzip2recover
bin/bzcat
include/bzlib.h
lib/libbz2.a
man/man1/bzip2.1
man/man1/bunzip2.1
man/man1/bzip2recover.1