[pkgsrc/trunk]: pkgsrc/archivers/bzip2 Use libtool with correct --mode argume...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e2c2b036aff
branches:  trunk
changeset: 461642:9e2c2b036aff
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 18 18:46:28 2003 +0000

description:
Use libtool with correct --mode argument. From Ron Roskens in PR 22824.

diffstat:

 archivers/bzip2/Makefile         |   4 ++--
 archivers/bzip2/distinfo         |   4 ++--
 archivers/bzip2/patches/patch-aa |  10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 92895af8504d -r 9e2c2b036aff archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile  Thu Sep 18 18:42:22 2003 +0000
+++ b/archivers/bzip2/Makefile  Thu Sep 18 18:46:28 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:21:07 grant Exp $
+# $NetBSD: Makefile,v 1.25 2003/09/18 18:46:28 wiz Exp $
 #
 
 DISTNAME=      bzip2-1.0.2
@@ -34,6 +34,6 @@
        ${LN} -s ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzcat.1
        ${LN} -s ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzip2recover.1
        ${INSTALL_DATA} ${WRKSRC}/bzlib.h ${PREFIX}/include
-       ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib
+       ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff -r 92895af8504d -r 9e2c2b036aff archivers/bzip2/distinfo
--- a/archivers/bzip2/distinfo  Thu Sep 18 18:42:22 2003 +0000
+++ b/archivers/bzip2/distinfo  Thu Sep 18 18:46:28 2003 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/03/18 21:53:29 jschauma Exp $
+$NetBSD: distinfo,v 1.8 2003/09/18 18:46:30 wiz Exp $
 
 SHA1 (bzip2-1.0.2.tar.gz) = d47793959c0d65a4d7246e0247ed1358662d9ebf
 Size (bzip2-1.0.2.tar.gz) = 665198 bytes
-SHA1 (patch-aa) = 96899bad1878fbd0c556c0830d8a7a71ce724fc9
+SHA1 (patch-aa) = d902ac2a23f0b6f1b057f0e3637a06e844b9360b
diff -r 92895af8504d -r 9e2c2b036aff archivers/bzip2/patches/patch-aa
--- a/archivers/bzip2/patches/patch-aa  Thu Sep 18 18:42:22 2003 +0000
+++ b/archivers/bzip2/patches/patch-aa  Thu Sep 18 18:46:28 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $
+$NetBSD: patch-aa,v 1.7 2003/09/18 18:46:32 wiz Exp $
 
 --- Makefile.orig      Sat Jan 26 00:34:53 2002
 +++ Makefile   Sun Mar 24 14:56:33 2002
@@ -7,8 +7,8 @@
  
  # To assist in cross-compiling
 -CC=gcc
-+CC=${LIBTOOL} ${REALCC}
-+LD=${LIBTOOL} ${REALCC}
++CC=${LIBTOOL} --mode=compile ${REALCC}
++LD=${LIBTOOL} --mode=link ${REALCC}
  AR=ar
  RANLIB=ranlib
 -LDFLAGS=
@@ -35,11 +35,11 @@
 -bzip2: libbz2.a bzip2.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
 +bzip2: libbz2.la bzip2.o
-+      $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la
++      $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la
  
  bzip2recover: bzip2recover.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-+      $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o
++      $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o
  
 -libbz2.a: $(OBJS)
 -      rm -f libbz2.a