Index: head/editors/Makefile =================================================================== --- head/editors/Makefile (revision 458470) +++ head/editors/Makefile (revision 458471) @@ -1,261 +1,262 @@ # $FreeBSD$ # COMMENT = Editors SUBDIR += 2bsd-vi SUBDIR += abiword SUBDIR += abiword-docs SUBDIR += aee SUBDIR += aewan SUBDIR += apel SUBDIR += asedit SUBDIR += beav SUBDIR += biew SUBDIR += bitedit SUBDIR += boiling-egg SUBDIR += bpatch SUBDIR += bvi SUBDIR += calligra SUBDIR += chexedit SUBDIR += codelite SUBDIR += coedit SUBDIR += conglomerate SUBDIR += cooledit SUBDIR += cream SUBDIR += deforaos-editor SUBDIR += dhex SUBDIR += diakonos SUBDIR += dkns SUBDIR += dlangide SUBDIR += drjava SUBDIR += dte SUBDIR += e3 SUBDIR += ecce SUBDIR += edith SUBDIR += editorconfig-core-c SUBDIR += emacs SUBDIR += emacs-devel SUBDIR += emacs-nox11 SUBDIR += encryptpad SUBDIR += fileobj SUBDIR += flim SUBDIR += focuswriter SUBDIR += fpc-ide SUBDIR += fte SUBDIR += fxite SUBDIR += gate SUBDIR += gedit SUBDIR += gedit-plugins SUBDIR += ghex SUBDIR += gmanedit SUBDIR += gnotepad+ SUBDIR += gobby SUBDIR += gwrite SUBDIR += heme SUBDIR += hexcurse SUBDIR += hexedit SUBDIR += hexer SUBDIR += hexpert SUBDIR += hnb SUBDIR += hte SUBDIR += impress SUBDIR += jed SUBDIR += jedit SUBDIR += joe SUBDIR += joe2 SUBDIR += jove SUBDIR += jucipp SUBDIR += jupp SUBDIR += kate SUBDIR += kate-plugin-pate SUBDIR += kile-kde4 SUBDIR += klat4 SUBDIR += komodo-edit SUBDIR += latexila SUBDIR += lazarus SUBDIR += lazarus-lcl-gtk2 SUBDIR += lazarus-lcl-nogui SUBDIR += lazarus-lcl-qt SUBDIR += lazarus-lcl-units SUBDIR += le SUBDIR += leafpad SUBDIR += led SUBDIR += leo SUBDIR += lfhex SUBDIR += libreoffice SUBDIR += libreoffice-af SUBDIR += libreoffice-am SUBDIR += libreoffice-as SUBDIR += libreoffice-ast SUBDIR += libreoffice-be SUBDIR += libreoffice-bg SUBDIR += libreoffice-bn SUBDIR += libreoffice-bn_IN SUBDIR += libreoffice-bo SUBDIR += libreoffice-br SUBDIR += libreoffice-brx SUBDIR += libreoffice-bs SUBDIR += libreoffice-ca SUBDIR += libreoffice-ca_valencia SUBDIR += libreoffice-cs SUBDIR += libreoffice-cy SUBDIR += libreoffice-da SUBDIR += libreoffice-dgo SUBDIR += libreoffice-dz SUBDIR += libreoffice-el SUBDIR += libreoffice-en_GB SUBDIR += libreoffice-en_ZA SUBDIR += libreoffice-eo SUBDIR += libreoffice-es SUBDIR += libreoffice-et SUBDIR += libreoffice-eu SUBDIR += libreoffice-fa SUBDIR += libreoffice-fi SUBDIR += libreoffice-ga SUBDIR += libreoffice-gd SUBDIR += libreoffice-gl SUBDIR += libreoffice-gu SUBDIR += libreoffice-gug SUBDIR += libreoffice-hi SUBDIR += libreoffice-hr SUBDIR += libreoffice-i18n SUBDIR += libreoffice-id SUBDIR += libreoffice-is SUBDIR += libreoffice-it SUBDIR += libreoffice-ka SUBDIR += libreoffice-kk SUBDIR += libreoffice-km SUBDIR += libreoffice-kmr_Latn SUBDIR += libreoffice-kn SUBDIR += libreoffice-kok SUBDIR += libreoffice-ks SUBDIR += libreoffice-lb SUBDIR += libreoffice-lo SUBDIR += libreoffice-lt SUBDIR += libreoffice-lv SUBDIR += libreoffice-mai SUBDIR += libreoffice-mk SUBDIR += libreoffice-ml SUBDIR += libreoffice-mn SUBDIR += libreoffice-mni SUBDIR += libreoffice-mr SUBDIR += libreoffice-my SUBDIR += libreoffice-nb SUBDIR += libreoffice-ne SUBDIR += libreoffice-nl SUBDIR += libreoffice-nn SUBDIR += libreoffice-nr SUBDIR += libreoffice-nso SUBDIR += libreoffice-oc SUBDIR += libreoffice-om SUBDIR += libreoffice-or SUBDIR += libreoffice-pa_IN SUBDIR += libreoffice-ro SUBDIR += libreoffice-rw SUBDIR += libreoffice-sa_IN SUBDIR += libreoffice-sat SUBDIR += libreoffice-sd SUBDIR += libreoffice-si SUBDIR += libreoffice-sid SUBDIR += libreoffice-sk SUBDIR += libreoffice-sl SUBDIR += libreoffice-sq SUBDIR += libreoffice-sr SUBDIR += libreoffice-sr_Latn SUBDIR += libreoffice-ss SUBDIR += libreoffice-st SUBDIR += libreoffice-sv SUBDIR += libreoffice-sw_TZ SUBDIR += libreoffice-ta SUBDIR += libreoffice-te SUBDIR += libreoffice-tg SUBDIR += libreoffice-th SUBDIR += libreoffice-tn SUBDIR += libreoffice-tr SUBDIR += libreoffice-ts SUBDIR += libreoffice-tt SUBDIR += libreoffice-ug SUBDIR += libreoffice-uz SUBDIR += libreoffice-ve SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu SUBDIR += linux-sublime SUBDIR += linux-sublime3 SUBDIR += madedit SUBDIR += manedit SUBDIR += medit SUBDIR += mg SUBDIR += micro SUBDIR += mined SUBDIR += morla SUBDIR += mousepad SUBDIR += mp SUBDIR += nano SUBDIR += nano-devel SUBDIR += ne SUBDIR += nedit SUBDIR += neovim SUBDIR += nvi-devel SUBDIR += nvi-m17n SUBDIR += omegaT SUBDIR += openoffice-4 SUBDIR += openoffice-devel SUBDIR += p5-Padre SUBDIR += p5-Proc-InvokeEditor SUBDIR += p5-Vimana SUBDIR += paredit-mode.el SUBDIR += pdfedit SUBDIR += pico-alpine SUBDIR += pluma SUBDIR += plume-creator-devel SUBDIR += poedit SUBDIR += psgml SUBDIR += puff SUBDIR += py-editorconfig SUBDIR += py-room SUBDIR += rox-edit SUBDIR += rubygem-neovim SUBDIR += scite SUBDIR += se SUBDIR += semi SUBDIR += shed SUBDIR += slime SUBDIR += ssed SUBDIR += sted SUBDIR += tamago SUBDIR += tea SUBDIR += teco SUBDIR += ted SUBDIR += tetradraw SUBDIR += texmacs SUBDIR += texmaker SUBDIR += texstudio SUBDIR += textroom SUBDIR += texworks SUBDIR += the SUBDIR += thoteditor SUBDIR += treeform SUBDIR += tweak SUBDIR += uemacs SUBDIR += uzap SUBDIR += vigor SUBDIR += vile SUBDIR += vim SUBDIR += vim-lite + SUBDIR += vim-tiny SUBDIR += web-mode SUBDIR += with-editor SUBDIR += wordgrinder SUBDIR += xcoral SUBDIR += xed SUBDIR += xi-core SUBDIR += xmlcopyeditor SUBDIR += xvile SUBDIR += yudit SUBDIR += yui SUBDIR += yzis SUBDIR += zile SUBDIR += zoinks .include Index: head/editors/vim/Makefile =================================================================== --- head/editors/vim/Makefile (revision 458470) +++ head/editors/vim/Makefile (revision 458471) @@ -1,191 +1,198 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= vim PORTVERSION= 8.0.1427 DISTVERSIONPREFIX= v CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org COMMENT?= Improved version of the vi editor LICENSE= VIM LICENSE_NAME= VIM License LICENSE_FILE= ${WRKSRC}/runtime/doc/uganda.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS_INSTALL?= vim-lite-[0-9]* +CONFLICTS_INSTALL?= vim-lite vim-tiny USES= cpe iconv ncurses pkgconfig shebangfix USE_GITHUB= yes CONFIGURE_ARGS= --enable-gui=${GUI} \ --enable-multibyte \ --with-tlib=ncurses MAKE_ARGS= STRIP="${STRIP_CMD}" \ VIMRCLOC=${ETCDIR} \ VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER} CPE_VERSION= ${PORTVERSION:R} GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes PLIST_SUB= VIM_VER=${VIM_VER} -PORTDATA= ${VIM_VER} +PORTDATA?= ${VIM_VER} PORTSCOUT= ignore:1 REINPLACE_ARGS= -i '' SHEBANG_FILES= runtime/tools/demoserver.py runtime/tools/efm_perl.pl VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # OPTIONS OPTIONS_DEFAULT= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS GTK2 PERL PYTHON2 RUBY OPTIONS_DEFINE= CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE OPTIONS_SINGLE= UI OPTIONS_SINGLE_UI= ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11 OPTIONS_GROUP= LANGBIND OPTIONS_GROUP_LANGBIND= LUA PERL PYTHON2 PYTHON3 RUBY SCHEME TCL OPTIONS_SUB= yes .if defined(LITE) OPTIONS_DEFAULT= DEFAULT_VIMRC OPTIONS_SLAVE= CONSOLE # Exclude everything except the two options above OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NDEFAULT_VIMRC} \ ${OPTIONS_SINGLE_UI:NCONSOLE} \ ${OPTIONS_GROUP_LANGBIND} +.elif defined(TINY) +OPTIONS_SLAVE= CONSOLE +OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE} \ + ${OPTIONS_SINGLE_UI:NCONSOLE} \ + ${OPTIONS_GROUP_LANGBIND} .endif DEFAULT_VIMRC_DESC= Install bundled vimrc as default setting EXUBERANT_CTAGS_DESC= Use exctags instead of ctags XTERM_SAVE_DESC= Restore xterm screen after exit UI_DESC= User interface ATHENA_DESC= Athena GUI toolkit CSCOPE_DESC= cscope support CONSOLE_DESC= Console/terminal mode LANGBIND_DESC= Optional language bindings SCHEME_DESC= MzScheme (Racket) bindings # BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute OPTIONS_EXCLUDE_powerpc64= RUBY # GENERAL OPTIONS CSCOPE_CONFIGURE_ENABLE=cscope CSCOPE_RUN_DEPENDS= cscope:devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= exctags:devel/ctags NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext # UI ATHENA_PLIST_SUB= GUI="" DESKTOP="@comment " ATHENA_USE= XORG=ice,sm,x11,xaw,xmu,xpm,xt ATHENA_VARS= GUI=athena CONSOLE_CONFIGURE_OFF= --enable-xim --enable-fontset CONSOLE_PLIST_SUB= GUI="@comment " DESKTOP="@comment " CONSOLE_VARS= GUI=no GNOME_PLIST_SUB= GUI="" DESKTOP="" GNOME_IMPLIES= NLS GNOME_USE= GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,glproto,x11,xpm,xt GNOME_USES= desktop-file-utils GNOME_VARS= GUI=gnome2 INSTALLS_ICONS=yes GTK2_PLIST_SUB= GUI="" DESKTOP="" GTK2_USE= GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt GTK2_USES= desktop-file-utils GTK2_VARS= GUI=gtk2 INSTALLS_ICONS=yes GTK3_PLIST_SUB= GUI="" DESKTOP="" GTK3_USE= GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt GTK3_USES= desktop-file-utils GTK3_VARS= GUI=gtk3 INSTALLS_ICONS=yes MOTIF_CONFIGURE_ENV= MOTIFHOME=${LOCALBASE} MOTIF_CONFIGURE_WITH= motif-lib="${MOTIFLIB}" MOTIF_PLIST_SUB= GUI="" DESKTOP="@comment " MOTIF_USE= XORG=ice,sm,x11,xmu,xt MOTIF_USES= motif MOTIF_VARS= GUI=motif X11_CONFIGURE_WITH= x X11_PLIST_SUB= GUI="@comment " DESKTOP="@comment " X11_USE= XORG=ice,sm,x11,xt X11_VARS= GUI=no # LANGUAGE BINDINGS LUA_CONFIGURE_ENABLE= luainterp LUA_CONFIGURE_WITH= lua-prefix=${LOCALBASE} LUA_USES= lua PERL_CONFIGURE_ENABLE= perlinterp PERL_USES= perl5 PYTHON2_CONFIGURE_ENABLE= pythoninterp PYTHON2_BUILD_DEPENDS= python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} PYTHON2_RUN_DEPENDS= ${PYTHON2_BUILD_DEPENDS} PYTHON3_CONFIGURE_ENABLE= python3interp PYTHON3_USES= python:3.4+ RUBY_CONFIGURE_ENABLE= rubyinterp RUBY_USE= RUBY=yes SCHEME_CONFIGURE_ENABLE=mzschemeinterp SCHEME_BUILD_DEPENDS= mzscheme:lang/racket SCHEME_RUN_DEPENDS= ${SCHEME_BUILD_DEPENDS} TCL_CONFIGURE_ENABLE= tclinterp TCL_CONFIGURE_WITH= tclsh=tclsh${TCL_VER} TCL_USES= tcl:85+ post-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap post-patch: @${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h @${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/auto/configure # Work around qa-check shebang error @${REINPLACE_CMD} -e 1d ${WRKSRC}/runtime/tools/demoserver.py post-configure: # Needed when devel/libsysinfo is installed: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/ d' ${WRKSRC}/src/auto/config.h +.if !defined(TINY) post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/ex @${RM} ${STAGEDIR}${PREFIX}/bin/view .for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff ${LN} -sf vim ${STAGEDIR}${PREFIX}/bin/$F .endfor # OPTIONS post-patch-EXUBERANT_CTAGS-off: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -Ee 's!ctags -R ?\.!${FIND} . -type f \\| ${XARGS} ctags!g' post-patch-EXUBERANT_CTAGS-on: @${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R|exctags -R|g' post-patch-LUA-on: @${REINPLACE_CMD} -e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure @${REINPLACE_CMD} -e '/$$LUA_LIBS/ s|^|LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}";|' ${WRKSRC}/src/auto/configure @${REINPLACE_CMD} -e '/LUA_CFLAGS=/s|".*"|"-I${LUA_INCDIR}"|' ${WRKSRC}/src/auto/configure post-patch-XTERM_SAVE-on: @${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h post-install-DEFAULT_VIMRC-on: @${MKDIR} ${STAGEDIR}${ETCDIR} ${SED} -e '/set nocompatible/d' ${FILESDIR}/vimrc > ${STAGEDIR}${ETCDIR}/gvimrc.sample ${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample post-install-NLS-off: @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang @${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap ${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap +.endif #!defined(TINY) .include Index: head/editors/vim-lite/Makefile =================================================================== --- head/editors/vim-lite/Makefile (revision 458470) +++ head/editors/vim-lite/Makefile (revision 458471) @@ -1,13 +1,13 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ PKGNAMESUFFIX= -lite COMMENT= Improved version of the vi editor (lite package) -CONFLICTS_INSTALL= vim-[0-9]* +CONFLICTS_INSTALL= vim vim-tiny LITE= yes MASTERDIR= ${.CURDIR}/../vim .include "${MASTERDIR}/Makefile" Index: head/editors/vim-tiny/Makefile =================================================================== --- head/editors/vim-tiny/Makefile (nonexistent) +++ head/editors/vim-tiny/Makefile (revision 458471) @@ -0,0 +1,22 @@ +# Created by: Adam Weinberger +# $FreeBSD$ + +PKGNAMESUFFIX= -tiny + +COMMENT= Improved version of the vi editor (vim binary only) + +CONFLICTS_INSTALL= vim vim-lite + +TINY= yes +MASTERDIR= ${.CURDIR}/../vim + +PORTDATA= # Not for -tiny +PLIST= # Not for -tiny +PLIST_FILES= bin/vim \ + man/man1/vim.1.gz + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/vim ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/runtime/doc/vim.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +.include "${MASTERDIR}/Makefile" Property changes on: head/editors/vim-tiny/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/vim-tiny/pkg-descr =================================================================== --- head/editors/vim-tiny/pkg-descr (nonexistent) +++ head/editors/vim-tiny/pkg-descr (revision 458471) @@ -0,0 +1,15 @@ +Vim is a highly configurable text editor built to enable efficient text editing. +It is an improved version of the vi editor distributed with most UNIX systems. + +Vim is often called a "programmer's editor," and so useful for programming that +many consider it an entire IDE. It's not just for programmers, though. Vim is +perfect for all kinds of text editing, from composing email to editing +configuration files. + +This is the "tiny" version, which is console-only and contains ONLY the vim +binary. It contains no help files, syntax files, or any other runtime files, +and is designed only for minimal installs. You almost always want the vim +or vim-lite package instead. + +WWW: http://www.vim.org/ +WWW: https://github.com/vim/vim Property changes on: head/editors/vim-tiny/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property