summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-01-30 00:08:57 +0000
committerjmmv <jmmv>2003-01-30 00:08:57 +0000
commitb7ca017fdd29532f86d1d5e004f24420e93732a0 (patch)
treeb08d1fea9d370026d9c26d2be128f4032b6b430d /editors
parent257d78b720662d7484a49616bf54c425a1a86eb9 (diff)
downloadpkgsrc-b7ca017fdd29532f86d1d5e004f24420e93732a0.tar.gz
Make TeXmacs locate guile at runtime by setting the PATH accordingly.
Should fix PR pkg/20094 by Peter Hansen. Bump PKGREVISION.
Diffstat (limited to 'editors')
-rw-r--r--editors/TeXmacs/Makefile15
-rw-r--r--editors/TeXmacs/distinfo3
-rw-r--r--editors/TeXmacs/patches/patch-ac13
3 files changed, 27 insertions, 4 deletions
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 10d5aa4c572..54775f91cea 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/01/07 03:56:23 uebayasi Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/30 00:08:57 jmmv Exp $
DISTNAME= TeXmacs-1.0.1-src
PKGNAME= ${DISTNAME:S/-src//}
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.texmacs.org/pub/TeXmacs/targz/
@@ -25,11 +26,19 @@ PKG_CXXFLAGS= -DPKG_DOCDIR=\"\\\"${PKG_DOCDIR}\\\"\"
CONFIGURE_ENV+= PKG_CXXFLAGS="${PKG_CXXFLAGS}"
CONFIGURE_ENV+= PKG_LDFLAGS="${LDFLAGS}"
-pre-configure:
+post-extract:
${RM} ${WRKSRC}/misc/scripts/tm_axiom
+ ${MV} ${WRKSRC}/misc/scripts/texmacs.in \
+ ${WRKSRC}/misc/scripts/texmacs.in.in
+
+pre-configure:
+ ${SED} -e "s|@PKG_GUILE_PATH@|${GUILE14_PREFIX_DEFAULT}/bin|g" \
+ < ${WRKSRC}/misc/scripts/texmacs.in.in > \
+ ${WRKSRC}/misc/scripts/texmacs.in
post-install:
- ${LN} -s ${PREFIX}/share/doc/TeXmacs ${PREFIX}/share/${PKGNAME}/doc
+ ${LN} -s ${PREFIX}/share/doc/TeXmacs \
+ ${PREFIX}/share/${PKGNAME_NOREV}/doc
.include "../../lang/guile14/buildlink2.mk"
.include "../../mk/texinfo.mk"
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 69e7d8ce56a..6aedde42663 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/12/21 17:05:08 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2003/01/30 00:08:57 jmmv Exp $
SHA1 (TeXmacs-1.0.1-src.tar.gz) = 259ac965044aff2dd0cf37412dbc961e9507c6b3
Size (TeXmacs-1.0.1-src.tar.gz) = 1642354 bytes
SHA1 (patch-aa) = b6b9e9cc0c8d19fad3ae158cf3e6ebd75d58449a
SHA1 (patch-ab) = 13a1c278b404ff5b4ac8b0f9d29eeb344ae958f5
+SHA1 (patch-ac) = 7aadba4283d1ea08d709fda7db71bedf53501b9d
diff --git a/editors/TeXmacs/patches/patch-ac b/editors/TeXmacs/patches/patch-ac
new file mode 100644
index 00000000000..6637b14599a
--- /dev/null
+++ b/editors/TeXmacs/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/01/30 00:08:58 jmmv Exp $
+
+--- misc/scripts/texmacs.in.in.orig Thu Apr 11 15:10:07 2002
++++ misc/scripts/texmacs.in.in
+@@ -12,7 +12,7 @@ else
+ export TEXMACS_BIN_PATH
+ fi
+
+-PATH="$TEXMACS_BIN_PATH/bin:$PATH"
++PATH="@PKG_GUILE_PATH@:$TEXMACS_BIN_PATH/bin:$PATH"
+ @CONFIG_LIB_PATH@="$TEXMACS_BIN_PATH/lib${@CONFIG_LIB_PATH@+":$@CONFIG_LIB_PATH@"}"
+ export PATH @CONFIG_LIB_PATH@
+