summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-08-17 11:18:57 +0000
committerrecht <recht@pkgsrc.org>2004-08-17 11:18:57 +0000
commitf05af955b8f60106bc0681b77cd56857d0219b71 (patch)
tree5ee5743a676910a2c2c660f43ca4ae94124f74d1 /editors
parent4f1bdafe8c8892d71d69b26b25612362a98d30eb (diff)
downloadpkgsrc-f05af955b8f60106bc0681b77cd56857d0219b71.tar.gz
update to TeXmacs-1.0.4-R2
Changes: This is a bug-fix only release. Changes to the pkg: Correctly pass LDFLAGS, so the rpath won't get lost.
Diffstat (limited to 'editors')
-rw-r--r--editors/TeXmacs/Makefile8
-rw-r--r--editors/TeXmacs/distinfo9
-rw-r--r--editors/TeXmacs/patches/patch-ab32
3 files changed, 24 insertions, 25 deletions
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 249c3a9ec38..efd2c38e1c2 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2004/07/28 10:44:56 recht Exp $
+# $NetBSD: Makefile,v 1.34 2004/08/17 11:18:57 recht Exp $
-DISTNAME= TeXmacs-1.0.4-src
-PKGNAME= ${DISTNAME:S/-src//}
+DISTNAME= TeXmacs-1.0.4-R2-src
+PKGNAME= ${DISTNAME:S/-R2-src/.0.2/}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.texmacs.org/pub/TeXmacs/targz/
@@ -18,8 +18,6 @@ USE_GNU_TOOLS+= make
USE_LANGUAGES= c c++
USE_X11= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= PKG_CXXFLAGS=${CXXFLAGS:Q}
-CONFIGURE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q}
PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 8d53a0e2596..e103e2ee2f4 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.22 2004/07/28 10:44:56 recht Exp $
+$NetBSD: distinfo,v 1.23 2004/08/17 11:18:57 recht Exp $
-SHA1 (TeXmacs-1.0.4-src.tar.gz) = 9e50fdc8cbbb0054bdaf3b73a61323999158568b
-Size (TeXmacs-1.0.4-src.tar.gz) = 2572911 bytes
+SHA1 (TeXmacs-1.0.4-R2-src.tar.gz) = d9365c93f8e1ab63b1bacff3b07107502354e170
+Size (TeXmacs-1.0.4-R2-src.tar.gz) = 2588230 bytes
SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
-SHA1 (patch-ab) = d7323e10f07c4262d23f31e1328f1b9dcf31ada7
+SHA1 (patch-ab) = b850446cc987f4f69b0e460b0d3ad70aacc4540f
SHA1 (patch-ac) = 03ca16a943531fe94ba3a6ad5055f92d087a3026
SHA1 (patch-ad) = fb04a607c94d3228bd0f4d70779fc5f7e53a9b8b
SHA1 (patch-ae) = ea2d1cc62f0ecfbc13822091e66ead665f2a105b
SHA1 (patch-af) = c0c7cb96de31282cf68491d9cb1f73d89ded98f6
+SHA1 (patch-ag) = e95353427c7845928820393b555541a90b037e96
SHA1 (patch-ah) = df69f3e574f7851892215a2e830c989498af74f1
diff --git a/editors/TeXmacs/patches/patch-ab b/editors/TeXmacs/patches/patch-ab
index 7e566873a2b..4f8ca0d8126 100644
--- a/editors/TeXmacs/patches/patch-ab
+++ b/editors/TeXmacs/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2004/07/28 10:44:56 recht Exp $
+$NetBSD: patch-ab,v 1.8 2004/08/17 11:18:57 recht Exp $
---- configure.orig 2004-07-28 12:21:22.000000000 +0200
-+++ configure 2004-07-28 12:25:37.000000000 +0200
-@@ -3544,10 +3544,10 @@
- case "$enable_optimize" in
- yes)
- # keep optimization options
-- echo "$ac_t""enabling optimizations, $CONFIG_CXXOPTIMIZE" 1>&6 ;;
-+ echo "$ac_t""enabling optimizations, $CONFIG_CXXOPTIMIZE ${PKG_CXXFLAGS}" 1>&6 ;;
- no-inline)
- optimize_no_inline="-fno-default-inline -fno-inline"
-- CONFIG_CXXOPTIMIZE="$CONFIG_CXXOPTIMIZE $optimize_no_inline"
-+ CONFIG_CXXOPTIMIZE="$CONFIG_CXXOPTIMIZE ${PKG_CXXFLAGS} $optimize_no_inline"
- echo "$ac_t""enabling optimizations, $CONFIG_CXXOPTIMIZE" 1>&6 ;;
- no)
- CONFIG_CXXOPTIMIZE=""
+--- configure.orig 2004-08-03 17:56:28.000000000 +0200
++++ configure 2004-08-17 12:14:25.000000000 +0200
+@@ -5587,9 +5587,9 @@
+ fi
+ fi
+ fi
+-CPPFLAGS=""
+-LDFLAGS=""
+-LIBS=""
++CPPFLAGS="$SAVE_CPPFLAGS"
++LDFLAGS="$SAVE_LDFLAGS"
++LIBS="$SAVE_LIBS"
+
+ #--------------------------------------------------------------------
+ # Disable customized allocator