[package] update cups to 1.4.4

[openwrt/svn-archive/archive.git] / net / cups / Makefile

diff --git a/net/cups/Makefile b/net/cups/Makefile
index 38bf50c90735b0b3a34849ef000dfe572c5203c7..1ab7769899814692ba15eb05385a9bd01a808243 100644 (file)
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -1,25 +1,22 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cups
-PKG_VERSION:=1.3.7
-PKG_RELEASE:=3
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
 PKG_SOURCE_URL:= \
        http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \
        ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \
        ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION)
-PKG_MD5SUM:=db4a45a17104f10f3ee599d88267c9e5
-
-PKG_BUILD_DEPENDS:=zlib
+PKG_MD5SUM:=8776403ad60fea9e85eab9c04d88560d
 
 TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
@@ -28,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/cups
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+zlib +libpthread +libpng +libjpeg
+  DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp
   TITLE:=Common UNIX Printing System
   URL:=http://www.cups.org/
   SUBMENU:=printing
@@ -47,13 +44,17 @@ endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
-               --with-cups-user=root \
-               --with-cups-group=root \
+               --with-cups-user="nobody" \
+               --with-cups-group="nogroup" \
                --without-perl \
                --without-python \
                --without-php \
                --enable-shared \
+               --enable-image \
                --disable-dbus \
+               --disable-dnssd \
+               --disable-launchd \
+               --disable-ldap \
                --disable-pam \
                --disable-slp \
                --disable-gnutls \
@@ -61,15 +62,13 @@ define Build/Configure
                --disable-cdsassl \
                --disable-ssl \
                --disable-gssapi \
-               --disable-slp, \
+               --disable-tiff, \
                UNAME="Linux" \
-               LIBS="-L$(STAGING_DIR)/usr/lib -lz -lpng -ljpeg" \
+               LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \
        )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                DSTROOT="$(PKG_INSTALL_DIR)" \
@@ -87,10 +86,12 @@ define Package/cups/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
        rm -f $(1)/usr/bin/cups-config
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/share/cups/templates
        $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(1)/usr/share/cups/templates/
+       $(INSTALL_DIR) $(1)/usr/share/cups/mime
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/mime/* $(1)/usr/share/cups/mime/
        $(INSTALL_DIR) $(1)/usr/share/doc/cups
        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/
        $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css $(1)/usr/share/doc/cups/
@@ -99,7 +100,7 @@ define Package/cups/install
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/sbin/{accept,cupsaddsmb,cupsctl,cupsd,cupsfilter,lpadmin,lpc,lpinfo,lpmove} \
                $(1)/usr/sbin/
-       (cd $(1)/usr/sbin; ln -s accept reject; ln -s accept cupsenable; ln -s accept cupsdisable;)
+       (cd $(1)/usr/sbin; ln -sf accept reject; ln -sf accept cupsenable; ln -sf accept cupsdisable;)
        # overwrite default config with our own
        $(CP) ./files/etc/cups/* $(1)/etc/cups/
        # install initscript with priority 60
@@ -113,7 +114,7 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups*.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cups))