6 files changed, 50 insertions, 22 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 4f273361b8a..b16f0ca7880 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2002/01/30 03:33:29 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2002/01/31 17:51:26 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-BASE_VERS=		1.1.12
+BASE_VERS=		1.1.13
 DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 7340e3e5db1..b2977f97e02 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/14 23:18:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/31 17:51:27 jlam Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -13,6 +13,7 @@ bin/lpstat
 etc/rc.d/cupsd
 include/cups/cups.h
 include/cups/http.h
+include/cups/image.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/md5.h
@@ -134,6 +135,8 @@ share/cups/charsets/iso-8859-6
 share/cups/charsets/iso-8859-7
 share/cups/charsets/iso-8859-8
 share/cups/charsets/iso-8859-9
+share/cups/charsets/koi8-r
+share/cups/charsets/koi8-u
 share/cups/charsets/utf-8
 share/cups/charsets/windows-1250
 share/cups/charsets/windows-1251
@@ -361,12 +364,24 @@ share/examples/cups/mime.convs
 share/examples/cups/mime.types
 share/examples/cups/printers.conf
 share/locale/C/cups_C
+share/locale/be/cups_be
 share/locale/cs/cups_cs
 share/locale/de/cups_de
 share/locale/en/cups_en
 share/locale/es/cups_es
 share/locale/fr/cups_fr
+share/locale/he/cups_he
 share/locale/it/cups_it
+share/locale/ru_RU.cp1251/cups_ru_RU.cp1251
+share/locale/ru_RU.koi8r/cups_ru_RU.koi8r
+share/locale/uk/cups_uk
+share/locale/uk_UA.cp1251/cups_uk_UA.cp1251
+share/locale/zh_CN/cups_zh_CN
+@dirrm share/locale/uk_UA.cp1251
+@dirrm share/locale/ru_RU.koi8r
+@dirrm share/locale/ru_RU.cp1251
+@dirrm share/locale/he
+@dirrm share/locale/be
 @dirrm share/locale/C
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index 80bce9f52fa..a0352b35627 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/07/27 13:33:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/01/31 17:51:27 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcups.
 #
@@ -26,10 +26,23 @@ BUILDLINK_FILES.cups=	include/cups/*
 BUILDLINK_FILES.cups+=	lib/libcups.*
 BUILDLINK_FILES.cups+=	lib/libcupsimage.*
 
-BUILDLINK_TARGETS.cups=	cups-buildlink
-BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.cups}
+BUILDLINK_TARGETS.cups=		cups-buildlink
+BUILDLINK_TARGETS.cups+=	cups-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.cups}
+
+BUILDLINK_CONFIG.cups=		${BUILDLINK_PREFIX.cups}/bin/cups-config
+BUILDLINK_CONFIG_WRAPPER.cups=	${BUILDLINK_DIR}/bin/cups-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.cups}|${BUILDLINK_CONFIG.cups}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+CUPS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.cups}
+CONFIGURE_ENV+=		CUPS_CONFIG="${CUPS_CONFIG}"
+MAKE_ENV+=		CUPS_CONFIG="${CUPS_CONFIG}"
+.endif
 
 pre-configure: ${BUILDLINK_TARGETS.cups}
 cups-buildlink: _BUILDLINK_USE
+cups-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
 
 .endif	# CUPS_BUILDLINK_MK
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 66ca4f1e8b2..790b7d7c6da 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2001/12/14 23:18:15 jlam Exp $
+$NetBSD: distinfo,v 1.11 2002/01/31 17:51:27 jlam Exp $
 
-SHA1 (cups-1.1.12-source.tar.bz2) = 1df65094b198bd446db8cd7d1624ad4feba32f3a
-Size (cups-1.1.12-source.tar.bz2) = 5397921 bytes
-SHA1 (patch-ab) = 44db4e52c4b7eb92847780dabb884277a6edaa4a
-SHA1 (patch-ag) = 8f8afb26507941371a34fe51608295678adeea96
+SHA1 (cups-1.1.13-source.tar.bz2) = 9bf1e3fb3bd5df40e85e3da388970e1354c4f700
+Size (cups-1.1.13-source.tar.bz2) = 5432564 bytes
+SHA1 (patch-ab) = 940c5fdae628e0c4f8ff914c365055086d6781dd
+SHA1 (patch-ag) = df2c471d9dd013017afdef80a41ea2b2e5bdca27
 SHA1 (patch-ah) = a7cdf225c7256c3277559d5bd2923df74ee3d26e
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index f982ceac8d5..5bc5279d468 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2001/12/14 23:18:16 jlam Exp $
+$NetBSD: patch-ab,v 1.13 2002/01/31 17:51:27 jlam Exp $
 
---- Makefile.orig	Tue Oct 30 15:37:13 2001
-+++ Makefile	Fri Dec 14 17:33:21 2001
-@@ -60,8 +60,6 @@
+--- Makefile.orig	Thu Jan 24 13:51:04 2002
++++ Makefile
+@@ -61,8 +61,6 @@
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
  	done
@@ -11,10 +11,10 @@ $NetBSD: patch-ab,v 1.12 2001/12/14 23:18:16 jlam Exp $
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
-@@ -77,30 +75,6 @@
+@@ -78,30 +76,6 @@
  	echo Installing cups-config script...
- 	$(INSTALL_DIR) $(bindir)
- 	$(INSTALL_SCRIPT) cups-config $(bindir)/cups-config
+ 	$(INSTALL_DIR) $(BINDIR)
+ 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 -	echo Installing startup script...
 -	if test "x$(INITDIR)" != "x"; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
index 9aaa5fc627d..d6f767d9524 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.10 2001/12/14 23:18:16 jlam Exp $
+$NetBSD: patch-ag,v 1.11 2002/01/31 17:51:27 jlam Exp $
 
---- filter/Makefile.orig	Sun Oct  7 08:16:09 2001
-+++ filter/Makefile	Fri Dec 14 17:34:59 2001
-@@ -137,7 +137,7 @@
+--- filter/Makefile.orig	Wed Jan 23 17:30:42 2002
++++ filter/Makefile
+@@ -142,7 +142,7 @@
  
  libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
  	echo Linking $@...