Date: Monday, September 24, 2012 @ 20:09:23
Author: eric
Revision: 167057
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xdelta3/repos/extra-i686/PKGBUILD
(from rev 167056, xdelta3/trunk/PKGBUILD)
xdelta3/repos/extra-x86_64/PKGBUILD
(from rev 167056, xdelta3/trunk/PKGBUILD)
Deleted:
xdelta3/repos/extra-i686/PKGBUILD
xdelta3/repos/extra-i686/xdelta3-makefile.patch
xdelta3/repos/extra-x86_64/PKGBUILD
xdelta3/repos/extra-x86_64/xdelta3-makefile.patch
-------------------------------------+
extra-i686/PKGBUILD | 77 +++++++++++++---------------------
extra-i686/xdelta3-makefile.patch | 51 ----------------------
extra-x86_64/PKGBUILD | 77 +++++++++++++---------------------
extra-x86_64/xdelta3-makefile.patch | 51 ----------------------
4 files changed, 62 insertions(+), 194 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-09-25 00:08:58 UTC (rev 167056)
+++ extra-i686/PKGBUILD 2012-09-25 00:09:23 UTC (rev 167057)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <[email protected]>
-# Contributor: Eduard "bekks" Warkentin <[email protected]>
-# Contributor: Henning Garus <[email protected]>
-
-pkgname=xdelta3
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
-url="http://xdelta.org/";
-license=('GPL')
-makedepends=('python2')
-optdepends=('python2: for python modules')
-source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
- xdelta3-makefile.patch)
-md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
- 'fa5973870faf7523043c4858ab7c3bdb')
-
-build() {
- cd $srcdir/xdelta$pkgver
-
- patch -Np1 -i $srcdir/xdelta3-makefile.patch
- sed -i "/PYVER = /s/2.6/2.7/" Makefile
-
- make xdelta3
- make xdelta3module.so
-
- # for testsuite
- make xdelta3-debug
-}
-
-check() {
- cd $srcdir/xdelta$pkgver
-
- make test
-}
-
-package() {
- cd $srcdir/xdelta$pkgver
-
- install -D xdelta3 $pkgdir/usr/bin/xdelta3
- python2 ./setup.py install --root ${pkgdir}
- install -m644 {xdelta3.py,xdelta3module.so}
${pkgdir}/usr/lib/python2.7/site-packages
-}
-
Copied: xdelta3/repos/extra-i686/PKGBUILD (from rev 167056,
xdelta3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-09-25 00:09:23 UTC (rev 167057)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Allan McRae <[email protected]>
+# Contributor: Eduard "bekks" Warkentin <[email protected]>
+# Contributor: Henning Garus <[email protected]>
+
+pkgname=xdelta3
+pkgver=3.0.4
+pkgrel=1
+pkgdesc="A diff utility which works with binary files"
+arch=('i686' 'x86_64')
+url="http://xdelta.org/";
+license=('GPL')
+depends=('xz')
+source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+md5sums=('c04f7fd9da45741a0095438cfe527b89')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./xdelta3 test
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/xdelta3-makefile.patch
===================================================================
--- extra-i686/xdelta3-makefile.patch 2012-09-25 00:08:58 UTC (rev 167056)
+++ extra-i686/xdelta3-makefile.patch 2012-09-25 00:09:23 UTC (rev 167057)
@@ -1,51 +0,0 @@
-diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile
---- xdelta3.0.0-orig/Makefile 2011-01-09 18:29:06.000000000 +1000
-+++ xdelta3.0.0/Makefile 2011-12-21 11:53:13.530028738 +1000
-@@ -54,7 +54,7 @@
- WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
-
- # -arch x86_64
--CFLAGS= -Wall -Wshadow -fno-builtin
-+CFLAGS+= -Wall -Wshadow -fno-builtin
- WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
-
- # $Format: "REL=$Xdelta3Version$" $
-@@ -126,7 +126,7 @@
- $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
-
- xdelta3: $(SOURCES)
-- $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
-+ $(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \
- -DGENERIC_ENCODE_TABLES=0 \
- -DREGRESSION_TEST=1 \
- -DSECONDARY_DJW=1 \
-@@ -137,7 +137,7 @@
- -DXD3_USE_LARGEFILE64=1
-
- xdelta3-debug: $(SOURCES)
-- $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
-+ $(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \
- -DGENERIC_ENCODE_TABLES=1 \
- -DREGRESSION_TEST=1 \
- -DSECONDARY_DJW=1 \
-@@ -202,6 +202,9 @@
- xdelta3.o: $(SOURCES)
- $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
-
-+xdelta3_PIC.o: $(SOURCES)
-+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
-+
- xdelta3_wrap.o: xdelta3_wrap.c
- $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
- -DHAVE_CONFIG_H \
-@@ -221,8 +224,8 @@
- cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
-
- ifeq ("$(DARWIN)", "")
--xdelta3module.so: xdelta3_wrap.o xdelta3.o
-- ld -shared xdelta3.o xdelta3_wrap.o \
-+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
-+ cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
- -o xdelta3module.so \
- /usr/lib/libpython$(PYVER).so \
- -lc
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-09-25 00:08:58 UTC (rev 167056)
+++ extra-x86_64/PKGBUILD 2012-09-25 00:09:23 UTC (rev 167057)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <[email protected]>
-# Contributor: Eduard "bekks" Warkentin <[email protected]>
-# Contributor: Henning Garus <[email protected]>
-
-pkgname=xdelta3
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64')
-url="http://xdelta.org/";
-license=('GPL')
-makedepends=('python2')
-optdepends=('python2: for python modules')
-source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
- xdelta3-makefile.patch)
-md5sums=('5fe038be3a266d2a7913e10d1cec6d88'
- 'fa5973870faf7523043c4858ab7c3bdb')
-
-build() {
- cd $srcdir/xdelta$pkgver
-
- patch -Np1 -i $srcdir/xdelta3-makefile.patch
- sed -i "/PYVER = /s/2.6/2.7/" Makefile
-
- make xdelta3
- make xdelta3module.so
-
- # for testsuite
- make xdelta3-debug
-}
-
-check() {
- cd $srcdir/xdelta$pkgver
-
- make test
-}
-
-package() {
- cd $srcdir/xdelta$pkgver
-
- install -D xdelta3 $pkgdir/usr/bin/xdelta3
- python2 ./setup.py install --root ${pkgdir}
- install -m644 {xdelta3.py,xdelta3module.so}
${pkgdir}/usr/lib/python2.7/site-packages
-}
-
Copied: xdelta3/repos/extra-x86_64/PKGBUILD (from rev 167056,
xdelta3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-09-25 00:09:23 UTC (rev 167057)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Allan McRae <[email protected]>
+# Contributor: Eduard "bekks" Warkentin <[email protected]>
+# Contributor: Henning Garus <[email protected]>
+
+pkgname=xdelta3
+pkgver=3.0.4
+pkgrel=1
+pkgdesc="A diff utility which works with binary files"
+arch=('i686' 'x86_64')
+url="http://xdelta.org/";
+license=('GPL')
+depends=('xz')
+source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+md5sums=('c04f7fd9da45741a0095438cfe527b89')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./xdelta3 test
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/xdelta3-makefile.patch
===================================================================
--- extra-x86_64/xdelta3-makefile.patch 2012-09-25 00:08:58 UTC (rev 167056)
+++ extra-x86_64/xdelta3-makefile.patch 2012-09-25 00:09:23 UTC (rev 167057)
@@ -1,51 +0,0 @@
-diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile
---- xdelta3.0.0-orig/Makefile 2011-01-09 18:29:06.000000000 +1000
-+++ xdelta3.0.0/Makefile 2011-12-21 11:53:13.530028738 +1000
-@@ -54,7 +54,7 @@
- WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
-
- # -arch x86_64
--CFLAGS= -Wall -Wshadow -fno-builtin
-+CFLAGS+= -Wall -Wshadow -fno-builtin
- WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
-
- # $Format: "REL=$Xdelta3Version$" $
-@@ -126,7 +126,7 @@
- $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
-
- xdelta3: $(SOURCES)
-- $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
-+ $(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \
- -DGENERIC_ENCODE_TABLES=0 \
- -DREGRESSION_TEST=1 \
- -DSECONDARY_DJW=1 \
-@@ -137,7 +137,7 @@
- -DXD3_USE_LARGEFILE64=1
-
- xdelta3-debug: $(SOURCES)
-- $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
-+ $(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \
- -DGENERIC_ENCODE_TABLES=1 \
- -DREGRESSION_TEST=1 \
- -DSECONDARY_DJW=1 \
-@@ -202,6 +202,9 @@
- xdelta3.o: $(SOURCES)
- $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
-
-+xdelta3_PIC.o: $(SOURCES)
-+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
-+
- xdelta3_wrap.o: xdelta3_wrap.c
- $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
- -DHAVE_CONFIG_H \
-@@ -221,8 +224,8 @@
- cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
-
- ifeq ("$(DARWIN)", "")
--xdelta3module.so: xdelta3_wrap.o xdelta3.o
-- ld -shared xdelta3.o xdelta3_wrap.o \
-+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
-+ cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
- -o xdelta3module.so \
- /usr/lib/libpython$(PYVER).so \
- -lc
