r14539

2 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 717f480f9e97..29055fc30884 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 28 08:28:20 UTC 2015
+# Wed Feb 10 11:03:10 UTC 2016
 pkgbase = squirrelmail-dev-svn
 	pkgdesc = Webmail for Nuts! (Development version Subversion source)
-	pkgver = 14537
+	pkgver = 14539
 	pkgrel = 1
 	url = http://www.squirrelmail.org
 	install = squirrelmail-dev-svn.install
@@ -17,8 +17,8 @@ pkgbase = squirrelmail-dev-svn
 	options = !strip
 	backup = srv/http/squirrelmail/.htaccess
 	backup = srv/http/squirrelmail/config/config.php
-	source = http://sourceforge.net/code-snapshots/svn/s/sq/squirrelmail/code/squirrelmail-code-14537-trunk.zip
-	sha512sums = a920475a0fdd6f49b67f68175cd5b3752193e0f251f2369519be53d7a58f86c3224fd14db3afb2af44bfc7e4cbe9f8a9140b045b70e05456bf69f9b5f0a92d1a
+	source = squirrelmail::svn+http://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail#revision=14539
+	sha512sums = SKIP
 
 pkgname = squirrelmail-dev-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index b9ed6d926a4f..4c523ba503f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # based on original squirrelmail package by darose
 
 pkgname=squirrelmail-dev-svn
-pkgver=14537
+pkgver=14539
 pkgrel=1
+_svnmod='squirrelmail'
 pkgdesc='Webmail for Nuts! (Development version Subversion source)'
 arch=('any')
 license=('GPL')
@@ -12,16 +13,23 @@ depends=('php' 'perl' 'imap-server')
 makedepends=('subversion')
 conflicts=('squirrelmail')
 provides=('squirrelmail=1.5.2')
-source=("http://sourceforge.net/code-snapshots/svn/s/sq/squirrelmail/code/squirrelmail-code-${pkgver}-trunk.zip")
-sha512sums=('a920475a0fdd6f49b67f68175cd5b3752193e0f251f2369519be53d7a58f86c3224fd14db3afb2af44bfc7e4cbe9f8a9140b045b70e05456bf69f9b5f0a92d1a')
+source=("squirrelmail::svn+http://svn.code.sf.net/p/squirrelmail/code/trunk/${_svnmod}#revision=${pkgver}")
+sha512sums=('SKIP')
 backup=(srv/http/squirrelmail/.htaccess srv/http/squirrelmail/config/config.php)
 install=${pkgname}.install
 options=(!strip)
 
-prepare() {
-	cd ${srcdir}
+pkgver() {
+	cd "$srcdir"/${_svnmod}
+	local ver=$(svnversion)
+	printf "r%s" "${ver//[[:alpha:]]}"
+}
 
-	ln -sf "squirrelmail-code-${pkgver}-trunk/squirrelmail" squirrelmail-build
+prepare() {
+	if [ -d ${_svnmod}-build ]; then
+		rm -Rf ${_svnmod}-build
+	fi
+	svn --force export ${_svnmod} ${_svnmod}-build
 }
 
 package() {
@@ -30,9 +38,6 @@ package() {
 	cd "${pkgdir}"/srv/http/squirrelmail
 	cp -a "${srcdir}"/squirrelmail-build/* .
 
-	# remove CVS dirs
-	find "${pkgdir}" -type d -name CVS -exec rm -rf {} \;
-
 	# customize config (data and attachments in /var/lib/squirrelmail)
 	cd config
 	cp -p config_default.php config.php