povray-2:3.7.0.7-1.parabola1: updating version

2 files changed, 27 insertions, 57 deletions

diff --git a/libre/povray/PKGBUILD b/libre/povray/PKGBUILD
index 79ccaf3b4..50dfdb44a 100644
--- a/libre/povray/PKGBUILD
+++ b/libre/povray/PKGBUILD
@@ -4,40 +4,40 @@
 # Contributor (Arch): tobias <tobias@archlinux.org>
 # Contributor (Arch): red_over_blue
 # Contributor (Arch): neri
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Don't build povray before 3.7 version (that ones are nonfree software)
 
 _pkgname=povray-libre
 pkgname=povray
-pkgver=3.7
-pkgrel=15.parabola1
-epoch=1
+pkgver=3.7.0.7
+_v=${pkgver%.*.*} # 3.7
+pkgrel=1.parabola1
+epoch=2
 pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
 arch=('x86_64' 'i686' 'armv7h')
 license=('AGPL3')
 url='http://povray.org/'
 depends=('libtiff' 'libpng' 'boost-libs' 'openexr')
-makedepends=('boost' 'openexr')
+makedepends=('boost' 'git' 'glu')
 conflicts=("$_pkgname")
 replaces=("$_pkgname")
-backup=("etc/povray/$pkgver/povray.conf"
-        "etc/povray/$pkgver/povray.ini")
-mksource=("$pkgname-$pkgver.zip::https://github.com/POV-Ray/$pkgname/archive/$pkgver-stable.zip")
-source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.xz"
-        'povray3.7.0_rc3-user-conf.patch')
-mksha256sums=('f30ab643ad694f32b916f183c3783e24cb4cc073bf58f2869dbffc02b603c968')
-sha256sums=('13be30ed28d47b3796de55263d0fca74edcbe990b08059c589dcc72540a179a7'
-            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
+backup=("etc/povray/$_v/povray.conf"
+        "etc/povray/$_v/povray.ini")
+mksource=($pkgname-$pkgver.tar.gz::https://github.com/POV-Ray/povray/archive/v$pkgver.tar.gz)
+source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.xz")
+mksha512sums=('ea2b50f648948df9415a7b386aa0bfd2ac5236fa7f480df655a8f7e695cf21d9712d73901f21d1ef87188223f4cb351f195641ab77d88ca66f488566ef78aaed')
+sha512sums=('90c859ba91420bc441d59ffde8ea6d8f6a7deb513a9b3dd582ba6e86336f0263ba8c1666e9a9570f9a4e6f744a54139865afa7ffaed07f848231e656b9d22cde')
 
 mksource() {
-  cd "$pkgname-$pkgver-stable"
+  cd "$pkgname-$pkgver"
 
   # remove nonfree documentation
   rm -rv doc
 }
 
 prepare() {
-  cd "$pkgname-$pkgver-stable/unix"
+  cd "$pkgname-$pkgver/unix"
 
   sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
   sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
@@ -45,32 +45,29 @@ prepare() {
 
   cd ..
   ./bootstrap
-  patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
 }
 
 build() {
-  cd "$pkgname-$pkgver-stable"
+  cd "$pkgname-$pkgver"
 
   ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
     LIBS="-lboost_system -lboost_thread" \
-    COMPILED_BY='Parabola GNU/Linux-libre'
-  make \
-    CXXFLAGS+="-std=c++03 -w -lboost_system -lboost_thread"
-  gzip -f povray.1
+    COMPILED_BY='Parabola GNU/Linux-libre' \
+    --sysconfdir=/etc \
+    --prefix=/usr
+  make CXXFLAGS+="-std=c++11 -lboost_system -lboost_thread -w"
 }
 
 package() {
-  cd "$pkgname-$pkgver-stable"
+  cd "$pkgname-$pkgver"
 
-  install -d "$pkgdir/usr/share/$pkgname-$pkgver"
-  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$pkgver"
-  chmod -R u+rwX,g+rX,o+rX "$pkgdir/usr/share/$pkgname-$pkgver" # fix permissions
+  install -d "$pkgdir/usr/share/$pkgname-$_v"
+  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$_v"
+  chmod -R u+rwX,g+rX,o+rX "$pkgdir/usr/share/$pkgname-$_v" # fix permissions
   install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
-  install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"
-  install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini"
-  install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz"
+  install -Dm644 povray.conf "$pkgdir/etc/povray/$_v/povray.conf"
+  install -Dm644 povray.ini "$pkgdir/etc/povray/$_v/povray.ini"
+  install -Dm644 povray.1 "$pkgdir/usr/share/man/man1/povray.1"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/povray/povray3.7.0_rc3-user-conf.patch b/libre/povray/povray3.7.0_rc3-user-conf.patch
deleted file mode 100644
index f20d9b506..000000000
--- a/libre/povray/povray3.7.0_rc3-user-conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- Makefile.am |   13 -------------
- 1 files changed, 0 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 76b394c..9822c52 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,19 +107,6 @@ install-data-local:
- 	for f in $$filelist ; do \
- 	  $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
- 	done
--	@echo "Creating user directories..."; \
--	for p in $(povuser) $(povconfuser) ; do \
--	  $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
--	done
--	@echo "Copying user configuration and INI files..."; \
--	for f in povray.conf povray.ini ; do \
--	  if test -f $(povconfuser)/$$f; then \
--	    echo "Creating backup of $(povconfuser)/$$f"; \
--	    mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
--	  fi; \
--	done; \
--	$(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
--	$(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
- 
- # Remove data, config, and empty folders for 'make uninstall'.
- # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).