From 9ed64eccd04774eeda158950f46439d4adcaa6ce Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Tue, 18 Sep 2012 15:17:32 +0000
Subject: fix libtool problem in unpriliged build use the right libusb

---
 print/cups/distinfo         | 4 ++--
 print/cups/options.mk       | 4 ++--
 print/cups/patches/patch-ae | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/print/cups/distinfo b/print/cups/distinfo
index 4416170b2c4..ba903ab373d 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.92 2012/09/18 07:17:28 bouyer Exp $
+$NetBSD: distinfo,v 1.93 2012/09/18 15:17:32 drochner Exp $
 
 SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
 RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
 Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
 SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
-SHA1 (patch-ae) = 061dc910c2f79424969c0d84374c1f59d15ddaa8
+SHA1 (patch-ae) = 60e31e8a98e4bbd191d3ec98d12fc70fa0a881ea
 SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
diff --git a/print/cups/options.mk b/print/cups/options.mk
index 37b1edb1c7a..18058edfc8e 100644
--- a/print/cups/options.mk
+++ b/print/cups/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2012/09/18 07:17:29 bouyer Exp $
+# $NetBSD: options.mk,v 1.15 2012/09/18 15:17:32 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
 PKG_OPTIONS_REQUIRED_GROUPS=	pdftops
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-gssapi
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-libusb
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.libusb
 USE_TOOLS+=		pkg-config
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index fc94eaa70e9..81b1ce9a405 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.29 2012/09/18 07:17:29 bouyer Exp $
+$NetBSD: patch-ae,v 1.30 2012/09/18 15:17:32 drochner Exp $
 
 For proper libtool usage split CC into CC_COMPILE and CC with libtool
 mode options compile/link respectively.
@@ -26,14 +26,14 @@ Same for CXX.
  #
  
 -INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 -INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
 +INSTALL_COMPDATA =	$(INSTALL) -c -m 444
  INSTALL_DATA	=	$(INSTALL) -c -m 444
  INSTALL_DIR	=	$(INSTALL) -d
 -INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_LIB	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_LIB	=	$(LIBTOOL) --mode=install $(INSTALL) -c -m 755 @INSTALL_STRIP@
  INSTALL_MAN	=	$(INSTALL) -c -m 444
  INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
  
-- 
cgit v1.2.3