From 9f365651aaacb159103c0c470510def376e15e3a Mon Sep 17 00:00:00 2001
From: Juergen Daubert <juergen.daubert@t-online.de>
Date: Fri, 13 Jan 2006 17:40:18 +0000
Subject: [PATCH] cvstrac: update to 1.2.1, subversion support added

---
 cvstrac/.footprint  |  1 +
 cvstrac/.md5sum     |  6 +++---
 cvstrac/Pkgfile     | 16 ++++++++++------
 cvstrac/README      |  9 +++++++++
 cvstrac/cvstrac_cgi | 10 +++++++++-
 cvstrac/cvstracd    | 10 ++++++++--
 6 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 cvstrac/README

diff --git a/cvstrac/.footprint b/cvstrac/.footprint
index c9c63cdf4..f4d94410f 100644
--- a/cvstrac/.footprint
+++ b/cvstrac/.footprint
@@ -4,6 +4,7 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cvstrac
+lrwxrwxrwx	root/root	usr/bin/svntrac -> cvstrac
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
 drwxr-xr-x	nobody/nobody	var/lib/cvstrac/
diff --git a/cvstrac/.md5sum b/cvstrac/.md5sum
index 147496679..7a61be8e0 100644
--- a/cvstrac/.md5sum
+++ b/cvstrac/.md5sum
@@ -1,3 +1,3 @@
-fa2235232c583af82d78107a750fbf12  cvstrac-src-1.1.5.tar.gz
-f52127de3a99689122949884795e8515  cvstrac_cgi
-d7871fa0d4a87c392579bc0066ceeb07  cvstracd
+8659529167f022a7e0df2c5a1ef30a34  cvstrac-1.2.1.tar.gz
+f1a1dd021329f06361b2580aa26b327a  cvstrac_cgi
+a8e250e0a1b070e307dbcfa66d495ebc  cvstracd
diff --git a/cvstrac/Pkgfile b/cvstrac/Pkgfile
index 806c9e715..bfa64ffc1 100644
--- a/cvstrac/Pkgfile
+++ b/cvstrac/Pkgfile
@@ -1,25 +1,29 @@
-# Description: A low-ceremony bug tracking system for CVS with integrated Wiki and CVS browser
+# Description: Bug tracking system for Subversion and CVS with integrated Wiki and repository browser
 # URL:         http://www.cvstrac.org
 # Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
 # Depends on:  sqlite, rcs
 
 name=cvstrac
-version=1.1.5
+version=1.2.1
 release=1
-source=(http://www.cvstrac.org/$name-src-$version.tar.gz \
+source=(http://www.cvstrac.org/$name-$version.tar.gz \
         cvstrac_cgi cvstracd)
 
 build () {
     cd $name-$version
-    sed -e "/^SRCDIR/s/=.*$/= \./" -e "s/-O[02]/$CFLAGS/" \
-        linux-gcc.mk > Makefile
+    
+    sed "/^SRCDIR/s/=.*$/=\./; s/-O[02]/$CFLAGS/ " linux-gcc.mk > Makefile
     make
     chmod 777 .
     su nobody -c "./cvstrac init . MyProject"
-    mkdir -p $PKG/var/lib
+    
     install -D -m 755 cvstrac $PKG/usr/bin/cvstrac
+    ln -s cvstrac $PKG/usr/bin/svntrac
+    
+    install -d $PKG/var/lib
     install -d -o nobody -g nobody $PKG/var/lib/cvstrac
     install -m 644 -o nobody -g nobody MyProject.db $PKG/var/lib/cvstrac
+    
     install -D -m 755 ../cvstrac_cgi $PKG/var/www/cgi-bin/cvstrac.cgi
     install -D -m 755 ../cvstracd $PKG/etc/rc.d/cvstrac
 }
diff --git a/cvstrac/README b/cvstrac/README
new file mode 100644
index 000000000..595c68cc0
--- /dev/null
+++ b/cvstrac/README
@@ -0,0 +1,9 @@
+README for cvstrac 1.2.x
+
+As of version 1.2 cvstrac supports subversion and cvs as 
+SCM backends. Git is possible as well, but untested by me. 
+
+To use cvstrac for a subversion repository just call it as 
+/usr/bin/svntrac, which is a symlink to cvstrac. See also 
+/etc/rc.d/cvstrac and /var/www/cgi-bin/cvstrac.cgi.
+ 
\ No newline at end of file
diff --git a/cvstrac/cvstrac_cgi b/cvstrac/cvstrac_cgi
index e3435b8b6..ce2fac8ac 100644
--- a/cvstrac/cvstrac_cgi
+++ b/cvstrac/cvstrac_cgi
@@ -1,5 +1,13 @@
 #! /bin/sh
+#
+# cvstrac.cgi: CGI script for cvstrac
+#
 
-/usr/bin/cvstrac cgi /var/lib/cvstrac MyProject
+# For use with Subversion
+# SCM=svntrac
+# For use with CVS 
+SCM=cvstrac
+
+/usr/bin/$SCM cgi /var/lib/cvstrac MyProject
 
 # End of file
\ No newline at end of file
diff --git a/cvstrac/cvstracd b/cvstrac/cvstracd
index 544fbacb1..9a0a5aa89 100644
--- a/cvstrac/cvstracd
+++ b/cvstrac/cvstracd
@@ -3,6 +3,12 @@
 # /etc/rc.d/cvstrac: start/stop cvstrac http daemon
 #
 
+
+# For use with Subversion
+# SCM=svntrac
+# For use with CVS
+SCM=cvstrac
+
 USER=nobody
 PORT=8008
 DB=/var/lib/cvstrac
@@ -10,10 +16,10 @@ PROJ=MyProject
 
 case $1 in
 start)
-	/usr/bin/cvstrac chroot / $USER server $PORT $DB $PROJ &
+	/usr/bin/$SCM chroot / $USER server $PORT $DB $PROJ &
 	;;
 stop)
-	killall -q /usr/bin/cvstrac
+	killall -q /usr/bin/$SCM
 	;;
 restart)
 	$0 stop