diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 96908ffd0d2..b0b552e0c36 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.16 2009/06/25 00:11:19 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2010/03/26 12:00:17 espie Exp $ COMMENT= environment for rapid engineering and scientific processing V= 3.6 DISTNAME= FreeMat-${V} -PKGNAME= freemat-${V}p0 +PKGNAME= freemat-${V}p1 CATEGORIES= graphics math diff --git a/math/freemat/patches/patch-configure_in b/math/freemat/patches/patch-configure_in index 1a3c39ba60e..8f4a06af80a 100644 --- a/math/freemat/patches/patch-configure_in +++ b/math/freemat/patches/patch-configure_in @@ -1,15 +1,15 @@ -$OpenBSD: patch-configure_in,v 1.3 2009/06/25 00:11:19 sthen Exp $ +$OpenBSD: patch-configure_in,v 1.4 2010/03/26 12:00:17 espie Exp $ XXX workaround until qt4 pkg-config can be fixed. ---- configure.in.orig Thu Jun 25 00:49:09 2009 -+++ configure.in Thu Jun 25 00:49:21 2009 +--- configure.in.orig Fri Mar 14 16:43:34 2008 ++++ configure.in Fri Mar 26 12:25:39 2010 @@ -63,7 +63,7 @@ if (test "$cross_compiling" = "no") && (test "$is_mac" is_win32="false" platform="--linux" MP_WITH_CURSES - LIBS="$LIBS $CURSES_LIB $FLIBS $QT_LIBS" -+ LIBS="$LIBS $CURSES_LIB $FLIBS $QT_LIBS -pthread" ++ LIBS="$LIBS $CURSES_LIB $FLIBS $QT_LIBS -lGLU -pthread" fi if (test "$cross_compiling" = "yes"); then diff --git a/math/freemat/patches/patch-libs_libCore_Makefile_in b/math/freemat/patches/patch-libs_libCore_Makefile_in new file mode 100644 index 00000000000..cc7b46228b9 --- /dev/null +++ b/math/freemat/patches/patch-libs_libCore_Makefile_in @@ -0,0 +1,20 @@ +$OpenBSD: patch-libs_libCore_Makefile_in,v 1.4 2010/03/26 12:00:17 espie Exp $ +--- libs/libCore/Makefile.in.orig Fri Mar 14 16:48:05 2008 ++++ libs/libCore/Makefile.in Fri Mar 26 12:00:26 2010 +@@ -316,12 +316,14 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpwidget.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpwidget.moc.Po@am__quote@ + ++CXXFLAGS_Analyze.cpp = -O1 ++ + .cpp.o: +-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) $(CXXFLAGS_$<) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) $(CXXFLAGS_$<) -c -o $@ $< + + .cpp.obj: + @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`