aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2009-07-02 19:07:20 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2009-07-02 19:07:20 +0000
commit3f0791092e8cbdb8f959ad1947b4156bd8b402f6 (patch)
tree4fde4e921bda9f7c2b3fa9037cf01fb25bbdc438 /editors
parent26c647da8a5b1a30a589bdce2fb2d2656e928056 (diff)
downloadports-3f0791092e8cbdb8f959ad1947b4156bd8b402f6.tar.gz
ports-3f0791092e8cbdb8f959ad1947b4156bd8b402f6.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/nvi-devel/Makefile3
-rw-r--r--editors/nvi-devel/files/patch-configure4
2 files changed, 4 insertions, 3 deletions
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 8aa538500f38..5f92239a2fe7 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -30,7 +30,8 @@ MAN1= nex.1 nvi.1 nview.1
# configure is 555, so you can't do a "make configure" as non-root.
post-patch:
- ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/../dist/configure
+ ${REINPLACE_CMD} -e 's,%%LIBTOOL%%,${LIBTOOL},g ; \
+ s,%%LTMAIN%%,${LTMAIN},g' ${WRKSRC}/../dist/configure
@${CHMOD} 755 ${WRKSRC}/../dist/configure
post-install:
diff --git a/editors/nvi-devel/files/patch-configure b/editors/nvi-devel/files/patch-configure
index 58f5c067b47e..6e5eda529975 100644
--- a/editors/nvi-devel/files/patch-configure
+++ b/editors/nvi-devel/files/patch-configure
@@ -5,11 +5,11 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS=" %%LOCALBASE%%share/libtool/ltmain.sh"
++LIBTOOL_DEPS=" %%LTMAIN%%"
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) %%LOCALBASE%%/bin/libtool'
++LIBTOOL='$(SHELL) %%LIBTOOL%%'
# Prevent multiple expansion