Make sure vim-share do not link with X

Also avoid installing language manpages for xxd, to fix PLIST

3 files changed, 38 insertions, 9 deletions

diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index af58edd0b6c..8a3909440f4 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/05/09 06:36:48 martti Exp $
+# $NetBSD: Makefile,v 1.22 2006/05/10 13:27:43 tonio Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -8,6 +8,7 @@ COMMENT=		Data files for the vim editor (vi clone)
 .include		"Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-gui
+CONFIGURE_ARGS+=	--without-x
 
 BUILD_TARGET=		vim
 INSTALL_TARGET=		installruntime installmacros installtutor installtools
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 2c9f912e6ea..40a01c37ce8 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2006/05/09 06:36:48 martti Exp $
+$NetBSD: distinfo,v 1.46 2006/05/10 13:27:43 tonio Exp $
 
 SHA1 (vim/vim-7.0.tar.bz2) = 38ef48cabf942d0dc804a794dcc6f002b9457fc8
 RMD160 (vim/vim-7.0.tar.bz2) = 5c0d6f2dbd0382a432781fe6cb224028cbb783de
@@ -8,5 +8,5 @@ RMD160 (vim/vim-7.0-lang.tar.gz) = 954a098f2f513ccdda96fdfcd043a737e52a5366
 Size (vim/vim-7.0-lang.tar.gz) = 1180240 bytes
 SHA1 (patch-aa) = 6490dce35e099967272a84dd96b16cc3db0b4d53
 SHA1 (patch-ab) = 1ee4f14cb6c73743704d2dd2631cb3ca48f0303e
-SHA1 (patch-ad) = be66a25349341d3a538306a0a06991f0e9d850a0
+SHA1 (patch-ad) = 1f83cdb17f7ce367d9ae3358db7370065ab76435
 SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 1fda5d0cba3..f9ccf7fecca 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2006/05/09 06:36:48 martti Exp $
+$NetBSD: patch-ad,v 1.10 2006/05/10 13:27:43 tonio Exp $
 
---- src/Makefile.orig	2006-05-07 16:25:27.000000000 +0300
-+++ src/Makefile	2006-05-08 10:01:00.000000000 +0300
-@@ -1131,26 +1131,31 @@
+--- src/Makefile.orig	2006-05-07 15:25:27.000000000 +0200
++++ src/Makefile
+@@ -1131,26 +1131,31 @@ MOTIF_BUNDLE	=
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -42,7 +42,7 @@ $NetBSD: patch-ad,v 1.9 2006/05/09 06:36:48 martti Exp $
  ATHENA_LIBS2	= -lXt
  ATHENA_INSTALL  = install_normal
  ATHENA_TARGETS	= installglinks
-@@ -1773,7 +1778,7 @@
+@@ -1773,7 +1778,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
  	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
  	@echo generating help tags
  # Generate the help tags with ":helptags" to handle all languages.
@@ -51,7 +51,7 @@ $NetBSD: patch-ad,v 1.9 2006/05/09 06:36:48 martti Exp $
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -1897,7 +1902,7 @@
+@@ -1897,24 +1902,24 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
  	-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
@@ -60,3 +60,31 @@ $NetBSD: patch-ad,v 1.9 2006/05/09 06:36:48 martti Exp $
  		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)/*`
+ 
+ # install the language specific files for tools, if they were unpacked
+ install-tool-languages:
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
+ 
+ # install the language specific files, if they were unpacked
+ install-languages: languages $(DEST_LANG) $(DEST_KMAP)