[Midnightbsd-cvs] mports [20257] trunk/editors/vim: tweak sample file installation for vimrc files

[laffer1 at midnightbsd.org]

Revision: 20257
          http://svnweb.midnightbsd.org/mports/?rev=20257
Author:   laffer1
Date:     2015-09-19 15:26:15 -0400 (Sat, 19 Sep 2015)
Log Message:
-----------
tweak sample file installation for vimrc files

Modified Paths:
--------------
    trunk/editors/vim/Makefile
    trunk/editors/vim/pkg-plist

Modified: trunk/editors/vim/Makefile
===================================================================
--- trunk/editors/vim/Makefile	2015-09-19 19:20:58 UTC (rev 20256)
+++ trunk/editors/vim/Makefile	2015-09-19 19:26:15 UTC (rev 20257)
@@ -2,7 +2,7 @@
 
 PORTNAME=	vim
 PORTVERSION=	7.4.${PATCHLEVEL}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	VIM:source \
 		${MASTER_SITE_VIM:S|unix|patches/${PORTVERSION:R}|}:patch
@@ -20,7 +20,7 @@
 
 PATCH_DEPENDS=	${LOCALBASE}/bin/gpatch:${PORTSDIR}/devel/patch
 
-OPTIONS_DEFINE=	CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
+OPTIONS_DEFINE=	CSCOPE EXUBERANT_CTAGS LUA NLS PERL PYTHON RUBY TCL XTERM_SAVE
 OPTIONS_SINGLE=	UI
 OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 MOTIF X11
 OPTIONS_SUB=	yes
@@ -27,7 +27,6 @@
 ATHENA_DESC=		Athena GUI toolkit
 CSCOPE_DESC=		cscope support
 CONSOLE_DESC=		Console/terminal mode
-DEFAULT_VIMRC_DESC=	Install bundled vimrc as default setting
 EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
 UI_DESC=		User interface
 XTERM_SAVE_DESC=	Restore xterm screen after exit
@@ -72,7 +71,6 @@
 .if defined(LITE)
 PKGNAMESUFFIX+=	-lite
 CONFLICTS_INSTALL=	vim-[0-9]*
-OPTIONS_DEFAULT=DEFAULT_VIMRC
 OPTIONS_EXCLUDE=ATHENA CSCOPE EXUBERANT_CTAGS GNOME GTK2 LUA MOTIF NLS PERL PYTHON RUBY TCL X11 XTERM_SAVE
 OPTIONS_SLAVE=	CONSOLE
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" \
@@ -84,7 +82,7 @@
 PLIST_SUB+=	NON_LITE="@comment "
 .else
 CONFLICTS_INSTALL=	vim-lite-[0-9]*
-OPTIONS_DEFAULT=CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL
+OPTIONS_DEFAULT=CSCOPE EXUBERANT_CTAGS GTK2 LUA PERL PYTHON RUBY TCL
 MAKE_ARGS+=	CONF_OPT_FEAT=--with-features=big \
 		CONF_OPT_INPUT=--enable-xim \
 		CONF_OPT_OUTPUT=--enable-fontset
@@ -182,16 +180,14 @@
 	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .endif
-.if ${PORT_OPTIONS:MDEFAULT_VIMRC}
-	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${ETCDIR}/gvimrc.sample
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${ETCDIR}/vimrc.sample
-.endif
 .if !${PORT_OPTIONS:MNLS}
-	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
-	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
+	${MKDIR} ${DATADIR}/${VIM_VER}/keymap/
+	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${DATADIR}/${VIM_VER}/keymap/
 .endif
-	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
-	${TOUCH} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/.keepme
+	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/${VIM_VER}/keymap/
+	${TOUCH} ${DATADIR}/${VIM_VER}/lang/.keepme
 
 .include <bsd.port.post.mk>

Modified: trunk/editors/vim/pkg-plist
===================================================================
--- trunk/editors/vim/pkg-plist	2015-09-19 19:20:58 UTC (rev 20256)
+++ trunk/editors/vim/pkg-plist	2015-09-19 19:26:15 UTC (rev 20257)
@@ -12,8 +12,8 @@
 bin/vimdiff
 bin/vimtutor
 bin/xxd
-%%DEFAULT_VIMRC%%@sample %%ETCDIR%%/gvimrc.sample
-%%DEFAULT_VIMRC%%@sample %%ETCDIR%%/vimrc.sample
+ at sample %%ETCDIR%%/gvimrc.sample
+ at sample %%ETCDIR%%/vimrc.sample
 %%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/eview.1.gz
 %%NON_LITE%%%%NLS%%man/fr/man1/evim.1.gz
 %%GUI%%%%NON_LITE%%%%NLS%%man/fr/man1/gview.1.gz