[pkgsrc/trunk]: pkgsrc/math/ntl Always call libtool with the right --mode opt...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27557fb784fd
branches:  trunk
changeset: 568087:27557fb784fd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Dec 03 17:48:58 2009 +0000

description:
Always call libtool with the right --mode option. DESTDIR support.

diffstat:

 math/ntl/Makefile         |   5 ++++-
 math/ntl/distinfo         |   4 ++--
 math/ntl/patches/patch-aa |  26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diffs (102 lines):

diff -r 129cd80e7604 -r 27557fb784fd math/ntl/Makefile
--- a/math/ntl/Makefile Thu Dec 03 17:12:42 2009 +0000
+++ b/math/ntl/Makefile Thu Dec 03 17:48:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/09/09 02:43:10 obache Exp $
+# $NetBSD: Makefile,v 1.22 2009/12/03 17:48:58 joerg Exp $
 
 DISTNAME=              ntl-5.3.1
 PKGREVISION=           1
@@ -9,11 +9,14 @@
 HOMEPAGE=              http://www.shoup.net/ntl/
 COMMENT=               C++ library for doing number theory
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 NO_CONFIGURE=          yes
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 MAKE_FILE=             makefile
+INSTALLATION_DIRS=     lib
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 129cd80e7604 -r 27557fb784fd math/ntl/distinfo
--- a/math/ntl/distinfo Thu Dec 03 17:12:42 2009 +0000
+++ b/math/ntl/distinfo Thu Dec 03 17:48:58 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 12:06:56 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/12/03 17:48:58 joerg Exp $
 
 SHA1 (ntl-5.3.1.tar.gz) = 22f9004d59595ddf931150e39805880cca67f8bc
 RMD160 (ntl-5.3.1.tar.gz) = 2eec6b8c72f342e74c81fca432434818ce3615eb
 Size (ntl-5.3.1.tar.gz) = 669649 bytes
-SHA1 (patch-aa) = 3d263407a52690b7ef1346e8bcc8fcd42acbf7c8
+SHA1 (patch-aa) = c6e4211c55d9c1e038718e690d485e195db6727b
 SHA1 (patch-ab) = 726bb373a3dc31c33763282c5cc7c07110a33f23
 SHA1 (patch-ac) = f6a1e211379e713aee4fb575cc2d92563cbdd6fd
diff -r 129cd80e7604 -r 27557fb784fd math/ntl/patches/patch-aa
--- a/math/ntl/patches/patch-aa Thu Dec 03 17:12:42 2009 +0000
+++ b/math/ntl/patches/patch-aa Thu Dec 03 17:48:58 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2003/03/02 09:04:04 jtb Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
 
 --- makefile.orig      Tue Dec 17 15:43:30 2002
 +++ makefile
@@ -158,13 +158,13 @@
  
 -COMPILE = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
 -COMPILE_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
-+COMPILE = $(LIBTOOL) $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
-+COMPILE_CXX = $(LIBTOOL) $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
++COMPILE = $(LIBTOOL) --mode=compile $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
++COMPILE_CXX = $(LIBTOOL) --mode=compile $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
  
 -LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 -LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
-+LINK = $(LIBTOOL) $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_CXX = $(LIBTOOL) $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
++LINK = $(LIBTOOL) --mode=link $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
++LINK_CXX = $(LIBTOOL) --mode=link $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
  
  
  
@@ -193,7 +193,7 @@
 -      $(AR) $(ARFLAGS) ntl.a $(OBJ)
 -      - $(RANLIB) ntl.a
 +libntl.la:    $(OBJ)
-+      $(LIBTOOL) $(CC) -o libntl.la $(OBJ:.o=.lo) \
++      $(LIBTOOL) --mode=link $(CC) -o libntl.la $(OBJ:.o=.lo) \
 +      $(GMP_LIBDIR) $(GMP_LIB) -rpath $(LIBDIR) \
 +      -version-info 0:1
  
@@ -243,12 +243,12 @@
 -      cp ../doc/*.txt $(DOCDIR)/NTL
 -      cp ../doc/*.html $(DOCDIR)/NTL
 -      cp ../doc/*.gif $(DOCDIR)/NTL
-+      $(LIBTOOL) $(BSD_INSTALL_DATA) libntl.la $(LIBDIR)
-+      $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/NTL
-+      $(BSD_INSTALL_DATA) ../include/NTL/*.h $(INCLUDEDIR)/NTL
-+      $(BSD_INSTALL_DATA_DIR) $(DOCDIR)/NTL
-+      $(BSD_INSTALL_DATA) ../doc/*.txt $(DOCDIR)/NTL
-+      $(BSD_INSTALL_DATA) ../doc/*.html $(DOCDIR)/NTL
++      $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libntl.la ${DESTDIR}$(LIBDIR)
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INCLUDEDIR)/NTL
++      $(BSD_INSTALL_DATA) ../include/NTL/*.h ${DESTDIR}$(INCLUDEDIR)/NTL
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)/NTL
++      $(BSD_INSTALL_DATA) ../doc/*.txt ${DESTDIR}$(DOCDIR)/NTL
++      $(BSD_INSTALL_DATA) ../doc/*.html ${DESTDIR}$(DOCDIR)/NTL
 +
  
  
@@ -295,7 +295,7 @@
 -      $(AR) $(ARFLAGS) wntl.a $(WOBJ)
 -      - $(RANLIB) wntl.a
 +libwntl.la:   $(WOBJ)
-+      $(LIBTOOL) $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
++      $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
 +      -version-info 0:0