[pkgsrc/trunk]: pkgsrc/print/cups Do not depend on libtools's mode detection ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41a5ec368bcd
branches:  trunk
changeset: 398780:41a5ec368bcd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Sep 08 19:02:11 2009 +0000

description:
Do not depend on libtools's mode detection but pass down --mode=XXX
correctly.

diffstat:

 print/cups/distinfo         |   4 ++-
 print/cups/patches/patch-ae |  55 +++++++++++++++++++++++++++++++++++++++++++++
 print/cups/patches/patch-af |  13 ++++++++++
 3 files changed, 71 insertions(+), 1 deletions(-)

diffs (94 lines):

diff -r 2e5be70bc047 -r 41a5ec368bcd print/cups/distinfo
--- a/print/cups/distinfo       Tue Sep 08 18:36:34 2009 +0000
+++ b/print/cups/distinfo       Tue Sep 08 19:02:11 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2009/08/05 17:19:16 drochner Exp $
+$NetBSD: distinfo,v 1.63 2009/09/08 19:02:11 joerg Exp $
 
 SHA1 (cups-1.3.11-source.tar.bz2) = c8304ee8d631bb370fc10fc1fffbe8ebae413df2
 RMD160 (cups-1.3.11-source.tar.bz2) = aa263fe29350cee307bbd72ef2f5cb061c2476e0
@@ -7,6 +7,8 @@
 SHA1 (patch-ab) = 0b8c6662b836775c693da7ebc613ca7a5594840a
 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
+SHA1 (patch-ae) = 4b2c1e8821856ba69d6af72a5b96a7b88c346656
+SHA1 (patch-af) = 5445e6b5ced9dee71f48208369728e9d298dd0bb
 SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
 SHA1 (patch-ao) = c9f93c7d69d934677a605197959a162dfb1658eb
 SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
diff -r 2e5be70bc047 -r 41a5ec368bcd print/cups/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-ae       Tue Sep 08 19:02:11 2009 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-ae,v 1.24 2009/09/08 19:02:11 joerg Exp $
+
+--- Makedefs.in.orig   2009-09-07 18:00:35.000000000 +0200
++++ Makedefs.in
+@@ -19,8 +19,10 @@
+ 
+ AR            =       @AR@
+ AWK           =       @AWK@
+-CC            =       @LIBTOOL@ @CC@
+-CXX           =       @LIBTOOL@ @CXX@
++CC_COMPILE    =       @LIBTOOL@ --mode=compile @CC@
++CXX_COMPILE   =       @LIBTOOL@ --mode=compile @CXX@
++CC            =       @LIBTOOL@ --mode=link @CC@
++CXX           =       @LIBTOOL@ --mode=link @CXX@
+ DSO           =       @DSO@
+ HTMLDOC               =       @HTMLDOC@
+ INSTALL               =       @INSTALL@
+@@ -40,11 +42,11 @@ STRIP              =       @STRIP@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN   =       $(LIBTOOL) $(INSTALL) -m 755
++INSTALL_BIN   =       $(LIBTOOL) --mode=install $(INSTALL) -m 755
+ INSTALL_CONFIG        =       $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA  =       $(INSTALL) -m 644
+ INSTALL_DIR   =       $(INSTALL) -d
+-INSTALL_LIB   =       $(LIBTOOL) $(INSTALL) -m 755
++INSTALL_LIB   =       $(LIBTOOL) --mode=install $(INSTALL) -m 755
+ INSTALL_MAN   =       $(INSTALL) -m 644
+ INSTALL_SCRIPT        =       $(INSTALL) -m 755
+ 
+@@ -246,19 +248,19 @@ DBUSDIR          =       @DBUSDIR@
+ 
+ .c.o:
+       echo Compiling $<...
+-      $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
++      $(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
+ 
+ .c.32.o:
+       echo Compiling 32-bit $<...
+-      $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
++      $(CC_COMPILE) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+ 
+ .c.64.o:
+       echo Compiling 64-bit $<...
+-      $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
++      $(CC_COMPILE) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+ 
+ .cxx.o:
+       echo Compiling $<...
+-      $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
++      $(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+ 
+ .man.1 .man.1m .man.5 .man.7 .man.8:
+       echo Linking $<...
diff -r 2e5be70bc047 -r 41a5ec368bcd print/cups/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/cups/patches/patch-af       Tue Sep 08 19:02:11 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.18 2009/09/08 19:02:11 joerg Exp $
+
+--- backend/Makefile.orig      2009-09-07 18:28:31.000000000 +0200
++++ backend/Makefile
+@@ -55,7 +55,7 @@ depend:
+ install:      all
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+       for file in $(RBACKENDS); do \
+-              $(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
++              $(LIBTOOL) --mode=install $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
+       done
+       for file in $(UBACKENDS); do \
+               $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \