Tobias Hintze:

package/base/subversion/config.in

@@ -1,33 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/subversion/config.in
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-if pkgcheck subversion X
-then
-	menu_begin MENU_PKG_SUBVERSION 'Subversion Options'
-		bool 'Create a subversion-static package' \
-			ROCKCFG_PKG_SUBVERSION_STATIC 1
-		if [ "$ROCKCFG_PKG_SUBVERSION_STATIC" = "1" ] ; then
-			pkgfork subversion subversion-static
-		fi
-	menu_end
-fi
-

package/base/subversion/pkgmapper.in

@@ -1,5 +0,0 @@
-
-if [ "$pkg" = subversion-static ]; then
-	pkg=subversion
-fi
-

package/base/subversion/subversion.conf

@@ -39,99 +39,75 @@ pkginstalled neon && var_append extraconfopt " " "--with-neon=$root/usr"
 # pkginstalled apache:apr && var_append extraconfopt " " "--with-apr=$root/usr"
 pkginstalled sun-jdk14 && var_append extraconfopt " " "--enable-javahl --with-jdk=`ls -d1R $root/opt/j2sdk1.4*`"
 
-if [ "$xpkg" = subversion-static ]
-then
-	# this is the subversion-static package
-	svn_static_pm()
-	{
-		for prg in svnadmin/svnadmin svnlook/svnlook svnversion/svnversion \
-			svndumpfilter/svndumpfilter svndumpfilter/svndumpfilter \
-			clients/cmdline/svn
-		do
-			xprg=$(basename $prg)
-			cp -v subversion/$prg \
-				$root/$prefix/bin/$xprg-$arch_machine-static-$ver
-			ln -sfv $xprg-$arch-static-$ver \
-				$root/$prefix/bin/$xprg-$arch-static
-		done
-	}
-
-	createdocs=0
-	makeinstopt=""
-
-	var_append extraconfopt " " "--enable-all-static"
-	hook_add postmake 3 svn_static_pm
-else
-	# all this is to build the apache server-side module
-	# and to make sure no locally included APR stuff get's installed
-	# as well as no modification to httpd.conf is done ...
-	if pkginstalled apache; then
-		apacheprefix=${ROCKCFG_PKG_APACHE_PREFIX:-opt/apache}
-		var_append extraconfopt " " "--with-apxs=/$apacheprefix/sbin/apxs \
-			--with-apr=/$apacheprefix/bin/apr-config --with-apr-util=/$apacheprefix \
-			--disable-mod-activation"
-		if [ "$ROCKCFG_PKG_APACHE_BDB" ] ; then
-			var_append extraconfopt " " \
-			  "--with-berkeley-db=/usr/include/${ROCKCFG_PKG_APACHE_BDB#b}:/usr/lib"
-		fi
+# all this is to build the apache server-side module
+# and to make sure no locally included APR stuff get's installed
+# as well as no modification to httpd.conf is done ...
+if pkginstalled apache; then
+	apacheprefix=${ROCKCFG_PKG_APACHE_PREFIX:-opt/apache}
+	var_append extraconfopt " " "--with-apxs=/$apacheprefix/sbin/apxs \
+		--with-apr=/$apacheprefix/bin/apr-config --with-apr-util=/$apacheprefix \
+		--disable-mod-activation"
+	if [ "$ROCKCFG_PKG_APACHE_BDB" ] ; then
+		var_append extraconfopt " " \
+		  "--with-berkeley-db=/usr/include/${ROCKCFG_PKG_APACHE_BDB#b}:/usr/lib"
 	fi
+fi
 
-	# build and install perl bindings
-	svn_inst_pl() {
-		make swig-pl-lib
-		cd subversion/bindings/swig/perl/native
-		perl Makefile.PL; make all
-		make -C $OLDPWD install-swig-pl-lib
-		make install; cd $OLDPWD
-	}
+# build and install perl bindings
+svn_inst_pl() {
+	make swig-pl-lib
+	cd subversion/bindings/swig/perl/native
+	perl Makefile.PL; make all
+	make -C $OLDPWD install-swig-pl-lib
+	make install; cd $OLDPWD
+}
 
