From b2d07cf71c35790672584d9d7bef255fd5bc554c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 30 Sep 2010 21:46:54 +0200
Subject: first step to get cross-compile on MacOS X working

---
 package/cups/Makefile                  |  8 ++++----
 package/cups/patches/patch-Makedefs_in | 10 ++++++++++
 package/cups/patches/patch-Makefile    |  6 +++---
 package/cups/patches/patch-configure   | 17 +++++++++++++----
 4 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 package/cups/patches/patch-Makedefs_in

(limited to 'package/cups')

diff --git a/package/cups/Makefile b/package/cups/Makefile
index 635638767..0e48afb3a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
-PKG_VERSION:=		1.4.2
+PKG_VERSION:=		1.4.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d95e2d588e3d36e563027a963b117b1b
+PKG_MD5SUM:=		8776403ad60fea9e85eab9c04d88560d
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		zlib libpthread
@@ -22,8 +22,8 @@ $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
-CONFIGURE_ARGS+=	--with-cups-user=0 \
-			--with-cups-group=0 \
+CONFIGURE_ARGS+=	--with-cups-user=cups \
+			--with-cups-group=cups \
 			--disable-ldap \
 			--disable-gssapi \
 			--disable-pam \
diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in
new file mode 100644
index 000000000..d2ac2c771
--- /dev/null
+++ b/package/cups/patches/patch-Makedefs_in
@@ -0,0 +1,10 @@
+--- cups-1.4.4.orig/Makedefs.in	2010-04-23 20:56:34.000000000 +0200
++++ cups-1.4.4/Makedefs.in	2010-09-30 21:33:20.000000000 +0200
+@@ -258,7 +258,6 @@ DBUSDIR		=	@DBUSDIR@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+ 
+ .c.o:
diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile
index 70febbf51..d0e90589d 100644
--- a/package/cups/patches/patch-Makefile
+++ b/package/cups/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- cups-1.4.2.orig/Makefile	2009-07-01 06:01:31.000000000 +0200
-+++ cups-1.4.2/Makefile	2009-11-19 22:04:36.000000000 +0100
-@@ -27,10 +27,10 @@ include Makedefs
+--- cups-1.4.4.orig/Makefile	2010-04-23 20:56:34.000000000 +0200
++++ cups-1.4.4/Makefile	2010-09-29 22:55:01.000000000 +0200
+@@ -20,10 +20,10 @@ include Makedefs
  # Directories to make...
  #
  
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index f23196c67..540b7e0c0 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,6 +1,15 @@
---- cups-1.4.2.orig/configure	2009-11-10 00:04:25.000000000 +0100
-+++ cups-1.4.2/configure	2010-01-07 23:11:46.635118361 +0100
-@@ -9850,8 +9850,8 @@ if test "$libdir" = "\${exec_prefix}/lib
+--- cups-1.4.4.orig/configure	2010-06-17 20:25:47.000000000 +0200
++++ cups-1.4.4/configure	2010-09-29 22:35:47.000000000 +0200
+@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-uname=`uname`
++uname=Linux
+ uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'`
+ uarch=`uname -m`
+ 
+@@ -10002,8 +10002,8 @@ if test "$libdir" = "\${exec_prefix}/lib
  			libdir="$exec_prefix/lib32"
  			;;
  		Linux*)
@@ -11,7 +20,7 @@
  			fi
  			;;
  		HP-UX*)
-@@ -10260,11 +10260,6 @@ _ACEOF
+@@ -10412,11 +10412,6 @@ _ACEOF
  
  # Server executables...
  case "$uname" in
-- 
cgit v1.2.3