svn commit: r469170 - in head/math/octave: . files
Stephen Montgomery-Smith
stephen at FreeBSD.org
Sun May 6 00:24:01 UTC 2018
Author: stephen
Date: Sun May 6 00:24:00 2018
New Revision: 469170
URL: https://svnweb.freebsd.org/changeset/ports/469170
Log:
- Fixed error in which -qt4 is passed to QT tools. It should be -qt=qt4.
- Set MKINFO in configure_args so that makeinfo works.
- Since plist changed, bump portrevision.
PR: ports/228004
Submitted by: Robert Cina <transitive at gmail.com>
Modified:
head/math/octave/Makefile
head/math/octave/files/patch-configure
head/math/octave/files/patch-libgnu-math.in.h
head/math/octave/pkg-plist
Modified: head/math/octave/Makefile
==============================================================================
--- head/math/octave/Makefile Sat May 5 22:24:41 2018 (r469169)
+++ head/math/octave/Makefile Sun May 6 00:24:00 2018 (r469170)
@@ -3,6 +3,7 @@
PORTNAME= octave
PORTVERSION= ${OCTAVE_VERSION}
+PORTREVISION= 1
CATEGORIES= math java
MASTER_SITES= GNU
@@ -47,7 +48,7 @@ USE_TEX= dvipsk:build formats:build
GNU_CONFIGURE= yes
USE_JAVA= yes
JAVA_VERSION= 1.7+
-USE_QT4= corelib gui network opengl moc_build qmake_build rcc_build uic_build linguist_build
+USE_QT4= corelib gui network opengl moc_build qmake_build rcc_build uic_build linguist_build help help-tools
USE_XORG= x11 xext xfixes xft
USE_GL= gl glu
@@ -59,12 +60,15 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \
JAVA_HOME=${JAVA_HOME} \
MAKEINFO=${LOCALBASE}/bin/makeinfo \
+ MKINFO=${LOCALBASE}/bin/makeinfo \
+ MOC_QTVER=${LOCALBASE}/bin/moc \
+ UIC_QTVER=${LOCALBASE}/bin/uic \
+ RCC_QTVER=${LOCALBASE}/bin/rcc \
ac_cv_type_max_align_t=yes
CONFIGURE_ARGS= --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
--with-lapack="${LAPACKLIB}" \
--enable-shared \
- --disable-docs \
--disable-jit \
--disable-openmp \
--with-qt=4 \
@@ -88,6 +92,7 @@ post-patch:
${REINPLACE_CMD} 's+lapack lapack_rs6k+${LAPACKLIB:C/-l//}+' ${WRKSRC}/configure
${REINPLACE_CMD} 's+-lumfpack+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure
${REINPLACE_CMD} 's+-lcholmod+-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd ${LAPACKLIB}+' ${WRKSRC}/configure
+ ${REINPLACE_CMD} 's/"-qt$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
post-install:
(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib .)
Modified: head/math/octave/files/patch-configure
==============================================================================
--- head/math/octave/files/patch-configure Sat May 5 22:24:41 2018 (r469169)
+++ head/math/octave/files/patch-configure Sun May 6 00:24:00 2018 (r469170)
@@ -234,47 +234,7 @@
if test $ax_lapack_ok = no; then
save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
-@@ -70670,9 +70670,6 @@ esac
- fi
-
- if test -n "$MOC"; then
-- if test -n "$QTCHOOSER"; then
-- MOCFLAGS="-qt$qt_version"
-- fi
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
- else
- QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
-@@ -70885,9 +70882,6 @@ esac
- fi
-
- if test -n "$UIC"; then
-- if test -n "$QTCHOOSER"; then
-- UICFLAGS="-qt$qt_version"
-- fi
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
- else
- QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
-@@ -71100,9 +71094,6 @@ esac
- fi
-
- if test -n "$RCC"; then
-- if test -n "$QTCHOOSER"; then
-- RCCFLAGS="-qt$qt_version"
-- fi
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
- else
- QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
-@@ -71315,9 +71306,6 @@ esac
- fi
-
- if test -n "$LRELEASE"; then
-- if test -n "$QTCHOOSER"; then
-- LRELEASEFLAGS="-qt$qt_version"
-- fi
- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
- else
- QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
-@@ -73640,7 +73628,7 @@ if test $use_osmesa = yes; then
+@@ -73640,7 +73640,7 @@ if test $use_osmesa = yes; then
warn_osmesa="OSMesa library not found. Offscreen rendering with FLTK will be disabled."
fi
@@ -283,7 +243,7 @@
save_CPPFLAGS="$CPPFLAGS"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
-@@ -75018,7 +75006,7 @@ fi
+@@ -75018,7 +75018,7 @@ fi
;;
yes | "")
ac_octave_cholmod_pkg_check=yes
@@ -292,7 +252,7 @@
;;
-* | */* | *.a | *.so | *.so.* | *.o)
CHOLMOD_LIBS="$with_cholmod"
-@@ -75598,7 +75586,7 @@ fi
+@@ -75598,7 +75598,7 @@ fi
;;
yes | "")
ac_octave_umfpack_pkg_check=yes
@@ -301,7 +261,7 @@
;;
-* | */* | *.a | *.so | *.so.* | *.o)
UMFPACK_LIBS="$with_umfpack"
-@@ -77450,6 +77438,13 @@ $as_echo_n "checking for include file <j
+@@ -77450,6 +77450,13 @@ $as_echo_n "checking for include file <j
JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin"
fi
;;
Modified: head/math/octave/files/patch-libgnu-math.in.h
==============================================================================
--- head/math/octave/files/patch-libgnu-math.in.h Sat May 5 22:24:41 2018 (r469169)
+++ head/math/octave/files/patch-libgnu-math.in.h Sun May 6 00:24:00 2018 (r469170)
@@ -1,8 +1,8 @@
---- libgnu/math.in.h.orig 2017-02-22 18:17:36 UTC
+--- libgnu/math.in.h.orig 2018-04-30 17:03:56 UTC
+++ libgnu/math.in.h
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
-#ifndef _ at GUARD_PREFIX@_MATH_H
+#if 1
Modified: head/math/octave/pkg-plist
==============================================================================
--- head/math/octave/pkg-plist Sat May 5 22:24:41 2018 (r469169)
+++ head/math/octave/pkg-plist Sun May 6 00:24:00 2018 (r469170)
@@ -782,6 +782,10 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/qr.oct
lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symbfact.oct
lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symrcm.oct
libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
+man/man1/mkoctfile.1.gz
+man/man1/octave-cli.1.gz
+man/man1/octave-config.1.gz
+man/man1/octave.1.gz
share/applications/org.octave.Octave.desktop
%%PORTDOCS%%%%DOCSDIR%%/liboctave.ps
%%PORTDOCS%%%%DOCSDIR%%/octave.ps
More information about the svn-ports-head
mailing list