diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile index 8c3718e9b71..8e4f540bff2 100755 --- a/print/texlive/base/Makefile +++ b/print/texlive/base/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.12 2008/10/29 09:26:20 steven Exp $ +# $OpenBSD: Makefile,v 1.13 2008/11/03 21:30:53 steven Exp $ COMMENT = base binaries for TeXLive typesetting distribution DIST_V = 20080816 DISTNAME = texlive-${DIST_V}-source -PKGNAME = texlive_base-${V} +PKGNAME = texlive_base-${V}p0 SHARED_LIBS = kpathsea 1.0 WANTLIB = m X11 ICE freetype Xt pthread c Xext fontconfig \ diff --git a/print/texlive/base/patches/patch-texk_web2c_configure b/print/texlive/base/patches/patch-texk_web2c_configure index c870171e6d5..5edfb828019 100644 --- a/print/texlive/base/patches/patch-texk_web2c_configure +++ b/print/texlive/base/patches/patch-texk_web2c_configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-texk_web2c_configure,v 1.1 2008/10/21 20:57:57 steven Exp $ ---- texk/web2c/configure.orig Tue Jul 8 19:21:45 2008 -+++ texk/web2c/configure Sun Aug 24 12:28:30 2008 +$OpenBSD: patch-texk_web2c_configure,v 1.2 2008/11/03 21:30:53 steven Exp $ +--- texk/web2c/configure.orig Tue Jul 8 20:21:45 2008 ++++ texk/web2c/configure Wed Oct 29 14:47:58 2008 @@ -6608,7 +6608,7 @@ else if test "$with_system_freetype2" = yes; then @@ -10,3 +10,22 @@ $OpenBSD: patch-texk_web2c_configure,v 1.1 2008/10/21 20:57:57 steven Exp $ fi if test "x$with_freetype2_include" != x; then EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2" +@@ -8144,6 +8144,9 @@ EOF + done + fi + ++# disable this static linking hack for libstdc++ ++cpp_link_hack=false ++ + if $cpp_link_hack; then + CXXLDEXTRA=$flags + CXXHACKLINK='$(cxx_link_command)' +@@ -8824,7 +8827,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + case "${host}" in + *-*-*bsd*) + if test "x$PTHREAD_LIBS" = "x"; then +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi ;; + esac +