[pkgsrc/trunk]: pkgsrc Prevent paths to the build directories from being incl...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47a27a4f108f
branches:  trunk
changeset: 496147:47a27a4f108f
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Thu Jun 23 17:49:40 2005 +0000

description:
Prevent paths to the build directories from being included in the package.
Bump PKGREVISION.

diffstat:

 devel/prcs/Makefile                |   6 +++++-
 editors/vim-share/Makefile         |   6 ++++--
 editors/vim-share/distinfo         |   4 ++--
 editors/vim-share/patches/patch-ad |  30 +++++++++++++++++++++++-------
 4 files changed, 34 insertions(+), 12 deletions(-)

diffs (114 lines):

diff -r 0c7182713ac7 -r 47a27a4f108f devel/prcs/Makefile
--- a/devel/prcs/Makefile       Thu Jun 23 17:15:28 2005 +0000
+++ b/devel/prcs/Makefile       Thu Jun 23 17:49:40 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/03/24 21:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/06/23 17:56:17 kristerw Exp $
 
 DISTNAME=              prcs-1.3.3
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=prcs/}
 
@@ -13,6 +14,9 @@
 INFO_FILES=            prcs.info
 USE_LANGUAGES=         c c++
 CONFIGURE_ENV+=                EMACS=no
+CONFIGURE_ENV+=                ac_cv_path_SYS_TAR_COMMAND_PATH="${TOOLS_TAR}"
+CONFIGURE_ENV+=                ac_cv_path_SYS_LS_COMMAND_PATH="${TOOLS_LS}"
+USE_TOOLS+=            ls tar
 
 GCC_REQD=              3.0
 
diff -r 0c7182713ac7 -r 47a27a4f108f editors/vim-share/Makefile
--- a/editors/vim-share/Makefile        Thu Jun 23 17:15:28 2005 +0000
+++ b/editors/vim-share/Makefile        Thu Jun 23 17:49:40 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/05 09:33:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/23 17:49:40 kristerw Exp $
 
 PKGNAME=               vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=           1
+PKGREVISION=           2
 
 COMMENT=               Data files for the vim editor (vi clone)
 
@@ -10,6 +10,8 @@
 CONFIGURE_ARGS+=       --disable-gui
 
 INSTALL_TARGET=                installruntime installmacros installtutor installtools
+USE_TOOLS+=            awk
+INSTALL_MAKE_FLAGS+=   TOOLS_AWK="${TOOLS_AWK}"
 
 PLIST_SUBST+=          VIM_SUBDIR="${VIM_SUBDIR}"
 
diff -r 0c7182713ac7 -r 47a27a4f108f editors/vim-share/distinfo
--- a/editors/vim-share/distinfo        Thu Jun 23 17:15:28 2005 +0000
+++ b/editors/vim-share/distinfo        Thu Jun 23 17:49:40 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2005/06/05 09:33:33 jmmv Exp $
+$NetBSD: distinfo,v 1.37 2005/06/23 17:49:40 kristerw Exp $
 
 SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
 RMD160 (vim/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
@@ -194,5 +194,5 @@
 Size (vim/6.3.074) = 2365 bytes
 SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
 SHA1 (patch-ab) = cb8930aaeefd1ddbfa204290662078994dd985c0
-SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
+SHA1 (patch-ad) = 7a4eb1027a0018bdda51b1d0de9dfce60794cc02
 SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff -r 0c7182713ac7 -r 47a27a4f108f editors/vim-share/patches/patch-ad
--- a/editors/vim-share/patches/patch-ad        Thu Jun 23 17:15:28 2005 +0000
+++ b/editors/vim-share/patches/patch-ad        Thu Jun 23 17:49:40 2005 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.6 2004/06/21 08:23:48 martti Exp $
+$NetBSD: patch-ad,v 1.7 2005/06/23 17:49:40 kristerw Exp $
 
---- src/Makefile.orig  2004-05-16 13:52:54.000000000 +0000
-+++ src/Makefile       2004-06-11 21:40:33.000000000 +0000
-@@ -1076,3 +1076,3 @@
+--- src//Makefile.orig 2004-06-07 12:03:56.000000000 +0200
++++ src//Makefile      2005-06-23 19:43:26.000000000 +0200
+@@ -1074,26 +1074,31 @@
+ ### Athena GUI
+ ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
 -XAW_LIB = -lXaw
 +#XAW_LIB = -lXaw
  
-@@ -1080,8 +1080,11 @@
+ ### When using Xaw3d, uncomment/comment the following lines to also get the
  ### scrollbars from Xaw3d.
 -#ATHENA_SRC   = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
 -#ATHENA_OBJ   = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
@@ -25,13 +27,27 @@
 +                  -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
 +.else
  ATHENA_SRC    = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
-@@ -1092,2 +1095,4 @@
+                       gui_at_sb.c gui_at_fs.c
+ ATHENA_OBJ    = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+                       objects/pty.o objects/gui_beval.o \
+                       objects/gui_at_sb.o objects/gui_at_fs.o
  ATHENA_DEFS   = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
 +.endif # Xaw
 +.endif # defined(XAW_LIB)
  
-@@ -1095,3 +1100,3 @@
+ ATHENA_IPATH  = $(GUI_INC_LOC)
  ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
 -ATHENA_LIBS1  = $(XAW_LIB)
 +ATHENA_LIBS1  = $(LIBXAW)
  ATHENA_LIBS2  = -lXt
+ ATHENA_INSTALL  = install_normal
+ ATHENA_TARGETS        = installglinks
+@@ -1779,7 +1784,7 @@
+       -chmod $(FILEMOD) $(DEST_TOOLS)/*
+ # replace the path in some tools
+       perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
+-      awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
++      awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+               awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+               awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
+       -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`