Mon Apr 9 18:19:57 2012 UTC ()
Pullup ticket #3718 - requested by dholland
cad/tnt-mmtl: build fix

Revisions pulled up:
- cad/tnt-mmtl/distinfo                                         1.7
- cad/tnt-mmtl/patches/patch-al                                 1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Apr  8 02:37:36 UTC 2012

   Modified Files:
   	pkgsrc/cad/tnt-mmtl: distinfo
   	pkgsrc/cad/tnt-mmtl/patches: patch-al

   Log Message:
   Work around automake failure that appeared recently.

   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/cad/tnt-mmtl/distinfo
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/tnt-mmtl/patches/patch-al


(spz)
diff -r1.6 -r1.6.18.1 pkgsrc/cad/tnt-mmtl/distinfo
diff -r1.1 -r1.1.38.1 pkgsrc/cad/tnt-mmtl/patches/patch-al
cvs diff -r1.6 -r1.6.18.1 pkgsrc/cad/tnt-mmtl/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/tnt-mmtl/distinfo 2010/02/27 03:21:06 1.6
+++ pkgsrc/cad/tnt-mmtl/distinfo 2012/04/09 18:19:57 1.6.18.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.6 2010/02/27 03:21:06 dmcmahill Exp $ 1$NetBSD: distinfo,v 1.6.18.1 2012/04/09 18:19:57 spz Exp $
2 2
3SHA1 (tnt-1.2.2.tar.gz) = bd089863ca2cd939009253e83f4ab75317191047 3SHA1 (tnt-1.2.2.tar.gz) = bd089863ca2cd939009253e83f4ab75317191047
4RMD160 (tnt-1.2.2.tar.gz) = 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d 4RMD160 (tnt-1.2.2.tar.gz) = 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d
5Size (tnt-1.2.2.tar.gz) = 2020099 bytes 5Size (tnt-1.2.2.tar.gz) = 2020099 bytes
6SHA1 (patch-aa) = f8fbcafc4631abef3a7e77398363c9685d28b5f9 6SHA1 (patch-aa) = f8fbcafc4631abef3a7e77398363c9685d28b5f9
7SHA1 (patch-ab) = 6a57255b994f0ea4063a2c256fe0ba689a210ba7 7SHA1 (patch-ab) = 6a57255b994f0ea4063a2c256fe0ba689a210ba7
8SHA1 (patch-ac) = 32b2a6721a3c1790366c278816c2f188dfa38214 8SHA1 (patch-ac) = 32b2a6721a3c1790366c278816c2f188dfa38214
9SHA1 (patch-ad) = 8084532ba3a3387fddfbbfeee019c21e4e139be7 9SHA1 (patch-ad) = 8084532ba3a3387fddfbbfeee019c21e4e139be7
10SHA1 (patch-ae) = 5fabada892e8c82af60ba41c27ae5cafa0520654 10SHA1 (patch-ae) = 5fabada892e8c82af60ba41c27ae5cafa0520654
11SHA1 (patch-af) = a68a9b2a77450006361cfb9647424be0bd65533a 11SHA1 (patch-af) = a68a9b2a77450006361cfb9647424be0bd65533a
12SHA1 (patch-ag) = 0b973184d087ca0d42cac4d87ff3c167fd700850 12SHA1 (patch-ag) = 0b973184d087ca0d42cac4d87ff3c167fd700850
13SHA1 (patch-ah) = 97368422014ab65139ecc2cd77d89c4e3b2fa026 13SHA1 (patch-ah) = 97368422014ab65139ecc2cd77d89c4e3b2fa026
14SHA1 (patch-ai) = 2ab6aa6bd4cd0883725c66bb7d4fa59e9e3172a4 14SHA1 (patch-ai) = 2ab6aa6bd4cd0883725c66bb7d4fa59e9e3172a4
15SHA1 (patch-aj) = 7ec0c75d0e29c2adce2eea442e4b3309455965e7 15SHA1 (patch-aj) = 7ec0c75d0e29c2adce2eea442e4b3309455965e7
16SHA1 (patch-ak) = d17baa2b591126cda87c79768136a3d6086d229e 16SHA1 (patch-ak) = d17baa2b591126cda87c79768136a3d6086d229e
17SHA1 (patch-al) = b7c2bf78d0d92bd51fb8de86d78d7a51a5b640d4 17SHA1 (patch-al) = 63508931ae726264c0f2778fe9a1ad7088c866ad
18SHA1 (patch-am) = d81174386963777cae26019183a73fed74f62970 18SHA1 (patch-am) = d81174386963777cae26019183a73fed74f62970
19SHA1 (patch-an) = a854330a07eb434d8d80352a323d1a29c875200f 19SHA1 (patch-an) = a854330a07eb434d8d80352a323d1a29c875200f
20SHA1 (patch-ao) = ff87ca35c176b0d47cbdd12d2edb5924b3916f3f 20SHA1 (patch-ao) = ff87ca35c176b0d47cbdd12d2edb5924b3916f3f
cvs diff -r1.1 -r1.1.38.1 pkgsrc/cad/tnt-mmtl/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/cad/tnt-mmtl/patches/patch-al 2008/03/18 11:48:25 1.1
+++ pkgsrc/cad/tnt-mmtl/patches/patch-al 2012/04/09 18:19:57 1.1.38.1
@@ -1,26 +1,48 @@ @@ -1,26 +1,48 @@
1$NetBSD: patch-al,v 1.1 2008/03/18 11:48:25 dmcmahill Exp $ 1$NetBSD: patch-al,v 1.1.38.1 2012/04/09 18:19:57 spz Exp $
2 2
3The automake manual clearly specifies that if we mix fortran sources 3The automake manual clearly specifies that if we mix fortran sources
4in with c or c++ sources then we need to use the AC_F77_LIBRARY_LDFLAGS 4in with c or c++ sources then we need to use the AC_F77_LIBRARY_LDFLAGS
5autoconf macro and then add $(FLIBS) to either LDADD for a program or 5autoconf macro and then add $(FLIBS) to either LDADD for a program or
6LIBADD for a library. 6LIBADD for a library.
7 7
8--- bem/Makefile.am.orig 2004-04-22 20:07:12.000000000 +0000 8Automake prohibits scripts in the "pkglib" dir for some reason, so
9+++ bem/Makefile.am 2008-03-16 03:44:18.000000000 +0000 9work around it by calling the dir "blahlib".
10@@ -27,5 +27,5 @@ 10
 11--- bem/Makefile.am.orig 2012-04-08 02:41:28.000000000 +0000
 12+++ bem/Makefile.am
 13@@ -26,12 +26,12 @@
 14 # autoconf, and automake for the first time, you'll need to
