fix cups header dependency, need to rework cups package later, update to latest upstream

8 files changed, 39 insertions, 129 deletions

diff --git a/package/cups/Makefile b/package/cups/Makefile
index adf8dcade..0d20cd61a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -4,39 +4,55 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
-PKG_VERSION:=		1.4.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		8776403ad60fea9e85eab9c04d88560d
+PKG_VERSION:=		1.7.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		zlib libpthread
-PKG_BUILDDEP:=		zlib
+PKG_BUILDDEP:=		cups-host zlib
 PKG_URL:=		http://www.cups.org/
-PKG_SITES:=		ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
+PKG_SITES:=		http://www.cups.org/software/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
+			--disable-webif \
+			--disable-gssapi \
+			--disable-pam \
+			--disable-dbus \
+			--without-java \
+			--without-perl \
+			--without-python \
+			--without-php \
+			--disable-gnutls \
+			--disable-openssl \
+			--disable-cdsassl \
+			--disable-dbus \
+			--disable-ssl
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \
-			--disable-ldap \
+			--disable-webif \
+			--disable-tcp-wrappers \
 			--disable-gssapi \
 			--disable-pam \
-			--disable-pap \
 			--disable-dbus \
 			--without-java \
 			--without-perl \
 			--without-python \
 			--without-php \
-			--disable-slp \
 			--disable-gnutls \
 			--disable-openssl \
 			--disable-cdsassl \
@@ -50,35 +66,22 @@ else
 XAKE_FLAGS+=		OPTIM='-fPIC'
 endif
 
+cups-hostpackage:
+
 cups-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
 	${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates
 	${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/
 	rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/
-	${CP} ${WRKINST}/usr/share/doc/cups/index.html \
-		${IDIR_CUPS}/usr/share/doc/cups/
-	${CP} ${WRKINST}/usr/share/doc/cups/*.css \
-		${IDIR_CUPS}/usr/share/doc/cups/
-	${CP} ${WRKINST}/usr/share/doc/cups/images \
-		${IDIR_CUPS}/usr/share/doc/cups/
 	rm -f ${IDIR_CUPS}/usr/bin/cups-config
 	${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* \
-		${IDIR_CUPS}/usr/lib/cups/cgi-bin/
 	${CP} ${WRKINST}/usr/lib/cups/daemon/* \
 		${IDIR_CUPS}/usr/lib/cups/daemon/
-	${CP} ${WRKINST}/usr/share/cups/banners/* \
-		${IDIR_CUPS}/usr/share/cups/banners/
-	${CP} ${WRKINST}/usr/share/cups/templates/*.tmpl \
-		${IDIR_CUPS}/usr/share/cups/templates/
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in
deleted file mode 100644
index d2ac2c771..000000000
--- a/package/cups/patches/patch-Makedefs_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index d0e90589d..000000000
--- a/package/cups/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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...
- #
- 
--DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
--		notifier ppdc scheduler systemv test \
-+DIRS	=	cups filter backend berkeley cgi-bin driver locale monitor \
-+		notifier ppdc scheduler systemv \
- 		$(PHPDIR) \
--		conf data doc examples $(FONTS) templates
-+		conf data examples doc $(FONTS) templates
- 
- 
- #
diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile
deleted file mode 100644
index f3ae5c8dd..000000000
--- a/package/cups/patches/patch-conf_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- cups-1.4.2.orig/conf/Makefile	2009-09-22 23:53:31.000000000 +0200
-+++ cups-1.4.2/conf/Makefile	2009-11-19 22:02:20.000000000 +0100
-@@ -72,12 +72,12 @@ install:	all install-data install-header
- install-data:
- 	for file in $(KEEP); do \
- 		if test -r $(SERVERROOT)/$$file ; then \
--			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
-+			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
- 		else \
--			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
-+			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
- 		fi ; \
- 	done
--	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-+	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
- 	for file in $(REPLACE); do \
- 		if test -r $(DATADIR)/mime/$$file ; then \
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index 97243c0c9..19c9f6092 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,40 +1,11 @@
---- cups-1.4.4.orig/configure	2010-06-17 20:25:47.000000000 +0200
-+++ cups-1.4.4/configure	2011-07-29 16:46:45.000000000 +0200
-@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- cups-1.7.1.orig/configure	2014-01-08 17:26:27.000000000 +0100
++++ cups-1.7.1/configure	2014-01-24 18:05:03.000000000 +0100
+@@ -5792,7 +5792,7 @@ fi
  
+ case "$COMPONENTS" in
+ 	all)
+-		BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
++		BUILDDIRS="filter backend berkeley monitor notifier ppdc conf data"
+ 		;;
  
- 
--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*)
--			if test -d /usr/lib64; then
--				libdir="$exec_prefix/lib64"
-+			if test -d /usr/lib; then
-+				libdir="$exec_prefix/lib"
- 			fi
- 			;;
- 		HP-UX*)
-@@ -10978,7 +10978,7 @@ fi
- if test x$enable_debug = xyes; then
- 	OPTIM="-g"
- else
--	INSTALL_STRIP="-s"
-+	INSTALL_STRIP=""
- fi
- 
- if test x$enable_debug_printfs = xyes; then
-@@ -11199,7 +11199,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  PIEFLAGS="-pie -fPIE"
-+  PIEFLAGS=""
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
+ 	core)
diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile
deleted file mode 100644
index c045b2e14..000000000
--- a/package/cups/patches/patch-ppdc_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-1.4.4.orig/ppdc/Makefile	2010-04-23 20:56:34.000000000 +0200
-+++ cups-1.4.4/ppdc/Makefile	2010-10-03 00:51:42.000000000 +0200
-@@ -244,7 +244,7 @@ genstrings:		genstrings.o libcupsppdc.a 
- 		libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
- 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
- 	echo Generating localization strings...
--	./genstrings >sample.c
-+	#./genstrings >sample.c
- 
- 
- #
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c
deleted file mode 100644
index d9892c206..000000000
--- a/package/cups/patches/patch-scheduler_auth_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cups-1.4.2.orig/scheduler/auth.c	2009-05-27 00:01:23.000000000 +0200
-+++ cups-1.4.2/scheduler/auth.c	2009-12-30 12:30:13.000000000 +0100
-@@ -57,6 +57,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 292ae8553..e54407913 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
 PKG_BUILDDEP+=		fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host 
 PKG_BUILDDEP+=		xineramaproto-host libXinerama-host libXtst-host freetype-host
 PKG_BUILDDEP+=		alsa-lib-host libffi-host gcj-host ecj-host jikes-host 
-PKG_BUILDDEP+=		classpath-host jamvm-host ant-host openjdk7-host
+PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host
 PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc
@@ -113,7 +113,8 @@ OPENJDK_NATIVE_ENV+=	JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$
 OPENJDK_NATIVE_ENV+=	LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64
 OPENJDK_NATIVE_ENV+=	ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
 OPENJDK_NATIVE_ENV+=	BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
-OPENJDK_NATIVE_ENV+=	FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+OPENJDK_NATIVE_ENV+=	FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
+			ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ENV+=	$(OPENJDK_NATIVE_ENV)