Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

3 files changed, 19 insertions, 15 deletions

diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD
index 85eb45b90..cd94d428c 100644
--- a/pcr/nginx-passenger/PKGBUILD
+++ b/pcr/nginx-passenger/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=nginx-passenger
 _nginxver=1.6.2
 _passengerver=4.0.53
 pkgver=$_nginxver.passenger.$_passengerver
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 pkgdesc+=" (with Passenger module)"
 conflicts=('nginx')
@@ -39,9 +39,9 @@ source=($url/download/nginx-$_nginxver.tar.gz
         service
         logrotate)
 md5sums=('d1b55031ae6e4bce37f8776b94d8b930'
-         'ce85ed506a084112eaa015a3642007d9'
+         '385dceac05c10e59a3dab44d188353aa'
          '5dd4d09914a4403b9df778ec1d66167c'
-         '3441ce77cdd1aab6f0ab7e212698a8a7')
+         '19a26a61c8afe78defb8b4544f79a9a0')
 
 build() {
   cd "$srcdir/passenger-release-$_passengerver"
diff --git a/pcr/nginx-passenger/logrotate b/pcr/nginx-passenger/logrotate
index e0fa9ec4c..61237601f 100644
--- a/pcr/nginx-passenger/logrotate
+++ b/pcr/nginx-passenger/logrotate
@@ -1,9 +1,10 @@
 /var/log/nginx/*log {
 	missingok
 	create 640 http log
+	su http log
 	sharedscripts
 	compress
 	postrotate
-		test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid`
+		test ! -r /run/nginx.pid || kill -USR1 `cat /run/nginx.pid`
 	endscript
 }
diff --git a/pcr/pandoc-static/PKGBUILD b/pcr/pandoc-static/PKGBUILD
index c87c31842..72a440661 100644
--- a/pcr/pandoc-static/PKGBUILD
+++ b/pcr/pandoc-static/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=pandoc-static
 _pkgname=pandoc
 pkgver=1.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libraries)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -21,9 +21,9 @@ options=(strip !makeflags !distcc !emptydirs)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
 md5sums=('dd2667b233b5f97b2841ae09895c2ac2')
 
-declare -A flags
+declare -gA _flags
 _flags[pandoc]='https make-pandoc-man-pages'
-_flags[pandoc-citeproc]='small_base bibutils hexpat unicode_collation'
+_flags[pandoc_citeproc]='small_base bibutils hexpat unicode_collation'
 
 _packages=(hs-bibutils network hexpat text text-icu hsb2hs
   http-client-0.3.8.2
@@ -62,13 +62,18 @@ prepare() {
 
 build() (
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir ../build
+  mkdir -p ../build
 
   export LANG="en_US.utf8"
   export HOME="${srcdir}"
   export PATH="${srcdir}/build/usr/bin:${PATH}"
 
   while read hkpkg; do
+    if [ -d "$srcdir"/build/usr/share/doc/*/"$hkpkg" ]; then
+      msg2 'Skipping %s' "$hkpkg"
+      continue
+    fi
+
     msg2 'Building %s' "$hkpkg"
     pushd "$hkpkg" >/dev/null
     case "$hkpkg" in
@@ -83,7 +88,7 @@ build() (
         ;;
       pandoc-citeproc-*)
         cabal configure -v \
-          --flags="embed_data_files ${_flags[pandoc-citeproc]}" \
+          --flags="embed_data_files ${_flags[pandoc_citeproc]}" \
           --prefix=/usr
         cabal build
         ;;
@@ -100,11 +105,13 @@ package() {
 
   msg2 "Installing pandoc..."
   cd ${_pkgname}-${pkgver}
-  runghc Setup.hs copy --destdir="${pkgdir}/"
+  cabal copy --destdir="${pkgdir}/"
+  install -Dm644 {,"$pkgdir"/usr/share/}man/man1/pandoc.1
+  install -Dm644 {,"$pkgdir"/usr/share/}man/man5/pandoc_markdown.5
 
   msg2 "Installing pandoc-citeproc..."
   cd ../pandoc-citeproc-*
-  runghc Setup.hs copy --destdir="${pkgdir}/"
+  cabal copy --destdir="${pkgdir}/"
 
   msg2 "Installing extra executables..."
   cp -av "${srcdir}"/build/usr/bin/* "${pkgdir}"/usr/bin/
@@ -112,10 +119,6 @@ package() {
   msg2 "Removing library files..."
   rm -rfv "$pkgdir"/usr/lib
 
-  msg2 "Correctiong file permissions in /usr/share/..."
-  find "${pkgdir}"/usr/share -type f -exec chmod -v 644 -- {} +
-  find "${pkgdir}"/usr/share -type d -exec chmod -v 755 -- {} +
-
   msg2 "Installing licenses..."
   install -d                                 "${pkgdir}"/usr/share/licenses/${pkgname}
   cp -rv "${srcdir}"/build/usr/share/doc/*/* "${pkgdir}"/usr/share/licenses/${pkgname}