11 # supply command line switches --add-missing --copy. 15 # supply command line switches --add-missing --copy.
12 #---------------------------------------------------------------- 16 #----------------------------------------------------------------
13-AUTOMAKE_OPTIONS = foreign subdir-objects 17-AUTOMAKE_OPTIONS = foreign subdir-objects
14+AUTOMAKE_OPTIONS = foreign 18+AUTOMAKE_OPTIONS = foreign
15  19
16 #--------------------------------------------------------------- 20 #---------------------------------------------------------------
17@@ -72,7 +72,9 @@ 21 # tcl/tk scripts that may need to be installed.
 22 #---------------------------------------------------------------
 23-pkglib_SCRIPTS = \
 24+blahlib_SCRIPTS = \
 25 lib/bem.tcl \
 26 lib/bem_gpge.itcl \
 27 lib/bem_graphs.itcl \
 28@@ -46,7 +46,7 @@ pkglib_SCRIPTS = \
 29 # Define an installation directory that includes
 30 # the version number (from AC_INIT) like "bltmath1.0"
 31 #---------------------------------------------------------------
 32-pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION)
 33+blahlibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION)
 34
 35 #----------------------------------------------------------------
 36 # nmmtl is our main target
 37@@ -71,9 +71,11 @@ bem_TESTS = tests/test_bem.tcl
 38 #----------------------------------------------------------------
18 bem_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \ 39 bem_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \
19 src/nmmtl_parse_xsctn.cpp 40 src/nmmtl_parse_xsctn.cpp
20+bem_LDADD = $(FLIBS) 41+bem_LDADD = $(FLIBS)
21  42
22 nmmtl_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \ 43 nmmtl_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \
23 src/nmmtl_parse_graphic.cpp 44 src/nmmtl_parse_graphic.cpp
24+nmmtl_LDADD = $(FLIBS) 45+nmmtl_LDADD = $(FLIBS)
25  46
26  47
 48 #----------------------------------------------------------------