Fix build on -CURRENT.

Reported by:	pkg-fallout
This commit is contained in:
Roman Bogorodskiy 2013-10-13 11:34:11 +00:00
parent 5c1760757a
commit 306b2e73a6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=330221
6 changed files with 56 additions and 14 deletions

View file

@ -1,14 +1,15 @@
--- bzip2.cpp.orig 2007-03-25 04:59:24.000000000 +0600
+++ bzip2.cpp 2008-03-09 23:37:35.000000000 +0500
@@ -19,6 +19,7 @@
--- bzip2.cpp.orig 2007-03-25 01:59:24.000000000 +0300
+++ bzip2.cpp 2013-10-06 17:12:16.000000000 +0400
@@ -19,6 +19,8 @@
#include "system.h"
#include "tmpstore.h"
#include "bzip2.h"
+#include <stdio.h>
+#include <stdlib.h>
char *bzip2_compressor_name[MAX_BZIP2_COMPRESSORS] = {"0.9.0c", "1.0.2", "1.0.3", "1.0.4"};
char *bzip2_name[MAX_BZIP2_COMPRESSORS] = {NULL, NULL, NULL, NULL};
@@ -31,14 +32,12 @@
@@ -31,14 +33,12 @@
system(command.c_str());
FILE * fp;
@ -25,7 +26,7 @@
// printf("Retrieved line of length %zu :\n", read);
// printf("%s", line);
char *v = strstr(line, "Version");
@@ -56,8 +55,8 @@
@@ -56,8 +56,8 @@
}
fname = line;
}

View file

@ -1,5 +1,14 @@
--- deltup.cpp.orig 2007-07-13 09:22:20.000000000 +0600
+++ deltup.cpp 2008-03-10 14:03:08.000000000 +0500
--- deltup.cpp.orig 2007-07-13 07:22:20.000000000 +0400
+++ deltup.cpp 2013-10-06 17:15:15.000000000 +0400
@@ -16,7 +16,7 @@
//#include <sys/wait.h>
//#include <unistd.h>
//#include <sys/signal.h>
-//#include <stdlib.h>
+#include <stdlib.h>
//#include <string.h>
//#include <stdio.h>
//#include <stdarg.h>
@@ -32,6 +32,7 @@
#include "filetypes.h"
#include "system.h"
@ -83,7 +92,7 @@
doneTmpFile(gzip_temp);
} else if (file2.type==BZIP2) {
@@ -365,7 +375,10 @@
bzip2_name[i]);
bzip2_name[i]);
} else fprintf(stderr, "Error: Deltup cannot find the proper bzip2 to rebuild the package\n");
break;
- case GZIP: gzip_without_header(f.uname, finalName, c); break;

View file

@ -0,0 +1,10 @@
--- file.cpp.orig 2013-10-06 17:12:46.000000000 +0400
+++ file.cpp 2013-10-06 17:13:27.000000000 +0400
@@ -12,6 +12,7 @@
* Author: John Whitney <jjw@deltup.org>
*/
+#include <stdlib.h>
#include <zlib.h>
#include <bzlib.h>
#include <string>

View file

@ -1,6 +1,6 @@
--- ./gzip.cpp.orig 2008-04-06 15:43:16.000000000 +0300
+++ ./gzip.cpp 2008-04-06 15:43:48.000000000 +0300
@@ -0,0 +1,63 @@
--- gzip.cpp.orig 2013-10-06 17:11:38.000000000 +0400
+++ gzip.cpp 2013-10-06 17:12:35.000000000 +0400
@@ -0,0 +1,64 @@
+/* Copyright (C) 2007 John Whitney
+ *
+ * This program is free software; you can redistribute it and/or modify
@ -23,6 +23,7 @@
+#include "tmpstore.h"
+#include "gzip.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+int gzip_found = 0;
+char *gzip_name = NULL;

View file

@ -1,6 +1,16 @@
--- system.cpp.orig 2007-03-25 04:45:52.000000000 +0600
+++ system.cpp 2008-03-08 22:51:00.000000000 +0500
@@ -19,7 +19,7 @@
--- system.cpp.orig 2007-03-25 01:45:52.000000000 +0300
+++ system.cpp 2013-10-06 17:14:02.000000000 +0400
@@ -11,7 +11,8 @@
*
* Author: John Whitney <jjw@deltup.org>
*/
-
+
+#include <stdlib.h>
#include <sys/signal.h>
#include <string>
#include <vector>
@@ -19,7 +20,7 @@
using namespace std;
#include "file.h"
#include "bpatch.h"

View file

@ -0,0 +1,11 @@
--- tmpstore.cpp.orig 2013-10-06 17:14:20.000000000 +0400
+++ tmpstore.cpp 2013-10-06 17:15:03.000000000 +0400
@@ -12,6 +12,8 @@
* Author: John Whitney <jjw@deltup.org>
*/
+#include <stdlib.h>
+#include <unistd.h>
#include <signal.h>
#include <string>
#include <vector>