-	# build and install python bindings
-	svn_inst_py() {
-		make swig-py
-		make install-swig-py
-	}
-	
-	# build and install java bindings
-	svn_inst_java() {
-		make javahl
-		make install-javahl
-	}
+# build and install python bindings
+svn_inst_py() {
+	make swig-py
+	make install-swig-py
+}
 
-	# install etc/profile.d/subversion
-	svn_inst_profile() {
-		cat > $root/etc/profile.d/subversion <<-EOF
+# build and install java bindings
+svn_inst_java() {
+	make javahl
+	make install-javahl
+}
+
+# install etc/profile.d/subversion
+svn_inst_profile() {
+	cat > $root/etc/profile.d/subversion <<-EOF
 export PYTHONPATH=\$PYTHONPATH\${PYTHONPATH:+:}/$prefix/lib/svn-python
 EOF
-	}
+}
 
-	# hotfix, without this "perl -e 'use SVN::Core'" (and others?) do not work
-	export LIBS="-lz -lssl"
+# hotfix, without this "perl -e 'use SVN::Core'" (and others?) do not work
+export LIBS="-lz -lssl"
 
-	hook_add postmake 3 "install_init svnserve $confdir/svnserve.init"
-	hook_add postmake 4 "cp -vrf tools $docdir"
+hook_add postmake 3 "install_init svnserve $confdir/svnserve.init"
+hook_add postmake 4 "cp -vrf tools $docdir"
 
-	# if swig is present build and install the perl and python bindings
-	pkginstalled swig && [ -n "$( type -p perl   )" ] && hook_add postmake 5 "svn_inst_pl"
-	pkginstalled swig && [ -n "$( type -p python )" ] && hook_add postmake 5 "svn_inst_py"
-	# if java is present, install java bindings
-	pkginstalled sun-jdk14 && hook_add postmake 5 "svn_inst_java"
+# if swig is present build and install the perl and python bindings
+pkginstalled swig && [ -n "$( type -p perl   )" ] && hook_add postmake 5 "svn_inst_pl"
+pkginstalled swig && [ -n "$( type -p python )" ] && hook_add postmake 5 "svn_inst_py"
+# if java is present, install java bindings
+pkginstalled sun-jdk14 && hook_add postmake 5 "svn_inst_java"
 
-	hook_add postmake 5 "svn_inst_profile"
+hook_add postmake 5 "svn_inst_profile"
 
-	if pkginstalled apache ; then
-		splitdesc_apache() {
-			desc_I="Apache module for subversion"
-		}
-		splitreg 50 apache ${apacheprefix}.*mod_.*so
-	fi
-	splitdesc_server() {
-		desc_I="$desc_I (server binaries)"
-	}
-	splitdesc_java() {
-		desc_I="$desc_I (java bindings)"
+if pkginstalled apache ; then
+	splitdesc_apache() {
+		desc_I="Apache module for subversion"
 	}
-	splitreg 51 server /svn[^.]\+[^th]$
-	splitreg 52 server rc\.d
-	splitreg 53 java java
+	splitreg 50 apache ${apacheprefix}.*mod_.*so
 fi
+splitdesc_server() {
+	desc_I="$desc_I (server binaries)"
+}
+splitdesc_java() {
+	desc_I="$desc_I (java bindings)"
+}
+splitreg 51 server /svn[^.]\+[^th]$
+splitreg 52 server rc\.d
+splitreg 53 java java
 

package/base/subversion/subversion.desc

@@ -27,11 +27,6 @@
 [T] system that is a compelling replacement for CVS in the open source
 [T] community. 
 
-#if xpkg == subversion-static
-[T]
-[T] This package contains the statically linked subversion tools.
-#endif
-
 [U] http://subversion.tigris.org/
 
 [A] The Subversion Crew