diff options
Diffstat (limited to 'source/ap/xfsdump')
| -rwxr-xr-x | source/ap/xfsdump/xfsdump.SlackBuild | 27 | ||||
| -rw-r--r-- | source/ap/xfsdump/xfsdump.destdir.diff | 42 |
2 files changed, 43 insertions, 26 deletions
diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild index 378d46de2..f293b6a38 100755 --- a/source/ap/xfsdump/xfsdump.SlackBuild +++ b/source/ap/xfsdump/xfsdump.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.0.1 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo xfsdump-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xfsdump @@ -54,7 +63,7 @@ autoconf ./configure \ --prefix=/usr \ - --sbindir=/sbin \ + --sbindir=/usr/sbin \ --bindir=/usr/sbin \ --enable-gettext=yes \ --mandir=/usr/man \ @@ -99,6 +108,16 @@ mkdir -p $PKG/usr/doc/xfsdump-$VERSION/html cp -a *.gif *.html $PKG/usr/doc/xfsdump-$VERSION/html ) +rm -f $PKG/usr/doc/xfsdump-$VERSION/CHANGES.gz + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r doc/CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat doc/CHANGES | head -n 1000 > $DOCSDIR/CHANGES + touch -r doc/CHANGES $DOCSDIR/CHANGES +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/ap/xfsdump/xfsdump.destdir.diff b/source/ap/xfsdump/xfsdump.destdir.diff index 1772465dc..a42bb3a20 100644 --- a/source/ap/xfsdump/xfsdump.destdir.diff +++ b/source/ap/xfsdump/xfsdump.destdir.diff @@ -1,32 +1,19 @@ ---- ./include/buildmacros.orig 2007-09-10 21:01:12.000000000 -0500 -+++ ./include/buildmacros 2008-04-01 00:06:53.000000000 -0500 -@@ -27,7 +27,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh +--- ./include/builddefs.in.orig 2010-01-12 19:53:18.000000000 -0600 ++++ ./include/builddefs.in 2010-02-09 15:17:24.000000000 -0600 +@@ -32,13 +32,13 @@ + datarootdir = @datarootdir@ + top_builddir = @top_builddir@ - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images ---- ./include/builddefs.in.orig 2007-09-10 21:01:12.000000000 -0500 -+++ ./include/builddefs.in 2008-04-01 00:06:53.000000000 -0500 -@@ -30,14 +30,14 @@ - PKG_VERSION = @pkg_version@ - PKG_PLATFORM = @pkg_platform@ - PKG_DISTRIBUTION= @pkg_distribution@ --PKG_BIN_DIR = @bindir@ -PKG_SBIN_DIR = @sbindir@ --PKG_LIB_DIR = @libdir@@libdirsuffix@ --PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +-PKG_ROOT_SBIN_DIR = @root_sbindir@ +-PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@ -PKG_INC_DIR = @includedir@ -PKG_MAN_DIR = @mandir@ -PKG_DOC_DIR = @datadir@/doc/@pkg_name@ -PKG_LOCALE_DIR = @datadir@/locale -+PKG_BIN_DIR = $(DESTDIR)@bindir@ +PKG_SBIN_DIR = $(DESTDIR)@sbindir@ -+PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ -+PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ ++PKG_ROOT_SBIN_DIR = $(DESTDIR)@root_sbindir@ ++PKG_ROOT_LIB_DIR= $(DESTDIR)@root_libdir@@libdirsuffix@ +PKG_INC_DIR = $(DESTDIR)@includedir@ +PKG_MAN_DIR = $(DESTDIR)@mandir@ +PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@ @@ -34,3 +21,14 @@ CC = @cc@ AWK = @awk@ +--- ./include/buildmacros.orig 2010-01-12 19:53:18.000000000 -0600 ++++ ./include/buildmacros 2010-02-09 15:15:47.000000000 -0600 +@@ -30,7 +30,7 @@ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images |