[53066] trunk/dports/math/shogun
jameskyle at macports.org
jameskyle at macports.org
Sun Jun 28 18:25:54 PDT 2009
Revision: 53066
http://trac.macports.org/changeset/53066
Author: jameskyle at macports.org
Date: 2009-06-28 18:25:54 -0700 (Sun, 28 Jun 2009)
Log Message:
-----------
Removed old files.
Patched configure for full paths to dylib's negating need for setting library paths by the user.
Modified Paths:
--------------
trunk/dports/math/shogun/Portfile
Added Paths:
-----------
trunk/dports/math/shogun/files/patch-src-configure.diff
Removed Paths:
-------------
trunk/dports/math/shogun/files/configure.diff
trunk/dports/math/shogun/files/patch-src-configure.diff
trunk/dports/math/shogun/files/patch-src-lib-lapack.cpp.diff
Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile 2009-06-29 01:12:11 UTC (rev 53065)
+++ trunk/dports/math/shogun/Portfile 2009-06-29 01:25:54 UTC (rev 53066)
@@ -52,7 +52,7 @@
configure.compiler macports-gcc-4.3
-patchfiles configure.diff
+patchfiles patch-src-configure.diff
default_variants +python +glpk
@@ -132,6 +132,9 @@
}
}
+post-patch {
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+}
post-destroot {
if {[variant_isset doc]} {
system "cd ${worksrcpath}/../doc && make"
@@ -140,10 +143,3 @@
}
}
-
-post-install {
- ui_warn "You will need to set:"
- ui_warn "DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib"
- ui_warn "Or shogun will not be able to find the macports atlas libs"
-}
-
Deleted: trunk/dports/math/shogun/files/configure.diff
===================================================================
--- trunk/dports/math/shogun/files/configure.diff 2009-06-29 01:12:11 UTC (rev 53065)
+++ trunk/dports/math/shogun/files/configure.diff 2009-06-29 01:25:54 UTC (rev 53066)
@@ -1,153 +0,0 @@
---- configure.old 2009-05-28 14:40:13.000000000 -0700
-+++ configure 2009-05-28 14:40:24.000000000 -0700
-@@ -99,8 +99,8 @@
- _octave_modular=auto
- _r_modular=no
-
--test -z "$INCLUDES" || _inc_extra="-I`echo $INCLUDES | sed 's,:, -I,g'`"
--test -z "$LIBS" || _ld_extra="-L`echo $LIBS | sed 's,:, -L,g'`"
-+test -z "$INCLUDES" || _inc_extra="-I`echo $INCLUDES | gsed 's,:, -I,g'`"
-+test -z "$LIBS" || _ld_extra="-L`echo $LIBS | gsed 's,:, -L,g'`"
-
- # these ones will be autodetected
- CONFIGURE_OPTIONS="configure options $@"
-@@ -110,7 +110,7 @@
- COMP_NOOPTS="-g -Wall -O2"
- COMPFLAGS_C=-fPIC
- COMPFLAGS_CPP=-fPIC
--SEDMI='sed -i'
-+SEDMI='gsed -i'
- test "$CFLAGS" && COMPFLAGS_C="$COMPFLAGS_C $CFLAGS"
- test "$CXXFLAGS" && COMPFLAGS_CPP="$COMPFLAGS_CPP $CXXFLAGS"
- INCLUDES=
-@@ -599,7 +599,7 @@
- mangle_homedir_tilde() {
- if test `echo "$1" | cut -c 1` = '~'
- then
-- echo "$1" | sed -e "s#\~#$HOME#g"
-+ echo "$1" | gsed -e "s#\~#$HOME#g"
- else
- echo "$1"
- fi
-@@ -784,15 +784,15 @@
- _static=yes
- ;;
- --includes=*)
-- _inc_extra="-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` $_inc_extra"
-+ _inc_extra="-I`echo $ac_option | cut -d '=' -f 2 | gsed 's,:, -I,g'` $_inc_extra"
- INCLUDES="$INCLUDES $_inc_extra"
- ;;
- --libs=*)
-- _ld_extra="-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` $_ld_extra"
-+ _ld_extra="-L`echo $ac_option | cut -d '=' -f 2 | gsed 's,:, -L,g'` $_ld_extra"
- LINKFLAGS="$_ld_extra $LINKFLAGS "
- ;;
- --install-path=*)
-- _install=$(mangle_homedir_tilde "`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`/install")
-+ _install=$(mangle_homedir_tilde "`echo $ac_option | cut -d '=' -f 2 | gsed 's/\/$//'`/install")
- ;;
- --disable-mindy) _mindy=no ;;
- --enable-mindy) _mindy=yes ;;
-@@ -933,7 +933,7 @@
- i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
- ia64) host_arch=ia64 ;;
- x86_64|amd64)
-- if [ -n "`$COMP_C -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
-+ if [ -n "`$COMP_C -dumpmachine | gsed -n '/^x86_64-/p;/^amd64-/p'`" -a \
- -z "`echo $COMPFLAGS_C | grep -- -m32`" ]; then
- host_arch=x86_64
- else
-@@ -1345,7 +1345,7 @@
-
- exts=`$_cpuinfo | egrep 'features|flags' | cut -d ':' -f 2 | _head 1`
-
-- pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
-+ pparam=`echo $exts | gsed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
- -e s/xmm/sse/ -e s/kni/sse/`
-
- for ext in $pparam ; do
-@@ -1703,7 +1703,7 @@
- fi
- ;;
- Darwin)
-- proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'`
-+ proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | gsed 's/ppc//'`
- if [ `sysctl -n hw.vectorunit` -eq 1 -o \
- "`sysctl -n hw.optional.altivec 2> /dev/null`" = "1" ]; then
- _altivec=yes
-@@ -1722,7 +1722,7 @@
- esac
- ;;
- AIX)
-- proc=`$_cpuinfo | grep 'type' | cut -f 2 -d ' ' | sed 's/PowerPC_//'`
-+ proc=`$_cpuinfo | grep 'type' | cut -f 2 -d ' ' | gsed 's/PowerPC_//'`
- ;;
- esac
- if test "$_altivec" = yes; then
-@@ -2048,7 +2048,7 @@
-
- if darwin
- then
-- if ! sed --version | grep -q "GNU sed"
-+ if ! gsed --version | grep -q "GNU sed"
- then
- SEDMI='sed -i ""'
- fi
-@@ -2382,7 +2382,7 @@
- if linux
- then
- CPLEXVER=`echo $CPLEXVER | cut -f 1 -d '.'``echo $CPLEXVER | cut -f 2 -d '.' | cut -c 1`
-- CPLEXPATH=`env | grep ^ILOG_LICENSE_FILE | cut -f 2 -d '=' | sed 's/ilog.*$/ilog/'`/cplex$CPLEXVER
-+ CPLEXPATH=`env | grep ^ILOG_LICENSE_FILE | cut -f 2 -d '=' | gsed 's/ilog.*$/ilog/'`/cplex$CPLEXVER
- if x86
- then
- for cpx_path in "$CPLEXPATH/lib/i86_linux2_glibc2.3_gcc3.2/static_pic" \
-@@ -2667,7 +2667,7 @@
- then
- echores `cat matlab_version.txt`
- matlab.exe /nosplash /minimize /r "system('env > matlab_path.txt');quit"
-- MATLAB_DIR=`grep '^_=' matlab_path.txt | cut -c 3- | sed 's#/bin/win32/matlab.exe##'`
-+ MATLAB_DIR=`grep '^_=' matlab_path.txt | cut -c 3- | gsed 's#/bin/win32/matlab.exe##'`
- MATLAB_SRCDIR="$MATLAB_DIR/extern/src"
- MATLAB_INCDIR="$MATLAB_DIR/extern/include"
- MATLAB_LIBDIR="$MATLAB_DIR/extern/lib"
-@@ -2830,7 +2830,7 @@
- PARTS="$PARTS elwms"
- DEFINES_ELWMS="-DHAVE_ELWMS -DR_HOME_ENV=\\\"${R_HOME}\\\" -DLIBPYTHON=\\\"libpython${PYVER}.${EXT_LIB}\\\" $DEFINES_PYTHON $DEFINES_R $DEFINES_MATLAB $DEFINES_OCTAVE"
- INCLUDES_ELWMS="$INCLUDES_R $INCLUDES_PYTHON $INCLUDES_OCTAVE $INCLUDES_MATLAB "
-- LINKFLAGS_ELWMS="$LINKFLAGS_PYTHON `echo $LINKFLAGS_R | sed 's/-dynamiclib//g'` `echo $LINKFLAGS_MATLAB | sed 's/-Wl,--version-script,.*mexFunction.map / /g'` $LINKFLAGS_OCTAVE -ldl"
-+ LINKFLAGS_ELWMS="$LINKFLAGS_PYTHON `echo $LINKFLAGS_R | gsed 's/-dynamiclib//g'` `echo $LINKFLAGS_MATLAB | gsed 's/-Wl,--version-script,.*mexFunction.map / /g'` $LINKFLAGS_OCTAVE -ldl"
-
- ELWMS_TARGET="elwms.so"
- fi
-@@ -3144,7 +3144,7 @@
-
- if win32
- then
-- RPATH=$(cygpath -u $(cygpath -d "`which R | sed 's#/bin/R##'`"))
-+ RPATH=$(cygpath -u $(cygpath -d "`which R | gsed 's#/bin/R##'`"))
- R_TARGET="sg.dll"
- COMPFLAGS_C_R="$COMPFLAGS_C_R -mno-cygwin"
- COMPFLAGS_CPP_R="$COMPFLAGS_CPP_R -mno-cygwin"
-@@ -3363,9 +3363,9 @@
-
- #enable additional warnings / -Wfloat-equal -W
- if test "$_cc_major" -ge "3" 2>/dev/null ; then
-- COMPFLAGS_C=`echo "$COMPFLAGS_C" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
-- COMPFLAGS_SWIG_CPP=`echo "$COMPFLAGS_CPP" | sed -e 's/-Wall//'`
-- COMPFLAGS_CPP=`echo "$COMPFLAGS_CPP" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
-+ COMPFLAGS_C=`echo "$COMPFLAGS_C" | gsed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
-+ COMPFLAGS_SWIG_CPP=`echo "$COMPFLAGS_CPP" | gsed -e 's/-Wall//'`
-+ COMPFLAGS_CPP=`echo "$COMPFLAGS_CPP" | gsed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
- fi
-
- cat > "$1" <<EOF
-@@ -3623,7 +3623,7 @@
-
- if test "$_cmdline_static" = yes
- then
-- LINKFLAGS_CMDLINE=`echo $LINKFLAGS_CMDLINE | sed 's/-shared/static/g'`
-+ LINKFLAGS_CMDLINE=`echo $LINKFLAGS_CMDLINE | gsed 's/-shared/static/g'`
- fi
-
- if test "$_matlab_static" = yes
Deleted: trunk/dports/math/shogun/files/patch-src-configure.diff
===================================================================
--- trunk/dports/math/shogun/files/patch-src-configure.diff 2009-06-29 01:12:11 UTC (rev 53065)
+++ trunk/dports/math/shogun/files/patch-src-configure.diff 2009-06-29 01:25:54 UTC (rev 53066)
@@ -1,61 +0,0 @@
-diff -Naur configure configure
---- configure 2008-11-25 20:28:41.000000000 -0800
-+++ configure 2009-01-12 07:53:52.000000000 -0800
-@@ -5,7 +5,7 @@
- [ -n "$VERSION" ] && echo "Running configure for SHOGUN version $VERSION"
-
- # some hopefully reasonable defaults
--MAKEDEPEND="gcc -MM"
-+MAKEDEPEND="@PREFIX@/bin/gcc-mp-4.3 -MM"
- MAKEDEPENDOPTS=""
- SRCDIR="`dirname $0`"
- EXT_SRC_HEADER=h
-@@ -63,7 +63,7 @@
- _hmmdebug=no
- _pathdebug=no
- _profile=no
--_prefix="/usr/local"
-+_prefix="@PREFIX@"
- _destdir="/"
- _bindir=""
- _datadir=""
-@@ -385,8 +385,8 @@
- if test -f "$TMPO"
- then
- echo >> "$TMPLOG"
-- echo "ldd $TMPO" >> "$TMPLOG"
-- ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1
-+ echo "otool -L $TMPO" >> "$TMPLOG"
-+ ( otool -L "$TMPO" ) >> "$TMPLOG" 2>&1
- else
- echo "no object file created" >> "$TMPLOG"
- fi
-@@ -405,8 +405,8 @@
- if test -f "$TMPO"
- then
- echo >> "$TMPLOG"
-- echo "ldd $TMPO" >> "$TMPLOG"
-- ( ldd "$TMPO" ) >> "$TMPLOG" 2>&1
-+ echo "otool -L $TMPO" >> "$TMPLOG"
-+ ( otool -L "$TMPO" ) >> "$TMPLOG" 2>&1
- else
- echo "no object file created" >> "$TMPLOG"
- fi
-@@ -2391,7 +2391,7 @@
- LINKFLAGS="-bundle -Wl,-flat_namespace -L`octave-config -p OCTLIBDIR` -loctinterp -loctave -lcruft $LINKFLAGS"
- else
- OCTLIBDIR=`octave-config -p OCTLIBDIR`
-- LINKFLAGS="-shared -L $OCTLIBDIR -loctinterp -loctave -lcruft $LINKFLAGS"
-+ LINKFLAGS="-shared -L$OCTLIBDIR -loctinterp -loctave -lcruft $LINKFLAGS"
- fi
- TARGET="sg.oct"
- INCLUDES="$INCLUDES -I`octave-config -p OCTINCLUDEDIR` -I`octave-config -p INCLUDEDIR`"
-@@ -2667,7 +2667,7 @@
- }
- EOF
- echocheck "lpsolve Developer Files"
-- LPSOLVELINKFLAGS="-L /usr/lib/lp_solve -llpsolve55"
-+ LPSOLVELINKFLAGS="-L at PREFIX@/lib/ -llpsolve55"
- if cc_check $LPSOLVELINKFLAGS
- then
- echores "yes"
Added: trunk/dports/math/shogun/files/patch-src-configure.diff
===================================================================
--- trunk/dports/math/shogun/files/patch-src-configure.diff (rev 0)
+++ trunk/dports/math/shogun/files/patch-src-configure.diff 2009-06-29 01:25:54 UTC (rev 53066)
@@ -0,0 +1,180 @@
+--- configure.old 2009-06-28 17:53:52.000000000 -0700
++++ configure 2009-06-28 17:54:01.000000000 -0700
+@@ -99,8 +99,8 @@
+ _octave_modular=auto
+ _r_modular=no
+
+-test -z "$INCLUDES" || _inc_extra="-I`echo $INCLUDES | sed 's,:, -I,g'`"
+-test -z "$LIBS" || _ld_extra="-L`echo $LIBS | sed 's,:, -L,g'`"
++test -z "$INCLUDES" || _inc_extra="-I`echo $INCLUDES | gsed 's,:, -I,g'`"
++test -z "$LIBS" || _ld_extra="-L`echo $LIBS | gsed 's,:, -L,g'`"
+
+ # these ones will be autodetected
+ CONFIGURE_OPTIONS="configure options $@"
+@@ -110,7 +110,7 @@
+ COMP_NOOPTS="-g -Wall -O2"
+ COMPFLAGS_C=-fPIC
+ COMPFLAGS_CPP=-fPIC
+-SEDMI='sed -i'
++SEDMI='gsed -i'
+ test "$CFLAGS" && COMPFLAGS_C="$COMPFLAGS_C $CFLAGS"
+ test "$CXXFLAGS" && COMPFLAGS_CPP="$COMPFLAGS_CPP $CXXFLAGS"
+ INCLUDES=
+@@ -599,7 +599,7 @@
+ mangle_homedir_tilde() {
+ if test `echo "$1" | cut -c 1` = '~'
+ then
+- echo "$1" | sed -e "s#\~#$HOME#g"
++ echo "$1" | gsed -e "s#\~#$HOME#g"
+ else
+ echo "$1"
+ fi
+@@ -784,15 +784,15 @@
+ _static=yes
+ ;;
+ --includes=*)
+- _inc_extra="-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` $_inc_extra"
++ _inc_extra="-I`echo $ac_option | cut -d '=' -f 2 | gsed 's,:, -I,g'` $_inc_extra"
+ INCLUDES="$INCLUDES $_inc_extra"
+ ;;
+ --libs=*)
+- _ld_extra="-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` $_ld_extra"
++ _ld_extra="-L`echo $ac_option | cut -d '=' -f 2 | gsed 's,:, -L,g'` $_ld_extra"
+ LINKFLAGS="$_ld_extra $LINKFLAGS "
+ ;;
+ --install-path=*)
+- _install=$(mangle_homedir_tilde "`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`/install")
++ _install=$(mangle_homedir_tilde "`echo $ac_option | cut -d '=' -f 2 | gsed 's/\/$//'`/install")
+ ;;
+ --disable-mindy) _mindy=no ;;
+ --enable-mindy) _mindy=yes ;;
+@@ -933,7 +933,7 @@
+ i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
+ ia64) host_arch=ia64 ;;
+ x86_64|amd64)
+- if [ -n "`$COMP_C -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
++ if [ -n "`$COMP_C -dumpmachine | gsed -n '/^x86_64-/p;/^amd64-/p'`" -a \
+ -z "`echo $COMPFLAGS_C | grep -- -m32`" ]; then
+ host_arch=x86_64
+ else
+@@ -1345,7 +1345,7 @@
+
+ exts=`$_cpuinfo | egrep 'features|flags' | cut -d ':' -f 2 | _head 1`
+
+- pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
++ pparam=`echo $exts | gsed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
+ -e s/xmm/sse/ -e s/kni/sse/`
+
+ for ext in $pparam ; do
+@@ -1703,7 +1703,7 @@
+ fi
+ ;;
+ Darwin)
+- proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'`
++ proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | gsed 's/ppc//'`
+ if [ `sysctl -n hw.vectorunit` -eq 1 -o \
+ "`sysctl -n hw.optional.altivec 2> /dev/null`" = "1" ]; then
+ _altivec=yes
+@@ -1722,7 +1722,7 @@
+ esac
+ ;;
+ AIX)
+- proc=`$_cpuinfo | grep 'type' | cut -f 2 -d ' ' | sed 's/PowerPC_//'`
++ proc=`$_cpuinfo | grep 'type' | cut -f 2 -d ' ' | gsed 's/PowerPC_//'`
+ ;;
+ esac
+ if test "$_altivec" = yes; then
+@@ -2048,7 +2048,7 @@
+
+ if darwin
+ then
+- if ! sed --version | grep -q "GNU sed"
++ if ! gsed --version | grep -q "GNU sed"
+ then
+ SEDMI='sed -i ""'
+ fi
+@@ -2382,7 +2382,7 @@
+ if linux
+ then
+ CPLEXVER=`echo $CPLEXVER | cut -f 1 -d '.'``echo $CPLEXVER | cut -f 2 -d '.' | cut -c 1`
+- CPLEXPATH=`env | grep ^ILOG_LICENSE_FILE | cut -f 2 -d '=' | sed 's/ilog.*$/ilog/'`/cplex$CPLEXVER
++ CPLEXPATH=`env | grep ^ILOG_LICENSE_FILE | cut -f 2 -d '=' | gsed 's/ilog.*$/ilog/'`/cplex$CPLEXVER
+ if x86
+ then
+ for cpx_path in "$CPLEXPATH/lib/i86_linux2_glibc2.3_gcc3.2/static_pic" \
+@@ -2667,7 +2667,7 @@
+ then
+ echores `cat matlab_version.txt`
+ matlab.exe /nosplash /minimize /r "system('env > matlab_path.txt');quit"
+- MATLAB_DIR=`grep '^_=' matlab_path.txt | cut -c 3- | sed 's#/bin/win32/matlab.exe##'`
++ MATLAB_DIR=`grep '^_=' matlab_path.txt | cut -c 3- | gsed 's#/bin/win32/matlab.exe##'`
+ MATLAB_SRCDIR="$MATLAB_DIR/extern/src"
+ MATLAB_INCDIR="$MATLAB_DIR/extern/include"
+ MATLAB_LIBDIR="$MATLAB_DIR/extern/lib"
+@@ -2830,7 +2830,7 @@
+ PARTS="$PARTS elwms"
+ DEFINES_ELWMS="-DHAVE_ELWMS -DR_HOME_ENV=\\\"${R_HOME}\\\" -DLIBPYTHON=\\\"libpython${PYVER}.${EXT_LIB}\\\" $DEFINES_PYTHON $DEFINES_R $DEFINES_MATLAB $DEFINES_OCTAVE"
+ INCLUDES_ELWMS="$INCLUDES_R $INCLUDES_PYTHON $INCLUDES_OCTAVE $INCLUDES_MATLAB "
+- LINKFLAGS_ELWMS="$LINKFLAGS_PYTHON `echo $LINKFLAGS_R | sed 's/-dynamiclib//g'` `echo $LINKFLAGS_MATLAB | sed 's/-Wl,--version-script,.*mexFunction.map / /g'` $LINKFLAGS_OCTAVE -ldl"
++ LINKFLAGS_ELWMS="$LINKFLAGS_PYTHON `echo $LINKFLAGS_R | gsed 's/-dynamiclib//g'` `echo $LINKFLAGS_MATLAB | gsed 's/-Wl,--version-script,.*mexFunction.map / /g'` $LINKFLAGS_OCTAVE -ldl"
+
+ ELWMS_TARGET="elwms.so"
+ fi
+@@ -3144,7 +3144,7 @@
+
+ if win32
+ then
+- RPATH=$(cygpath -u $(cygpath -d "`which R | sed 's#/bin/R##'`"))
++ RPATH=$(cygpath -u $(cygpath -d "`which R | gsed 's#/bin/R##'`"))
+ R_TARGET="sg.dll"
+ COMPFLAGS_C_R="$COMPFLAGS_C_R -mno-cygwin"
+ COMPFLAGS_CPP_R="$COMPFLAGS_CPP_R -mno-cygwin"
+@@ -3252,8 +3252,11 @@
+ fi
+ fi
+ fi
+-
+- POSTLINKFLAGS_LIBSHOGUN="-fPIC ${SONAMEOPT}${LIBSHOGUN_SONAME} ${SHAREDOPTS}"
++ if darwin; then
++ POSTLINKFLAGS_LIBSHOGUN="-fPIC ${SONAMEOPT} @@PREFIX@@/lib/${LIBSHOGUN_SONAME} ${SHAREDOPTS}"
++ else
++ POSTLINKFLAGS_LIBSHOGUN="-fPIC ${SONAMEOPT}${LIBSHOGUN_SONAME} ${SHAREDOPTS}"
++ fi
+ }
+
+ test_libshogunui()
+@@ -3315,7 +3318,11 @@
+ fi
+ fi
+ fi
+- POSTLINKFLAGS_LIBSHOGUNUI="-fPIC ${SONAMEOPT}${LIBSHOGUNUI_SONAME} ${SHAREDOPTS}"
++ if darwin; then
++ POSTLINKFLAGS_LIBSHOGUNUI="-fPIC ${SONAMEOPT} @@PREFIX@@/lib/${LIBSHOGUNUI_SONAME} ${SHAREDOPTS}"
++ else
++ POSTLINKFLAGS_LIBSHOGUNUI="-fPIC ${SONAMEOPT}${LIBSHOGUNUI_SONAME} ${SHAREDOPTS}"
++ fi
+ }
+
+ test_cmdline()
+@@ -3363,9 +3370,9 @@
+
+ #enable additional warnings / -Wfloat-equal -W
+ if test "$_cc_major" -ge "3" 2>/dev/null ; then
+- COMPFLAGS_C=`echo "$COMPFLAGS_C" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
+- COMPFLAGS_SWIG_CPP=`echo "$COMPFLAGS_CPP" | sed -e 's/-Wall//'`
+- COMPFLAGS_CPP=`echo "$COMPFLAGS_CPP" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
++ COMPFLAGS_C=`echo "$COMPFLAGS_C" | gsed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
++ COMPFLAGS_SWIG_CPP=`echo "$COMPFLAGS_CPP" | gsed -e 's/-Wall//'`
++ COMPFLAGS_CPP=`echo "$COMPFLAGS_CPP" | gsed -e 's/\(-Wall\)/\1 -Wno-unused-parameter -Wformat -Wformat-security -Wimplicit -Wparentheses -Wshadow/'`
+ fi
+
+ cat > "$1" <<EOF
+@@ -3623,7 +3630,7 @@
+
+ if test "$_cmdline_static" = yes
+ then
+- LINKFLAGS_CMDLINE=`echo $LINKFLAGS_CMDLINE | sed 's/-shared/static/g'`
++ LINKFLAGS_CMDLINE=`echo $LINKFLAGS_CMDLINE | gsed 's/-shared/static/g'`
+ fi
+
+ if test "$_matlab_static" = yes
Deleted: trunk/dports/math/shogun/files/patch-src-lib-lapack.cpp.diff
===================================================================
--- trunk/dports/math/shogun/files/patch-src-lib-lapack.cpp.diff 2009-06-29 01:12:11 UTC (rev 53065)
+++ trunk/dports/math/shogun/files/patch-src-lib-lapack.cpp.diff 2009-06-29 01:25:54 UTC (rev 53066)
@@ -1,11 +0,0 @@
---- lib/lapack.cpp.old 2009-01-24 16:23:26.000000000 -0800
-+++ lib/lapack.cpp 2009-01-24 16:23:39.000000000 -0800
-@@ -18,7 +18,7 @@
- #include "lib/common.h"
- #include "lib/io.h"
-
--#if defined(HAVE_MKL) || defined(HAVE_ACML) || defined(DARWIN)
-+#if defined(HAVE_MKL) || defined(HAVE_ACML)
- #define DSYEV dsyev
- #define DGESVD dgesvd
- #define DPOSV dposv
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090628/47d0b9f2/attachment-0001.html>
More information about the macports-changes
mailing list