summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-10-28 01:20:33 +0000
committerjoerg <joerg@pkgsrc.org>2009-10-28 01:20:33 +0000
commitf680b3f599d176fd4c9e31115f7d6a76c70121bc (patch)
treea2d808e7b3b92fcb20ca31053e669522108b40fd /editors
parent68cb6c1ec406f28be77d1806ea98641c199a8526 (diff)
downloadpkgsrc-f680b3f599d176fd4c9e31115f7d6a76c70121bc.tar.gz
Don't leak the .buildlink directory into the final binary for vim-motif.
Bump revision.
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-motif/Makefile8
-rw-r--r--editors/vim-share/distinfo4
-rw-r--r--editors/vim-share/patches/patch-aa4
3 files changed, 8 insertions, 8 deletions
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 8938de9430a..00f9b69d35b 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2008/03/11 10:55:03 martti Exp $
+# $NetBSD: Makefile,v 1.29 2009/10/28 01:20:33 joerg Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-#PKGREVISION= 1
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 Motif GUI
@@ -16,8 +16,8 @@ CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
CONFIGURE_ARGS+= --enable-gui=motif
CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
-CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
-MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+CONFIGURE_ENV+= MOTIFBASE=${MOTIFBASE:Q}
+MAKE_ENV+= MOTIFBASE=${MOTIFBASE:Q}
BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 9b8aaae4418..53b4daa1588 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.116 2009/09/21 17:35:55 martti Exp $
+$NetBSD: distinfo,v 1.117 2009/10/28 01:20:33 joerg Exp $
SHA1 (vim7.2/7.2.001-100.gz) = 36c684cca2e78243bc7f0d3418eee8228fad8ec5
RMD160 (vim7.2/7.2.001-100.gz) = 22df0a2380e486b83ef7406ef684e4ae2125fbba
@@ -201,7 +201,7 @@ Size (vim7.2/vim-7.2-lang.tar.gz) = 1365638 bytes
SHA1 (vim7.2/vim-7.2.tar.bz2) = a4b6641ca528fada71ea77c998a441495ed4984c
RMD160 (vim7.2/vim-7.2.tar.bz2) = eaff64d0fec09d725addf8de569f508b80a5766e
Size (vim7.2/vim-7.2.tar.bz2) = 7203291 bytes
-SHA1 (patch-aa) = ce047db2552b9b2757766dcf45246f1ee43553c7
+SHA1 (patch-aa) = fd0f0e5df1ed3df15eced39009689bc1a8664a43
SHA1 (patch-ab) = 6d27ed09cb741313e57b3550e62977797f7b285e
SHA1 (patch-ad) = c75cdf6f60781a9827a8fce06704dd75ada26a9b
SHA1 (patch-af) = 0b43a34040bd0ce29f358119b2eaa777914ed6b6
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
index 7aac4a53b4f..2409ef21605 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.15 2008/08/11 12:14:10 martti Exp $
+$NetBSD: patch-aa,v 1.16 2009/10/28 01:20:33 joerg Exp $
Buildlink takes care of include files.
@@ -9,7 +9,7 @@ Buildlink takes care of include files.
if test -z "$SKIP_MOTIF"; then
- gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
-+ gui_XXX="${BUILDLINK_DIR}/include"
++ gui_XXX="${MOTIFBASE}/include"
GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
{ $as_echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5