Date: Wed, 13 Jan 2021 21:10:22 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561508 - in head/math/oleo: . files Message-ID: <202101132110.10DLAM7Q091280@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Wed Jan 13 21:10:22 2021 New Revision: 561508 URL: https://svnweb.freebsd.org/changeset/ports/561508 Log: - Fix the build when MOTIF is selected; - Register missing dependencies. PR: 251535 Submitted by: Marty Stanquist Added: head/math/oleo/files/patch-configure (contents, props changed) Modified: head/math/oleo/Makefile Modified: head/math/oleo/Makefile ============================================================================== --- head/math/oleo/Makefile Wed Jan 13 20:29:33 2021 (r561507) +++ head/math/oleo/Makefile Wed Jan 13 21:10:22 2021 (r561508) @@ -3,44 +3,52 @@ PORTNAME= oleo PORTVERSION= 1.99.16 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= math MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= GNU spreadsheet for X11 and terminals -LICENSE= GPLv2+ +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libgsl.so:math/gsl + USES= bison:alias localbase ncurses perl5 USE_PERL5= build GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot -CONFIGURE_ENV= CFLAGS=-fwrapv +CONFIGURE_ARGS= --without-xlt --without-sciplot +# With -O2 configure hangs at "checking for working mktime..." +CONFIGURE_ENV= CFLAGS="${CFLAGS:C/-O2//} -fwrapv" MAKE_ARGS+= DESTDIR="${STAGEDIR}" BINARY_ALIAS= makeinfo=false # disable detecting local makeinfo INFO= oleo -OPTIONS_DEFINE= MOTIF NLS +OPTIONS_DEFINE= CUPS MOTIF NLS OPTIONS_SUB= yes +CUPS_LIB_DEPENDS= libcups.so:print/cups + MOTIF_LIB_DEPENDS= libplot.so:graphics/plotutils \ libXbae.so:x11-toolkits/xbae \ - libXmHTML.so:x11-toolkits/xmhtml -MOTIF_USES_OFF= xorg -MOTIF_USES= motif -MOTIF_CONFIGURE_WITH= motif -MOTIF_USE_OFF= XORG=xt,ice,sm + libXmHTML.so:x11-toolkits/xmhtml \ + libpng16.so:graphics/png \ + libXft.so:x11-fonts/libXft \ + libfontconfig.so:x11-fonts/fontconfig +MOTIF_USES= jpeg motif xorg +MOTIF_USE= XORG=ice,sm,x11,xext,xpm,xt +MOTIF_CONFIGURE_WITH= motif x +MOTIF_LIBS= -lXft -lfontconfig NLS_USES= gettext NLS_LIBS= -lintl NLS_CONFIGURE_ENABLE= nls NLS_USES_OFF= gettext-tools -pre-build: +pre-configure: @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' .for pof in en fr nl @@ -50,5 +58,6 @@ pre-build: @${REINPLACE_CMD} -e "s|am: install-docDATA|am:|" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-info-am install-htmlDATA|install-info-am|" \ ${WRKSRC}/doc/Makefile.in + ${REINPLACE_CMD} -e "s|gslblas|gslcblas|" ${WRKSRC}/configure .include <bsd.port.mk> Added: head/math/oleo/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/oleo/files/patch-configure Wed Jan 13 21:10:22 2021 (r561508) @@ -0,0 +1,49 @@ +--- configure.orig 2001-03-10 14:32:48 UTC ++++ configure +@@ -4523,6 +4523,9 @@ LDFLAGS="$X_LIBS $LDFLAGS" + cat > conftest.$ac_ext <<EOF + #line 4525 "configure" + #include "confdefs.h" ++#include <stdio.h> ++#include <X11/Intrinsic.h> ++#include <X11/StringDefs.h> + #include <SciPlot/SciPlot.h> + int main() { + int a; +@@ -4589,7 +4592,7 @@ ice_sciplot_save_CFLAGS="$CFLAGS" + ice_sciplot_save_CPPFLAGS="$CPPFLAGS" + ice_sciplot_save_LDFLAGS="$LDFLAGS" + # +-LIBS="$X_PRE_LIBS -lSciPlot -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" ++LIBS="$X_PRE_LIBS -lsciplot -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" + CPPFLAGS="$X_CFLAGS $CPPFLAGS" + LDFLAGS="$X_LIBS $LDFLAGS" +@@ -4597,6 +4600,9 @@ LDFLAGS="$X_LIBS $LDFLAGS" + cat > conftest.$ac_ext <<EOF + #line 4599 "configure" + #include "confdefs.h" ++#include <stdio.h> ++#include <X11/Intrinsic.h> ++#include <X11/StringDefs.h> + #include <SciPlot/SciPlot.h> + int main() { + SciPlotQuickUpdate(); +@@ -4633,7 +4639,7 @@ for dir in "$x_libraries" "${prefix}/lib" /usr/lib /us + /home/SciPlot*/lib /usr/SciPlot*/lib /opt/SciPlot*/lib \ + "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \ + "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do +-if test -d "$dir" && test "`ls $dir/libSciPlot.* 2> /dev/null`" != ""; then ++if test -d "$dir" && test "`ls $dir/libsciplot.* 2> /dev/null`" != ""; then + ice_cv_sciplot_libraries="$dir" + break + fi +@@ -4657,7 +4663,7 @@ fi + # Provide an easier way to link + # + if test "$sciplot_includes" != "" && test "$sciplot_includes" != "$x_includes" && test "$sciplot_includes" != "none"; then +- link_sciplot="-L$sciplot_libraries -lSciPlot" ++ link_sciplot="-L$sciplot_libraries -lsciplot" + include_sciplot="-I$sciplot_includes" + cat >> confdefs.h <<\EOF + #define HAVE_SciPlot_H 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101132110.10DLAM7Q091280>