From e12b536edfb0ca22fe157baf5051f0ee109e29bd Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sat, 9 Nov 2013 23:22:05 +0100 Subject: [PATCH] diffutils: update to 3.3 --- diffutils/build.sh | 8 +++++--- diffutils/meta/ChangeLog | 4 ++++ diffutils/meta/pkgdef | 2 ++ diffutils/src/diffutils-3.3-fix-locale-install.patch | 12 ++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 diffutils/meta/ChangeLog create mode 100644 diffutils/src/diffutils-3.3-fix-locale-install.patch diff --git a/diffutils/build.sh b/diffutils/build.sh index 9af0f2f..64a1d39 100755 --- a/diffutils/build.sh +++ b/diffutils/build.sh @@ -6,11 +6,11 @@ ########################################################### # Check the following 4 variables before running the script topdir=diffutils -version=2.8.1 +version=3.3 pkgver=1 -source[0]=$topdir-$version.tar.gz +source[0]=ftp://ftp.sunet.se/pub/gnu/diffutils/$topdir-$version.tar.xz # If there are no patches, simply comment this -#patch[0]= +patch[0]=diffutils-3.3-fix-locale-install.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -18,6 +18,7 @@ source[0]=$topdir-$version.tar.gz # Global settings export CPPFLAGS="-I$prefix/include" export LDFLAGS="-L$prefix/lib -R$prefix/lib" +gnu_link cmp diff diff3 sdiff reg prep prep() @@ -41,6 +42,7 @@ reg install install() { generic_install DESTDIR + rmdir ${stagedir}${prefix}/${_libdir} doc NEWS THANKS AUTHORS COPYING } diff --git a/diffutils/meta/ChangeLog b/diffutils/meta/ChangeLog new file mode 100644 index 0000000..6ea3a46 --- /dev/null +++ b/diffutils/meta/ChangeLog @@ -0,0 +1,4 @@ +CHANGELOG +--------- +* Sat Nov 09 2013 Tom G. Christensen - 3.3-1 +- Update to 3.3 diff --git a/diffutils/meta/pkgdef b/diffutils/meta/pkgdef index 6c12054..03b29ed 100644 --- a/diffutils/meta/pkgdef +++ b/diffutils/meta/pkgdef @@ -8,5 +8,7 @@ pkgver="$pkgver" files(-,root,bin) default_docs $_bindir +$_gnudir $_infodir $_mandir +$_sharedir/locale diff --git a/diffutils/src/diffutils-3.3-fix-locale-install.patch b/diffutils/src/diffutils-3.3-fix-locale-install.patch new file mode 100644 index 0000000..1e80e7b --- /dev/null +++ b/diffutils/src/diffutils-3.3-fix-locale-install.patch @@ -0,0 +1,12 @@ +diff -up diffutils-3.3/po/Makefile.in.in.orig diffutils-3.3/po/Makefile.in.in +--- diffutils-3.3/po/Makefile.in.in.orig 2013-03-23 15:51:10.000000000 +0100 ++++ diffutils-3.3/po/Makefile.in.in 2013-10-22 20:50:20.794686000 +0200 +@@ -42,7 +42,7 @@ INSTALL_DATA = @INSTALL_DATA@ + mkinstalldirs = $(SHELL) @install_sh@ -d + install_sh = $(SHELL) @install_sh@ + MKDIR_P = @MKDIR_P@ +-mkdir_p = @mkdir_p@ ++mkdir_p = $(MKDIR_P) + + GMSGFMT_ = @GMSGFMT@ + GMSGFMT_no = @GMSGFMT@