distcc: include pump mode and server

2 files changed, 65 insertions, 4 deletions

diff --git a/distcc/.footprint b/distcc/.footprint
index df9765968..fb5835d8a 100644
--- a/distcc/.footprint
+++ b/distcc/.footprint
@@ -6,12 +6,67 @@ 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
+-rwxr-xr-x	root/root	usr/bin/pump
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/distcc/
 lrwxrwxrwx	root/root	usr/lib/distcc/c++ -> ../../bin/distcc
 lrwxrwxrwx	root/root	usr/lib/distcc/cc -> ../../bin/distcc
+lrwxrwxrwx	root/root	usr/lib/distcc/cpp -> ../../bin/distcc
 lrwxrwxrwx	root/root	usr/lib/distcc/g++ -> ../../bin/distcc
 lrwxrwxrwx	root/root	usr/lib/distcc/gcc -> ../../bin/distcc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server-3.1-py2.7.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/include_server/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/__init__.py (EMPTY)
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/basics.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/basics.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/basics_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/basics_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/c_extensions_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/c_extensions_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/cache_basics.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/cache_basics.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/compiler_defaults.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/compiler_defaults.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/compress_files.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/compress_files.pyc
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/include_server/distcc_pump_c_extensions.so
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_analyzer_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_server.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_server.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_server_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/include_server_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/macro_eval.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/macro_eval.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/macro_eval_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/macro_eval_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/mirror_path.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/mirror_path.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/mirror_path_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/mirror_path_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_command.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_command.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_command_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_command_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_file.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_file.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_file_test.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/parse_file_test.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/run.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/run.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/setup.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/setup.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/statistics.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/include_server/statistics.pyc
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/distcc.1.gz
diff --git a/distcc/Pkgfile b/distcc/Pkgfile
index 14698cdf5..3e618fa18 100644
--- a/distcc/Pkgfile
+++ b/distcc/Pkgfile
@@ -2,11 +2,11 @@
 # 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
+# Depends on: popt python
 
 name=distcc
 version=3.1
-release=2
+release=3
 source=(http://distcc.googlecode.com/files/$name-$version.tar.bz2
 	distccd) 
 
@@ -15,24 +15,30 @@ build() {
 
 	./configure \
 		--prefix=/usr \
+		--mandir=/usr/man \
 		--disable-nls \
 		--without-gnome \
 		--without-gtk \
 		--disable-Werror
 
 	make
-	make DESTDIR=$PKG install-man install-programs
+	make DESTDIR=$PKG install
 
 	# distccd should be in sbin
 	install -d $PKG/usr/sbin
 	mv $PKG/usr/bin/distccd $PKG/usr/sbin/distccd
 
+	# install service
 	install -m 0755 -D $SRC/distccd $PKG/etc/rc.d/distccd
 
+	# create the masquerade directory
 	install -d $PKG/usr/lib/distcc
 	cd $PKG/usr/lib/distcc
-	for c in cc c++ gcc g++; do
+	for c in cc c++ gcc g++ cpp; do
 		ln -s ../../bin/distcc $c
 	done
 	cd -
+
+	rm -rf $PKG/usr/share/doc $PKG/usr/etc/default $PKG/usr/etc/distcc
+	rmdir $PKG/usr/etc $PKG/usr/share
 }