From 4026bb3500fd3836b1abae978c217f9cc1233f75 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 30 Apr 2013 11:02:42 +0200
Subject: [PATCH] ghostscript: rebuild against libpng-1.6.

---
 srcpkgs/ghostscript/template | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 9fd70fa8ae..44df9554de 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.06
-revision=4
+revision=5
 short_desc="An interpreter for the PostScript language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.ghostscript.com/"
@@ -11,7 +11,7 @@ checksum=05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04
 
 disable_parallel_build=yes
 hostmakedepends="automake libtool pkg-config"
-makedepends="dbus-devel libXext-devel libXt-devel libpng-devel>=1.5.10
+makedepends="dbus-devel libXext-devel libXt-devel libpng-devel>=1.6
  fontconfig-devel jasper-devel tiff-devel lcms2-devel cups-devel"
 
 pre_configure() {
@@ -30,16 +30,18 @@ do_configure() {
 
 	# configure libijs
 	sed -i -e "s|AM_PROG_CC_STDC|AC_PROG_CC|g" ijs/configure.ac
-	cd ijs && ./autogen.sh && \
-		./configure ${CONFIGURE_SHARED_ARGS} --enable-shared \
-			--disable-static
+	cd ijs
+	./autogen.sh
+	./configure ${CONFIGURE_SHARED_ARGS} --enable-shared --disable-static
 }
 
 do_build() {
 	# build ghostscript
-	make ${makejobs} && make ${makejobs} so
+	make ${makejobs}
+	make ${makejobs} so
 	# build libijs
-	cd ijs && make ${makejobs}
+	cd ijs
+	make ${makejobs}
 }
 
 do_install() {
@@ -53,19 +55,20 @@ do_install() {
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 	
 	# install libijs
-	cd ijs && make DESTDIR=${DESTDIR} install
+	cd ijs
+	make DESTDIR=${DESTDIR} install
 }
 
 
 libgs_package() {
-	short_desc="${short_desc} -- runtime shared library"
+	short_desc+=" -- runtime shared library"
 	pkg_install() {
 		vmove "usr/lib/libgs.so*"
 	}
 }
 
 libijs_package() {
-	short_desc="${short_desc} -- IJS runtime shared library"
+	short_desc+=" -- IJS runtime shared library"
 	pkg_install() {
 		vmove "usr/lib/libijs*"
 	}
@@ -73,7 +76,7 @@ libijs_package() {
 
 ghostscript-devel_package() {
 	depends="libijs>=${version} libgs>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -85,14 +88,6 @@ ghostscript-devel_package() {
 ghostscript_package() {
 	depends="gsfonts"
 	pkg_install() {
-		vmove etc
-		vmove usr/lib/cups
-		vmove usr/lib/ghostscript
-		vmove usr/bin
-		vmove usr/share/ghostscript
-		vmove usr/share/man/de
-		vmove usr/share/man/man1
-		vmove usr/share/licenses
-		vmove usr/share/cups
+		vmove all
 	}
 }