aboutsummaryrefslogtreecommitdiff
path: root/archivers/bzip/files/patch-bzip.c
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-06-11 09:49:14 +0000
committerJohn Marino <marino@FreeBSD.org>2014-06-11 09:49:14 +0000
commite576cffda40aa643668e5d9064b774c7c66bbda7 (patch)
tree4bc94f3c6ac7c12f7f4042490796c245f9f4c84d /archivers/bzip/files/patch-bzip.c
parent8efd504cb3706f75974e7e0413bf19e4549e9bc5 (diff)
downloadports-e576cffda40aa643668e5d9064b774c7c66bbda7.tar.gz
ports-e576cffda40aa643668e5d9064b774c7c66bbda7.zip
Resurrect archivers/bzip and assign maintainer
This port was removed due not having a publically available distfile. That has been fixed per the PR with maintainership assigned to submitter. Additionally: * The patch-aa was renamed * The patch-ab and patch-ac touched the same file; they were combined and renamed * DragonFly support was added (hence the portrevision bump) * GPLv2 license was annotated * 80-column formatting was respected * PLIST sorted PR: 188939 Submitted by: Chris Hutchinson Tweaks: marino
Notes
Notes: svn path=/head/; revision=357450
Diffstat (limited to 'archivers/bzip/files/patch-bzip.c')
-rw-r--r--archivers/bzip/files/patch-bzip.c59
1 files changed, 59 insertions, 0 deletions
diff --git a/archivers/bzip/files/patch-bzip.c b/archivers/bzip/files/patch-bzip.c
new file mode 100644
index 000000000000..ea9513a90511
--- /dev/null
+++ b/archivers/bzip/files/patch-bzip.c
@@ -0,0 +1,59 @@
+--- bzip.c.orig 1996-08-30 20:35:28.000000000 +0000
++++ bzip.c
+@@ -114,9 +114,13 @@
+ --*/
+
+ #if BZ_UNIX_32
++ #include <sys/types.h>
+ #include <utime.h>
+ #include <unistd.h>
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) \
++ && !defined(__DragonFly__) /* stdlib already included above */
+ #include <malloc.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/times.h>
+
+@@ -2578,7 +2582,7 @@ void bitStreamEOF ()
+
+
+ /*---------------------------------------------*/
+-void mySignalCatcher ( IntNative *n )
++void mySignalCatcher (int n __unused)
+ {
+ fprintf ( stderr,
+ "\n%s: Control-C (or similar) caught, quitting.\n",
+@@ -2588,7 +2592,7 @@ void mySignalCatcher ( IntNative *n )
+
+
+ /*---------------------------------------------*/
+-void mySIGSEGVorSIGBUScatcher ( IntNative *n )
++void mySIGSEGVorSIGBUScatcher (int n __unused)
+ {
+ if (compressing)
+ fprintf ( stderr,
+@@ -3130,11 +3134,6 @@ IntNative main ( IntNative argc, Char *a
+ signal (SIGBUS, mySIGSEGVorSIGBUScatcher);
+ #endif
+
+- if ( ! (argc > 1 && strcmp ( "-Q", argv[1] ) == 0) )
+- fprintf ( stderr,
+- "BZIP, a block-sorting file compressor. "
+- "Version 0.21, 25-August-96.\n" );
+-
+ #if DEBUG
+ if ( ! (argc > 1 && strcmp ( "-Q", argv[1] ) == 0) )
+ fprintf ( stderr, "BZIP: *** compiled with debugging ON ***\n" );
+@@ -3205,6 +3204,12 @@ IntNative main ( IntNative argc, Char *a
+ break;
+ }
+
++ if (verbose) {
++ fprintf ( stderr,
++ "BZIP, a block-sorting file compressor. "
++ "Version 0.21, 25-August-96.\n" );
++ }
++
+ if ( opMode == OM_FILE_TO_STDOUT && numFileNames != 1) {
+ fprintf ( stderr, "%s: Option -c requires you to supply exactly one filename.\n",
+ progName );