testing/drupal7: upgrade to 7.37 and move config to sysconfig

1 files changed, 33 insertions, 11 deletions

diff --git a/testing/drupal7/APKBUILD b/testing/drupal7/APKBUILD
index 19b533db26..297780e838 100644
--- a/testing/drupal7/APKBUILD
+++ b/testing/drupal7/APKBUILD
@@ -1,18 +1,18 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=drupal7
-pkgver=7.36
+pkgver=7.37
 pkgrel=0
 pkgdesc="An open source content management platform"
 url="https://www.drupal.org/"
 arch="noarch"
 license="GPL"
 depends="php-fpm php-xml php-json php-gd php-ftp php-posix php-curl php-zlib
-	php-dom php-ctype"
+	php-dom php-ctype php-sockets"
 depends_dev=""
 makedepends="$depends_dev"
 install=""
-subpackages=""
+subpackages="$pkgname-doc"
 pkggroups="www-data"
 source="http://ftp.drupal.org/files/projects/drupal-$pkgver.tar.gz"
 
@@ -35,16 +35,38 @@ build() {
 package() {
 	cd "$_builddir"
 	mkdir -p "$pkgdir"/var/lib/$pkgname \
-		"$pkgdir"/usr/share/webapps/$pkgname/
-	mv sites "$pkgdir"/var/lib/$pkgname/
-	mv * "$pkgdir"/usr/share/webapps/$pkgname/
+		"$pkgdir"/usr/share/webapps/$pkgname/ \
+		"$pkgdir"/etc/$pkgname/default \
+		"$pkgdir"/usr/share/doc/"$pkgname" || return 1
+	# move drupals sites directory where all module/themes/libaries reside
+	mv sites "$pkgdir"/var/lib/$pkgname/ || return 1
+	mkdir -p "$pkgdir"/var/lib/$pkgname/sites/default/files || return 1
+	# move drupals default config to sysconfig dir.
+	# multisite setups are advanced and needs user configuration
+	mv $pkgdir/var/lib/$pkgname/sites/default/default.settings.php \
+		"$pkgdir"/etc/$pkgname/default/ || return 1
+	ln -s /etc/"$pkgname"/default/settings.php \
+		$pkgdir/var/lib/$pkgname/sites/default/settings.php || return 1
+        mv $pkgdir/var/lib/$pkgname/sites/example.sites.php \
+		"$pkgdir"/etc/$pkgname/  || return 1
+	ln -sf /etc/"$pkgname"/sites.php \
+		$pkgdir/var/lib/$pkgname/sites/sites.php || return 1
+	# move uneeded txt files to doc package
+	for file in *.txt; do
+		[ "$file" != "robots.txt" ] && mv $file \
+			"$pkgdir"/usr/share/doc/"$pkgname"/
+	done
+	# make drupal a webapp
+	mv * "$pkgdir"/usr/share/webapps/$pkgname/ || return 1
 	ln -sf /var/lib/$pkgname/sites \
 		"$pkgdir"/usr/share/webapps/$pkgname/sites || return 1
-	install -dm2775 \
+	# make sure the webserver can access/write to needed files/directories
+	chgrp -R www-data "$pkgdir"/var/lib/$pkgname \
+		"$pkgdir"/etc/$pkgname || return 1
+	chmod g+w "$pkgdir"/var/lib/$pkgname/sites/all/* \
 		"$pkgdir"/var/lib/$pkgname/sites/default/files || return 1
-	chgrp -R www-data -R "$pkgdir"/var/lib/$pkgname || return 1
 }
 
-md5sums="98e1f62c11a5dc5f9481935eefc814c5  drupal-7.36.tar.gz"
-sha256sums="72761e3e206e8081e29bea819a3f2cd0886f93a6ef9b2cdfa59a077f2e955391  drupal-7.36.tar.gz"
-sha512sums="7991ecad4a073e81a40e75ad3309e85b996f673d38a0d0c286faa7717ca7dc7347c3ec8ab9dd3cdcaed3a195d951531d1c62c1c7b2ea3812fbf0727926f5dcbc  drupal-7.36.tar.gz"
+md5sums="3a70696c87b786365f2c6c3aeb895d8a  drupal-7.37.tar.gz"
+sha256sums="652e051faeec46d2c3e327758739e488bd77ef33ff94a48fb292e244df2a8f70  drupal-7.37.tar.gz"
+sha512sums="ffc4c4f4371accc0d552208b8dd4c1145c82a29778a72ca6ead099b5a22874455825d84ff3bee60723404b7cb7450737898f229f42621f7fffe84b726d323195  drupal-7.37.tar.gz"