From acb674203119ecea213ea37ac627a5813de71a00 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Fri, 9 Jan 2009 19:04:37 +1100 Subject: [PATCH] distcc: 2.18.3 -> 3.1 --- distcc/.footprint | 3 ++ distcc/.md5sum | 3 +- distcc/Pkgfile | 21 ++++---- distcc/distcc-2.18.3-install.patch | 86 ------------------------------ 4 files changed, 16 insertions(+), 97 deletions(-) delete mode 100644 distcc/distcc-2.18.3-install.patch diff --git a/distcc/.footprint b/distcc/.footprint index bacbcf483..df9765968 100644 --- a/distcc/.footprint +++ b/distcc/.footprint @@ -5,6 +5,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/distcc -rwxr-xr-x root/root usr/bin/distccmon-text +-rwxr-xr-x root/root usr/bin/lsdistcc drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/distcc/ lrwxrwxrwx root/root usr/lib/distcc/c++ -> ../../bin/distcc @@ -16,5 +17,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/distcc.1.gz -rw-r--r-- root/root usr/man/man1/distccd.1.gz -rw-r--r-- root/root usr/man/man1/distccmon-text.1.gz +-rw-r--r-- root/root usr/man/man1/include_server.1.gz +-rw-r--r-- root/root usr/man/man1/pump.1.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/distccd diff --git a/distcc/.md5sum b/distcc/.md5sum index 7e6e7bec3..dfa518cbd 100644 --- a/distcc/.md5sum +++ b/distcc/.md5sum @@ -1,3 +1,2 @@ -7fc3c82e4d6f4d19c470bcb34e7bfec1 distcc-2.18.3-install.patch -0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 +a1a9d3853df7133669fffec2a9aab9f3 distcc-3.1.tar.bz2 0c86f4c2004a4d5fdc1a1ac19978bb27 distccd diff --git a/distcc/Pkgfile b/distcc/Pkgfile index 4a7b57ff0..15eeb40ab 100644 --- a/distcc/Pkgfile +++ b/distcc/Pkgfile @@ -1,18 +1,17 @@ # Description: A tool to distribute compilations. -# URL: http://distcc.samba.org/ +# URL: http://distcc.org/ # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: Johannes Winkelmann, jw at tks6 dot net # Depends on: popt name=distcc -version=2.18.3 -release=6 -source=(http://distcc.samba.org/ftp/distcc/distcc-$version.tar.bz2 \ - distcc-$version-install.patch distccd) +version=3.1 +release=1 +source=(http://distcc.googlecode.com/files/$name-$version.tar.bz2 + distccd) build() { - cd distcc-$version - patch -p 1 -i $SRC/distcc-$version-install.patch + cd $name-$version ./configure \ --prefix=/usr \ @@ -22,7 +21,12 @@ build() { make make DESTDIR=$PKG install-man install-programs - install -m 0755 -D ../distccd $PKG/etc/rc.d/distccd + + # distccd should be in sbin + install -d $PKG/usr/sbin + mv $PKG/usr/bin/distccd $PKG/usr/sbin/distccd + + install -m 0755 -D $SRC/distccd $PKG/etc/rc.d/distccd install -d $PKG/usr/lib/distcc cd $PKG/usr/lib/distcc @@ -31,4 +35,3 @@ build() { done cd - } - diff --git a/distcc/distcc-2.18.3-install.patch b/distcc/distcc-2.18.3-install.patch deleted file mode 100644 index c425089dd..000000000 --- a/distcc/distcc-2.18.3-install.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -pruN distcc-2.18.3.orig/configure distcc-2.18.3/configure ---- distcc-2.18.3.orig/configure 2008-05-18 01:45:48.738143672 +1000 -+++ distcc-2.18.3/configure 2008-05-18 01:46:11.810142374 +1000 -@@ -342,9 +342,9 @@ bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' - datadir='${prefix}/share' --sysconfdir='${prefix}/etc' -+sysconfdir='/etc' - sharedstatedir='${prefix}/com' --localstatedir='${prefix}/var' -+localstatedir='/var' - libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' -diff -pruN distcc-2.18.3.orig/Makefile.in distcc-2.18.3/Makefile.in ---- distcc-2.18.3.orig/Makefile.in 2008-05-18 01:45:48.736140909 +1000 -+++ distcc-2.18.3/Makefile.in 2008-05-18 01:47:29.487145051 +1000 -@@ -289,10 +289,12 @@ popt_EXTRA = popt/README.popt popt/.stam - - bin_PROGRAMS = \ - distcc@EXEEXT@ \ -- distccd@EXEEXT@ \ - distccmon-text@EXEEXT@ \ - @GNOME_BIN@ - -+sbin_PROGRAMS = \ -+ distccd@EXEEXT@ -+ - check_PROGRAMS = \ - h_argvtostr@EXEEXT@ \ - h_exten@EXEEXT@ \ -@@ -322,7 +324,7 @@ check_PROGRAMS = \ - - # We don't build the web pages by default, because many people will - # not have the tools to do it. Just use all-web if you want it. --all: $(bin_PROGRAMS) -+all: $(bin_PROGRAMS) $(sbin_PROGRAMS) - - all-web: all-latte - all-latte: $(latte_HTML) -@@ -432,7 +434,7 @@ man/distccmon_text_1.html: man/distccmon - ###################################################################### - ## CHECK targets - --check_programs: $(check_PROGRAMS) $(bin_PROGRAMS) -+check_programs: $(check_PROGRAMS) $(bin_PROGRAMS) $(sbin_PROGRAMS) - - # WARNING: This resets the path to avoid any confusion caused by - # having distcc masquerades already on the path. If you have gcc -@@ -440,7 +442,7 @@ check_programs: $(check_PROGRAMS) $(bin_ - maintainer-check: check_programs - if test x$(PYTHON) != x; then \ - $(PYTHON) -c 'import sys; print sys.version'; \ -- PATH=`pwd`:/usr/local/bin:/bin:/usr/bin $(PYTHON) $(srcdir)/test/testdistcc.py; \ -+ PATH=`pwd`:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin $(PYTHON) $(srcdir)/test/testdistcc.py; \ - else echo "WARNING: python not found; tests skipped"; \ - fi - -@@ -481,7 +483,7 @@ benchmark: - # Also clean binaries which are optionally built - clean: clean-autoconf clean-lzo - rm -f src/*.o popt/*.o -- rm -f $(check_PROGRAMS) $(bin_PROGRAMS) -+ rm -f $(check_PROGRAMS) $(bin_PROGRAMS) $(sbin_PROGRAMS) - rm -f distccmon-gnome - rm -rf testtmp - -@@ -558,11 +560,15 @@ showpaths: - - install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@ - --install-programs: $(bin_PROGRAMS) -+install-programs: $(bin_PROGRAMS) $(sbin_PROGRAMS) - $(mkinstalldirs) $(DESTDIR)$(bindir) -- for p in $^; do \ -+ for p in $(bin_PROGRAMS); do \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir) || exit 1; \ - done -+ $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ for p in $(sbin_PROGRAMS); do \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir) || exit 1; \ -+ done - - install-man: $(man1_MEN) - $(mkinstalldirs) $(DESTDIR)$(man1dir)