OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jul-2008 14:47:11
Branch: HEAD Handle: 2008071213471100
Modified files:
openpkg-src/xdelta xdelta.patch xdelta.spec
Log:
try to get building under FreeBSD/amd64 7.0
Summary:
Revision Changes Path
1.3 +28 -16 openpkg-src/xdelta/xdelta.patch
1.50 +3 -10 openpkg-src/xdelta/xdelta.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xdelta/xdelta.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xdelta.patch
--- openpkg-src/xdelta/xdelta.patch 11 Jun 2007 16:22:22 -0000 1.2
+++ openpkg-src/xdelta/xdelta.patch 12 Jul 2008 12:47:11 -0000 1.3
@@ -1,18 +1,6 @@
-Index: xdmain.c
---- xdmain.c.orig 2001-09-24 08:59:18 +0200
-+++ xdmain.c 2005-09-23 14:43:23 +0200
-@@ -64,7 +64,7 @@
-
- #include "xdelta.h"
-
--extern HandleFuncTable xd_handle_table;
-+static HandleFuncTable xd_handle_table;
-
- #define XD_PAGE_SIZE (1<<20)
-
-Index: xdelta.m4
---- xdelta.m4.orig 2001-06-12 05:16:37 +0200
-+++ xdelta.m4 2007-06-11 17:54:00 +0200
+Index: xdelta-1.1.3/xdelta.m4
+--- xdelta-1.1.3/xdelta.m4.orig 2001-06-12 05:16:37 +0200
++++ xdelta-1.1.3/xdelta.m4 2008-07-12 14:42:21 +0200
@@ -4,7 +4,7 @@
dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule"
or
@@ -22,4 +10,28 @@
[dnl
dnl Get the cflags and libraries from the xdelta-config script
dnl
-
+Index: xdelta-1.1.3/xdmain.c
+--- xdelta-1.1.3/xdmain.c.orig 2001-09-24 08:59:18 +0200
++++ xdelta-1.1.3/xdmain.c 2008-07-12 14:42:21 +0200
+@@ -64,7 +64,7 @@
+
+ #include "xdelta.h"
+
+-extern HandleFuncTable xd_handle_table;
++static HandleFuncTable xd_handle_table;
+
+ #define XD_PAGE_SIZE (1<<20)
+
+Index: xdelta30r/xdelta3.h
+--- xdelta30r/xdelta3.h.orig 2007-10-10 11:24:37 +0200
++++ xdelta30r/xdelta3.h 2008-07-12 14:43:21 +0200
+@@ -91,7 +91,9 @@
+ typedef u_int32_t uint32_t;
+ #endif
+
++#ifndef __FreeBSD__
+ typedef long long unsigned int uint64_t;
++#endif
+
+ #else
+ #define WIN32_LEAN_AND_MEAN
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xdelta/xdelta.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 xdelta.spec
--- openpkg-src/xdelta/xdelta.spec 11 Apr 2008 06:23:39 -0000 1.49
+++ openpkg-src/xdelta/xdelta.spec 12 Jul 2008 12:47:11 -0000 1.50
@@ -36,7 +36,7 @@
Group: Patching
License: GPL
Version: %{V_v1}
-Release: 20080411
+Release: 20080712
# package options
%option with_v3 yes
@@ -73,11 +73,9 @@
%prep
%setup -q -c
- %patch -p0 -d xdelta-%{V_v1}
- %{l_prefix}/bin/config install xdelta-%{V_v1}/
-%if "%{with_v3}" == "yes"
%setup -q -D -T -a 1
-%endif
+ %patch -p0
+ %{l_prefix}/bin/config install xdelta-%{V_v1}/
%build
( cd xdelta-%{V_v1}
@@ -93,11 +91,6 @@
%if "%{with_v3}" == "yes"
( cd xdelta%{V_v3}
%{l_shtool} subst \
- -e 's;ulong;unsigned long;g' \
- -e 's;EBADR;EBADF;g' \
- -e 's;trunc;my_trunc;g' \
- *.[ch]
- %{l_shtool} subst \
-e 's;gcc;%{l_cc};g' \
Makefile
%{l_make} %{l_mflags} xdelta3-everything xdelta3-all.o
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
