[36526] trunk/dports/math/octave
takeshi at macports.org
takeshi at macports.org
Mon May 5 00:28:22 PDT 2008
Revision: 36526
http://trac.macosforge.org/projects/macports/changeset/36526
Author: takeshi at macports.org
Date: 2008-05-05 00:28:18 -0700 (Mon, 05 May 2008)
Log Message:
-----------
octave: small fixes to respect lint messages. revision not incremented
Modified Paths:
--------------
trunk/dports/math/octave/Portfile
Added Paths:
-----------
trunk/dports/math/octave/files/patch-configure-2.diff
trunk/dports/math/octave/files/patch-configure.diff
trunk/dports/math/octave/files/patch-dynamic-ld-cc.diff
Removed Paths:
-------------
trunk/dports/math/octave/files/patch-configure
trunk/dports/math/octave/files/patch-configure-2
trunk/dports/math/octave/files/patch-dynamic-ld-cc
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2008-05-05 07:24:23 UTC (rev 36525)
+++ trunk/dports/math/octave/Portfile 2008-05-05 07:28:18 UTC (rev 36526)
@@ -1,9 +1,10 @@
# $Id$
PortSystem 1.0
+
name octave
version 2.9.15
-revision 2
+revision 2
categories math science
maintainers stechert at macports.org
platforms darwin
@@ -25,9 +26,9 @@
rmd160 bf0b56ae2a1c5baaacf65483f6fe98c1b885da03
patch.args -p1
-patchfiles patch-configure \
- patch-configure-2 \
- patch-dynamic-ld-cc
+patchfiles patch-configure.diff \
+ patch-configure-2.diff \
+ patch-dynamic-ld-cc.diff
depends_build bin:texinfo:texinfo \
bin:tex:teTeX \
@@ -78,17 +79,18 @@
}
default_variants +test
-variant test { depends_build-append bin:runtest:dejagnu
+variant test description {runs tests} {
+ depends_build-append bin:runtest:dejagnu
test.run yes
test.target check
}
-variant ptex {
+variant ptex description {use pTeX instead of teTeX } {
depends_build-delete bin:tex:teTeX
depends_build-append bin:tex:pTeX
}
-variant g95 {
+variant g95 description {build with g95} {
depends_lib-append port:g95
configure.f77 "${prefix}/bin/g95"
configure.fflags -O2
Deleted: trunk/dports/math/octave/files/patch-configure
===================================================================
--- trunk/dports/math/octave/files/patch-configure 2008-05-05 07:24:23 UTC (rev 36525)
+++ trunk/dports/math/octave/files/patch-configure 2008-05-05 07:28:18 UTC (rev 36526)
@@ -1,48 +0,0 @@
-diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
---- octave-2.9.15.orig/configure 2007-10-17 13:33:17.000000000 -0400
-+++ octave-2.9.15/configure 2007-10-17 13:31:50.000000000 -0400
-@@ -16134,7 +16134,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
- echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
- if test $ac_cv_lib_cholmod_cholmod_start = yes; then
-- CHOLMOD_LIBS="-lcholmod -lmetis";
-+ CHOLMOD_LIBS="-lcholmod -lcamd -lmetis";
- with_cholmod=yes
- else
-
-@@ -16208,7 +16208,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
- echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
- if test $ac_cv_lib_cholmod_cholmod_start = yes; then
-- CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes
-+ CHOLMOD_LIBS="-lcholmod -lcamd -cblas -lmetis"; with_cholmod=yes
- fi
-
- fi
-@@ -16284,7 +16284,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
- echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
- if test $ac_cv_lib_cholmod_cholmod_start = yes; then
-- CHOLMOD_LIBS="-lcholmod";
-+ CHOLMOD_LIBS="-lcholmod -lcamd";
- with_cholmod=yes
- else
-
-@@ -16358,7 +16358,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
- echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
- if test $ac_cv_lib_cholmod_cholmod_start = yes; then
-- CHOLMOD_LIBS="-lcholmod -cblas";
-+ CHOLMOD_LIBS="-lcholmod -lcamd -cblas";
- with_cholmod=yes
- fi
-
-@@ -16757,7 +16757,7 @@
- RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
- ;;
- *-*-darwin*)
-- DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
-+ DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
- SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
- CXXPICFLAG=
Deleted: trunk/dports/math/octave/files/patch-configure-2
===================================================================
--- trunk/dports/math/octave/files/patch-configure-2 2008-05-05 07:24:23 UTC (rev 36525)
+++ trunk/dports/math/octave/files/patch-configure-2 2008-05-05 07:28:18 UTC (rev 36526)
@@ -1,39 +0,0 @@
-diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
---- octave-2.9.15.orig/configure 2007-10-18 11:17:52.000000000 -0400
-+++ octave-2.9.15/configure 2007-10-18 11:19:19.000000000 -0400
-@@ -10242,9 +10242,9 @@
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
-- as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for glp_lpx_simplex in -l$glpk_lib" >&5
--echo $ECHO_N "checking for glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
-+ as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for _glp_lpx_simplex in -l$glpk_lib" >&5
-+echo $ECHO_N "checking for _glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10263,11 +10263,11 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char glp_lpx_simplex ();
-+char _glp_lpx_simplex ();
- int
- main ()
- {
--return glp_lpx_simplex ();
-+return _glp_lpx_simplex ();
- ;
- return 0;
- }
-@@ -10310,7 +10310,7 @@
- GLPK_LIBS="-l$glpk_lib"
-
- cat >>confdefs.h <<\_ACEOF
--#define GLPK_PRE_4_14 1
-+#undef GLPK_PRE_4_14
- _ACEOF
-
- else
Copied: trunk/dports/math/octave/files/patch-configure-2.diff (from rev 36496, trunk/dports/math/octave/files/patch-configure-2)
===================================================================
--- trunk/dports/math/octave/files/patch-configure-2.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-configure-2.diff 2008-05-05 07:28:18 UTC (rev 36526)
@@ -0,0 +1,39 @@
+diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
+--- octave-2.9.15.orig/configure 2007-10-18 11:17:52.000000000 -0400
++++ octave-2.9.15/configure 2007-10-18 11:19:19.000000000 -0400
+@@ -10242,9 +10242,9 @@
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+- as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for glp_lpx_simplex in -l$glpk_lib" >&5
+-echo $ECHO_N "checking for glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
++ as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for _glp_lpx_simplex in -l$glpk_lib" >&5
++echo $ECHO_N "checking for _glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -10263,11 +10263,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char glp_lpx_simplex ();
++char _glp_lpx_simplex ();
+ int
+ main ()
+ {
+-return glp_lpx_simplex ();
++return _glp_lpx_simplex ();
+ ;
+ return 0;
+ }
+@@ -10310,7 +10310,7 @@
+ GLPK_LIBS="-l$glpk_lib"
+
+ cat >>confdefs.h <<\_ACEOF
+-#define GLPK_PRE_4_14 1
++#undef GLPK_PRE_4_14
+ _ACEOF
+
+ else
Copied: trunk/dports/math/octave/files/patch-configure.diff (from rev 36496, trunk/dports/math/octave/files/patch-configure)
===================================================================
--- trunk/dports/math/octave/files/patch-configure.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-configure.diff 2008-05-05 07:28:18 UTC (rev 36526)
@@ -0,0 +1,48 @@
+diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
+--- octave-2.9.15.orig/configure 2007-10-17 13:33:17.000000000 -0400
++++ octave-2.9.15/configure 2007-10-17 13:31:50.000000000 -0400
+@@ -16134,7 +16134,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -lmetis";
++ CHOLMOD_LIBS="-lcholmod -lcamd -lmetis";
+ with_cholmod=yes
+ else
+
+@@ -16208,7 +16208,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes
++ CHOLMOD_LIBS="-lcholmod -lcamd -cblas -lmetis"; with_cholmod=yes
+ fi
+
+ fi
+@@ -16284,7 +16284,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod";
++ CHOLMOD_LIBS="-lcholmod -lcamd";
+ with_cholmod=yes
+ else
+
+@@ -16358,7 +16358,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
+ echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
+ if test $ac_cv_lib_cholmod_cholmod_start = yes; then
+- CHOLMOD_LIBS="-lcholmod -cblas";
++ CHOLMOD_LIBS="-lcholmod -lcamd -cblas";
+ with_cholmod=yes
+ fi
+
+@@ -16757,7 +16757,7 @@
+ RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
+ ;;
+ *-*-darwin*)
+- DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
++ DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
+ MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
+ SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
+ CXXPICFLAG=
Deleted: trunk/dports/math/octave/files/patch-dynamic-ld-cc
===================================================================
--- trunk/dports/math/octave/files/patch-dynamic-ld-cc 2008-05-05 07:24:23 UTC (rev 36525)
+++ trunk/dports/math/octave/files/patch-dynamic-ld-cc 2008-05-05 07:28:18 UTC (rev 36526)
@@ -1,15 +0,0 @@
-diff -uNr octave-2.9.15.orig/src/dynamic-ld.cc octave-2.9.15/src/dynamic-ld.cc
---- octave-2.9.15.orig/src/dynamic-ld.cc 2007-10-12 17:27:29.000000000 -0400
-+++ octave-2.9.15/src/dynamic-ld.cc 2007-10-17 20:11:54.000000000 -0400
-@@ -443,7 +443,11 @@
- {
- octave_mex_file_list::append (mex_file);
-
-+#if defined (CXX_PREPENDS_UNDERSCORE)
-+ function = mex_file.search ("_mexFunction");
-+#else
- function = mex_file.search ("mexFunction");
-+#endif
-
- if (! function)
- {
Copied: trunk/dports/math/octave/files/patch-dynamic-ld-cc.diff (from rev 36496, trunk/dports/math/octave/files/patch-dynamic-ld-cc)
===================================================================
--- trunk/dports/math/octave/files/patch-dynamic-ld-cc.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-dynamic-ld-cc.diff 2008-05-05 07:28:18 UTC (rev 36526)
@@ -0,0 +1,15 @@
+diff -uNr octave-2.9.15.orig/src/dynamic-ld.cc octave-2.9.15/src/dynamic-ld.cc
+--- octave-2.9.15.orig/src/dynamic-ld.cc 2007-10-12 17:27:29.000000000 -0400
++++ octave-2.9.15/src/dynamic-ld.cc 2007-10-17 20:11:54.000000000 -0400
+@@ -443,7 +443,11 @@
+ {
+ octave_mex_file_list::append (mex_file);
+
++#if defined (CXX_PREPENDS_UNDERSCORE)
++ function = mex_file.search ("_mexFunction");
++#else
+ function = mex_file.search ("mexFunction");
++#endif
+
+ if (! function)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080505/cd9bafe9/attachment-0001.html
More information about the macports-changes
mailing list