- Update to 7.4.110

- While I'm here:
  - Remove RELEASE and simplify PATCH_SITES, WRKSRC and _DATADIR
  - Simplify Makefile
  - Remove contiguous blank lines

Changes:	https://code.google.com/p/vim/source/list
PR:		ports/183076
Submitted by:	Rick van der Zwet <info@rickvanderzwet.nl>

editors/vim-lite/Makefile

@@ -1,14 +1,12 @@
 # Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
 
-LITE=		yes
+PORTREVISION=	0
-
-MASTERDIR=	${.CURDIR}/../vim
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Vi "workalike", with many additional features (Lite package)
 
-PORTREVISION=	2
+LITE=		yes
+MASTERDIR=	${.CURDIR}/../vim
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

editors/vim/Makefile

@@ -1,7 +1,7 @@
 # Created by: David O'Brien <obrien@cs.ucdavis.edu>
 # $FreeBSD$
 
-PORTNAME?=	vim
+PORTNAME=	vim
 #		! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL
 #		! value # is added to BADPATCHES.  Doing otherwise will cause
 #		! PORTEPOCH to be needed, which we do NOT want.
@@ -10,22 +10,22 @@ PORTNAME?=	vim
 #		! Doing so is dis-genuine.  It implies we're at a level we are
 #		! not.  The "PATCHLEVEL" patch needs to apply before bumping
 #		! PATCHLEVEL to that level.
-PATCHLEVEL=	1314
+PATCHLEVEL=	110
-PORTVERSION=	7.3.${PATCHLEVEL}
+PORTVERSION=	7.4.${PATCHLEVEL}
-RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
+PORTREVISION?=	0
-PORTREVISION?=	1
 CATEGORIES?=	editors
-MASTER_SITES=	${MASTER_SITE_VIM}
+MASTER_SITES=	VIM
-DISTFILES=	${RELEASE}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+DIST_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}\
+PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:R}|}\
 		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/obrien/:local
 PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES=	527 780 796 873 890 1104 1111
+BADPATCHES=	# empty
 .for p in ${BADPATCHES}
-PATCHFILES:=	${PATCHFILES:N7.3.${p}}
+PATCHFILES:=	${PATCHFILES:N${PORTVERSION:R}.${p}}
 .endfor
 
 MAINTAINER?=	sunpoet@FreeBSD.org
@@ -51,17 +51,17 @@ CONFLICTS+=	vim*-lite
 
 MAKE_JOBS_UNSAFE=	yes
 USE_BZIP2=	yes
-DIST_SUBDIR=	vim
+WRKSRC=		${WRKDIR}/vim${PORTVERSION:R:S/.//g}/src
-WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
+PATCH_DIST_ARGS=-d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
-PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
 # consider
 #PATCH_DIST_ARGS=	-t
 REINPLACE_ARGS=		-i ""
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
 ALL_TARGET=	#
-_DATADIR=	${RELEASE:S/-//g:S/.//g}
+_DATADIR=	${PORTNAME}${PORTVERSION:R:S/.//g}
 DATADIR=	${PREFIX}/share/vim/${_DATADIR}
 PLIST_SUB=	VIM_VER=${_DATADIR}
+MANLANG=	""
 MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
 MLINKS=		vim.1 rvim.1	vim.1 rview.1
 .if !defined(LITE)
@@ -70,8 +70,8 @@ MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-MANLANG=	"" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
+MANLANG+=	fr.ISO8859-1 fr.UTF-8 it it.ISO8859-1 it.UTF-8 ja pl.ISO8859-2 \
-		fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
+		pl.UTF-8 ru.KOI8-R ru.UTF-8
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
@@ -147,26 +147,24 @@ USE_XORG+=	xt
 . if ${PORT_OPTIONS:MGNOME}
 USE_GNOME=	libgnomeui
 PKGNAMESUFFIX=	-gnome2
-CONF_OPT_GUI="--enable-gui=gnome2"
+CONF_OPT_GUI=	"--enable-gui=gnome2"
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 USE_XORG+=	xt glproto
 . endif
 
 . if ${PORT_OPTIONS:MMOTIF}
 USES+=		motif
-CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\""
+CONF_OPT_GUI=	"--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\""
 MAKE_ARGS+=	MOTIFHOME=${LOCALBASE}
 . endif
 
 .endif
 MAKE_ARGS+=	CONF_OPT_GUI=${CONF_OPT_GUI} ${I18N}
 
-
 .if exists(${LOCALBASE}/lib/libiconv.so)
 USES+=	iconv
 .endif
 
-
 post-patch:
 	@(${FIND} ${WRKSRC}/../runtime/ -name menu\*.vim -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g')

editors/vim/files/patch-configure

@@ -1,6 +1,6 @@
---- auto/configure.orig	2013-07-11 22:23:02.000000000 -0700
+--- auto/configure.orig	2013-10-17 12:11:54.000000000 +0200
-+++ auto/configure	2013-07-11 22:51:08.000000000 -0700
++++ auto/configure	2013-10-17 12:12:56.000000000 +0200
-@@ -855,7 +855,7 @@ pdfdir='${docdir}'
+@@ -858,7 +858,7 @@
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
  localedir='${datarootdir}/locale'
@@ -9,39 +9,49 @@
  
  ac_prev=
  ac_dashdash=
-@@ -4694,7 +4694,7 @@ $as_echo_n "checking Lua version... " >&
+@@ -4739,7 +4739,7 @@
- if test "${vi_cv_version_lua+set}" = set; then :
+ if test "${vi_cv_version_lua_luajit+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--   vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'`
+-   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
-+   vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
++   vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //' | tr d '.'`
  fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5
- $as_echo "$vi_cv_version_lua" >&6; }
+ $as_echo "$vi_cv_version_lua_luajit" >&6; }
-@@ -4728,6 +4728,7 @@ $as_echo "no" >&6; }
+@@ -4793,7 +4793,7 @@
-       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ if test "${vi_cv_version_plain_lua+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
++   vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //' | tr -d '.'`
  fi
-     LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5
+ $as_echo "$vi_cv_version_plain_lua" >&6; }
+@@ -4884,7 +4884,7 @@
+       LIBS=$libs_save
+     fi
+     if test "x$lua_ok" = "xyes"; then
+-      LUA_CFLAGS="-I${vi_cv_path_lua_pfx}/include${LUA_INC}"
 +      LUA_CFLAGS="-I${LUA_INCDIR}"
        LUA_SRC="if_lua.c"
        LUA_OBJ="objects/if_lua.o"
        LUA_PRO="if_lua.pro"
-@@ -4759,7 +4760,8 @@ $as_echo "no" >&6; }
+@@ -4941,7 +4941,8 @@
        $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
  
        LUA_LIBS=""
 -      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
 +      vi_cv_version_lua=${LUA_VER}
-+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so.$LUA_VER_SH\\\" $LUA_CFLAGS"
++      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}\\\" $LUA_CFLAGS"
      fi
-   fi
+     if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
-   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
+        test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
-@@ -6285,7 +6287,7 @@ $as_echo_n "checking for location of tcl
+@@ -6610,7 +6611,7 @@
  $as_echo "$try/tclConfig.sh" >&6; }
  	    . $try/tclConfig.sh
  	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
 -	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
-+	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\ /g'`
++	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
  	    break
  	  fi
  	done