head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.112 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.110 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.108 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.106 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.104 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.102 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.100 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.98 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.96 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.94 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.92 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.90 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.88 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.86 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.84 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.82 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.80 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.78 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.76 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.74 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.72 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.70 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.68 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.64 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.44 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.66 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.62 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.60 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.58 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.56 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.54 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.52 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.50 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.48 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.46 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.42 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.40 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.38 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.36 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.34 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.32 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.30 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.28 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.26 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.24 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.22 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.20 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.18 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.16 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.14 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.12 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.8 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.4 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.2 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.1.0.38 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.36 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.34 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.32 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.30 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.28 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.26 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.24 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.22 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.20 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.18 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.16 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2012.04.08.02.37.36; author dholland; state Exp; branches; next 1.1; 1.1 date 2008.03.18.11.48.25; author dmcmahill; state Exp; branches 1.1.38.1; next ; 1.1.38.1 date 2012.04.09.18.19.57; author spz; state Exp; branches; next ; desc @@ 1.2 log @Work around automake failure that appeared recently. @ text @$NetBSD: patch-al,v 1.1 2008/03/18 11:48:25 dmcmahill Exp $ The automake manual clearly specifies that if we mix fortran sources in with c or c++ sources then we need to use the AC_F77_LIBRARY_LDFLAGS autoconf macro and then add $(FLIBS) to either LDADD for a program or LIBADD for a library. Automake prohibits scripts in the "pkglib" dir for some reason, so work around it by calling the dir "blahlib". --- bem/Makefile.am.orig 2012-04-08 02:41:28.000000000 +0000 +++ bem/Makefile.am @@@@ -26,12 +26,12 @@@@ # autoconf, and automake for the first time, you'll need to # supply command line switches --add-missing --copy. #---------------------------------------------------------------- -AUTOMAKE_OPTIONS = foreign subdir-objects +AUTOMAKE_OPTIONS = foreign #--------------------------------------------------------------- # tcl/tk scripts that may need to be installed. #--------------------------------------------------------------- -pkglib_SCRIPTS = \ +blahlib_SCRIPTS = \ lib/bem.tcl \ lib/bem_gpge.itcl \ lib/bem_graphs.itcl \ @@@@ -46,7 +46,7 @@@@ pkglib_SCRIPTS = \ # Define an installation directory that includes # the version number (from AC_INIT) like "bltmath1.0" #--------------------------------------------------------------- -pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION) +blahlibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION) #---------------------------------------------------------------- # nmmtl is our main target @@@@ -71,9 +71,11 @@@@ bem_TESTS = tests/test_bem.tcl #---------------------------------------------------------------- bem_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \ src/nmmtl_parse_xsctn.cpp +bem_LDADD = $(FLIBS) nmmtl_SOURCES = $(cpp_SOURCES) $(fortran_SOURCES) \ src/nmmtl_parse_graphic.cpp +nmmtl_LDADD = $(FLIBS) #---------------------------------------------------------------- @ 1.1 log @Repair the build when using f2c-f77 as the fortran compiler. Also, do not install calcCAP or calcRL. These two tools seem to give results of questionable accuracy (see the sourceforge bug tracker for the upstream sources) and also don't build with gcc-4 anyway. Bump pkgrevision. @ text @d1 1 a1 1 $NetBSD$ d8 7 a14 3 --- bem/Makefile.am.orig 2004-04-22 20:07:12.000000000 +0000 +++ bem/Makefile.am 2008-03-16 03:44:18.000000000 +0000 @@@@ -27,5 +27,5 @@@@ d21 18 a38 1 @@@@ -72,7 +72,9 @@@@ d48 1 @ 1.1.38.1 log @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 @ text @d8 3 a10 7 Automake prohibits scripts in the "pkglib" dir for some reason, so work around it by calling the dir "blahlib". --- bem/Makefile.am.orig 2012-04-08 02:41:28.000000000 +0000 +++ bem/Makefile.am @@@@ -26,12 +26,12 @@@@ # autoconf, and automake for the first time, you'll need to d17 1 a17 18 # tcl/tk scripts that may need to be installed. #--------------------------------------------------------------- -pkglib_SCRIPTS = \ +blahlib_SCRIPTS = \ lib/bem.tcl \ lib/bem_gpge.itcl \ lib/bem_graphs.itcl \ @@@@ -46,7 +46,7 @@@@ pkglib_SCRIPTS = \ # Define an installation directory that includes # the version number (from AC_INIT) like "bltmath1.0" #--------------------------------------------------------------- -pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION) +blahlibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION) #---------------------------------------------------------------- # nmmtl is our main target @@@@ -71,9 +71,11 @@@@ bem_TESTS = tests/test_bem.tcl #---------------------------------------------------------------- a26 1 #---------------------------------------------------------------- @