From ec80bb58c5a244cbf1d279d17c2c58ebaa4d87e7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 May 2013 16:16:48 +0200
Subject: [PATCH] cups: cross build support.

---
 .../cups/patches/cups-native-manhtml.patch    | 11 +++++++++
 srcpkgs/cups/template                         | 24 +++++++++----------
 2 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/cups/patches/cups-native-manhtml.patch

diff --git a/srcpkgs/cups/patches/cups-native-manhtml.patch b/srcpkgs/cups/patches/cups-native-manhtml.patch
new file mode 100644
index 00000000000..a63199f1e15
--- /dev/null
+++ b/srcpkgs/cups/patches/cups-native-manhtml.patch
@@ -0,0 +1,11 @@
+--- cups-1.6.1/man/Makefile.orig	2013-05-06 16:12:40.176012866 +0200
++++ cups-1.6.1/man/Makefile	2013-05-06 16:13:12.895184815 +0200
+@@ -232,7 +232,7 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
+ 	done
+ 
+ mantohtml:	mantohtml.o
+-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o
++	cc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
+ 
+ 
+ #
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index e3243fb7df8..22f0ca44912 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,12 +1,8 @@
 # Template file for 'cups'
 pkgname=cups
 version=1.6.1
-revision=7
+revision=8
 patch_args="-Np1"
-makedepends="automake pkg-config acl-devel libjpeg-turbo-devel
- libpng-devel>=1.5.10 tiff-devel openssl-devel pam-devel mit-krb5-devel
- poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel>=3.1.5
- poppler-utils"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.cups.org/"
@@ -14,6 +10,11 @@ license="GPL-2"
 distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
 checksum=5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790
 
+hostmakedepends="automake pkg-config poppler-utils"
+makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel
+ openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel
+ systemd-devel gnutls-devel>=3.1.5"
+
 pre_configure() {
 	aclocal -I config-scripts
 	autoconf -I config-scripts
@@ -32,6 +33,10 @@ do_configure() {
 }
 
 do_build() {
+	# Do not run genstrings binary in cross builds.
+	if [ "$CROSS_BUILD" ]; then
+		sed -e '/.\/genstrings.*/d' -i ppdc/Makefile
+	fi
 	make ${makejobs}
 }
 
@@ -105,13 +110,6 @@ cups_package() {
 		/etc/cups/ssl 		0700 root lp"
 	depends="libcups>=${version}_${revision} cups-filters bc"
 	pkg_install() {
-		vmove etc/cups/classes.conf
-		vmove etc/cups/snmp.conf
-		vmove etc/cups/subscriptions.conf
-		vmove etc/cups/cupsd.conf
-		vmove etc/cups/printers.conf
-		vmove etc/pam.d/cups
-		vmove etc/cups/cupsd.conf.default
-		vmove usr
+		vmove all
 	}
 }