- Use USES=iconv unconditionally

- Remove cumbersome do-patch:
  - Use do-patch: in bsd.port.mk
  - Mark 064, 087 and 147 as BADPATCHES
    - 064 does not apply cleanly (in bsd.port.mk way on FreeBSD 9.x or older)
    - 087 contains patch for src/ops.c which must be applied after 064
    - 147 contains patch for src/version.c which must be applied after 087
  - Apply BADPATCHES in post-patch:
- Fix keymap installation for vim-lite
  - Install keymap in vim source
  - Install vietnamese_viscii.vim correctly
- Do not install GUI binary executables and manpages when GUI options are off
- Allow build with python 3.x
- Merge options to Makefile
- Use PORTDATA
- Convert to new options helper
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Use REINPLACE_CMD instead of patch file
- Support STAGEDIR
- Pet portlint
- Cleanup Makefile
- Fix PLIST
- Cosmetic change
- Bump PORTREVISION for dependency and package change

3 files changed, 4 insertions, 81 deletions

diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
deleted file mode 100644
index 546c96742891..000000000000
--- a/editors/vim/files/patch-01
+++ /dev/null
@@ -1,77 +0,0 @@
---- Makefile.orig	Sun Jun  1 06:18:29 2003
-+++ Makefile	Sat Nov  1 15:39:09 2003
-@@ -256,7 +256,7 @@
- #DO NOT CHANGE the next line, we need it for configure to find the compiler
- #instead of using the default from the "make" program.
- #Use a line further down to change the value for CC.
--CC=
-+#CC=
- 
- # Change and use these defines if configure cannot find your Motif stuff.
- # Unfortunately there is no "standard" location for Motif. {{{
-@@ -288,6 +288,7 @@
- # of make, will buid Vim.
- 
- # CONFIGURE - configure arguments {{{1
-+CONF_ARGS = --prefix=$(PREFIX)
- # You can give a lot of options to configure.
- # Change this to your desire and do 'make config' afterwards
- 
-@@ -1829,3 +1830,3 @@ install: $(GUI_INSTALL)
- 
--install_normal: installvim installtools $(INSTALL_LANGS) install-icons
-+install_normal: installvim installtools $(INSTALL_LANGS) # install-icons
- 
-@@ -1794,40 +1795,40 @@
- installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
- 
- $(DEST_BIN)/$(EXTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
-+	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EXTARGET)
- 
- $(DEST_BIN)/$(VIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
-+	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIEWTARGET)
- 
- $(DEST_BIN)/$(GVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMTARGET)
- 
- $(DEST_BIN)/$(GVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIEWTARGET)
- 
- $(DEST_BIN)/$(RVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIMTARGET)
- 
- $(DEST_BIN)/$(RVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIEWTARGET)
- 
- $(DEST_BIN)/$(RGVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIMTARGET)
- 
- $(DEST_BIN)/$(RGVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
- 
- $(DEST_BIN)/$(VIMDIFFTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIMDIFFTARGET)
- 
- $(DEST_BIN)/$(GVIMDIFFTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMDIFFTARGET)
- 
- $(DEST_BIN)/$(EVIMTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIMTARGET)
- 
- $(DEST_BIN)/$(EVIEWTARGET):
--	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
-+	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIEWTARGET)
- 
- # create links for the manual pages with various names to vim.	This is only
- # done when the links (or manpages with the same name) don't exist yet.
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure
index 67f951f5d0e8..1d260f37c11d 100644
--- a/editors/vim/files/patch-configure
+++ b/editors/vim/files/patch-configure
@@ -1,5 +1,5 @@
---- auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
-+++ auto/configure	2013-10-17 12:12:56.000000000 +0200
+--- src/auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
++++ src/auto/configure	2013-10-17 12:12:56.000000000 +0200
 @@ -858,7 +858,7 @@
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
diff --git a/editors/vim/files/patch-installml.sh b/editors/vim/files/patch-installml.sh
index 136015bcec51..8b96642e4d87 100644
--- a/editors/vim/files/patch-installml.sh
+++ b/editors/vim/files/patch-installml.sh
@@ -1,5 +1,5 @@
---- installml.sh.orig	Sun Apr 30 08:48:53 2006
-+++ installml.sh	Mon Jun 19 03:36:37 2006
+--- src/installml.sh.orig	Sun Apr 30 08:48:53 2006
++++ src/installml.sh	Mon Jun 19 03:36:37 2006
 @@ -55,12 +55,12 @@ if test $what = "install" -a \( -f $dest
     # ex
 -   if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then