From 3f552dfbce98d629b989023784ed4aca26c70154 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 20 Jun 2000 20:26:45 +0000
Subject: [PATCH] Use negative fragments, now that they've been committed.
 Change light -> no_x11, to conform to emerging convention.

---
 editors/vim/Makefile            |  26 +--
 editors/vim/pkg/PFRAG.no-no_x11 |   9 +
 editors/vim/pkg/PLIST           |   9 +-
 editors/vim/pkg/PLIST-light     | 332 --------------------------------
 4 files changed, 23 insertions(+), 353 deletions(-)
 create mode 100644 editors/vim/pkg/PFRAG.no-no_x11
 delete mode 100644 editors/vim/pkg/PLIST-light

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index cd8fece0c85..ce267b68a7c 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2000/05/04 13:56:04 jasoni Exp $
+# $OpenBSD: Makefile,v 1.28 2000/06/20 20:26:45 espie Exp $
 
 DISTNAME=	vim-5.6
 CATEGORIES=	editors
-NEED_VERSION=	1.251
+NEED_VERSION=	1.301
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unix/ \
 		ftp://ftp.oce.nl/pub/vim/unix/  \
@@ -25,6 +25,7 @@ PATCH_DIST_ARGS=-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 PATCH_DIST_ARGS=-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 
+
 MAINTAINER=	jasoni@openbsd.org
 
 PERMIT_PACKAGE_CDROM=   Yes
@@ -32,13 +33,10 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-FLAVORS=	gtk athena motif light
+FLAVORS=	gtk athena motif no_x11
 FLAVOR?=	gtk
 
-FAKE=		Yes
-HAS_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--prefix='$${DESTDIR}${PREFIX}'
-CONFIGURE_ARGS+=--sysconfdir='$${DESTDIR}${PREFIX}'
+CONFIGURE_STYLE=	gnu dest
 CONFIGURE_ARGS+=--with-tliba="curses"
 
 # Internal Compiler Error
@@ -46,20 +44,22 @@ CONFIGURE_ARGS+=--with-tliba="curses"
 PATCH_LIST=	patch-* sup-m68k
 .endif
 
-.if ${FLAVOR:L:Mlight}
-PLIST=		${PKGDIR}/PLIST-light
+.if ${FLAVOR:L} == "light"
+FLAVOR=no_x11
+.endif
+.if ${FLAVOR:L} == "no_x11"
 CONFIGURE_ARGS+=--disable-gui --without-x
-.elif ${FLAVOR:L:Mmotif}
+.elif ${FLAVOR:L} == "motif"
 CONFIGURE_ARGS+=--enable-gui="motif"
 CONFIGURE_ENV+=	MOTIFHOME=${X11BASE}
 USE_MOTIF=Yes
-.elif ${FLAVOR:L:Mathena}
+.elif ${FLAVOR:L} == "athena"
 CONFIGURE_ARGS+=--enable-gui="athena"
-.elif ${FLAVOR:L:Mgtk}
+.elif ${FLAVOR:L} == "gtk"
 LIB_DEPENDS=	gtk.1.2::x11/gtk+
 CONFIGURE_ARGS+=--enable-gui="gtk" 
 .endif
 
-WRKDIST=	${WRKDIR}/${DISTNAME}/src
+WRKDIST=		${WRKDIR}/${DISTNAME}/src
 
 .include <bsd.port.mk>
diff --git a/editors/vim/pkg/PFRAG.no-no_x11 b/editors/vim/pkg/PFRAG.no-no_x11
new file mode 100644
index 00000000000..3111589195d
--- /dev/null
+++ b/editors/vim/pkg/PFRAG.no-no_x11
@@ -0,0 +1,9 @@
+@comment $OpenBSDS$
+bin/gview
+bin/gvim
+bin/rgview
+bin/rgvim
+man/man1/gview.1
+man/man1/gvim.1
+man/man1/rgview.1
+man/man1/rgvim.1
diff --git a/editors/vim/pkg/PLIST b/editors/vim/pkg/PLIST
index 9a897c282a6..38984beab0b 100644
--- a/editors/vim/pkg/PLIST
+++ b/editors/vim/pkg/PLIST
@@ -1,8 +1,4 @@
 bin/ex
-bin/gview
-bin/gvim
-bin/rgview
-bin/rgvim
 bin/rview
 bin/rvim
 bin/view
@@ -12,10 +8,6 @@ bin/vim-etags
 bin/vimtutor
 bin/xxd
 man/man1/ex.1
-man/man1/gview.1
-man/man1/gvim.1
-man/man1/rgview.1
-man/man1/rgvim.1
 man/man1/rview.1
 man/man1/rvim.1
 man/man1/view.1
@@ -24,6 +16,7 @@ man/man1/vim-etags.1
 man/man1/vim.1
 man/man1/vimtutor.1
 man/man1/xxd.1
+!%%no_x11%%
 share/vim/vim56/bugreport.vim
 share/vim/vim56/doc/autocmd.txt
 share/vim/vim56/doc/change.txt
diff --git a/editors/vim/pkg/PLIST-light b/editors/vim/pkg/PLIST-light
deleted file mode 100644
index 08820ae3114..00000000000
--- a/editors/vim/pkg/PLIST-light
+++ /dev/null
@@ -1,332 +0,0 @@
-bin/ex
-bin/rview
-bin/rvim
-bin/view
-bin/vim
-bin/vim-ctags
-bin/vim-etags
-bin/vimtutor
-bin/xxd
-man/man1/ex.1
-man/man1/rview.1
-man/man1/rvim.1
-man/man1/view.1
-man/man1/vim-ctags.1
-man/man1/vim-etags.1
-man/man1/vim.1
-man/man1/vimtutor.1
-man/man1/xxd.1
-share/vim/vim56/bugreport.vim
-share/vim/vim56/doc/autocmd.txt
-share/vim/vim56/doc/change.txt
-share/vim/vim56/doc/cmdline.txt
-share/vim/vim56/doc/develop.txt
-share/vim/vim56/doc/digraph.txt
-share/vim/vim56/doc/editing.txt
-share/vim/vim56/doc/eval.txt
-share/vim/vim56/doc/farsi.txt
-share/vim/vim56/doc/gui.txt
-share/vim/vim56/doc/gui_w32.txt
-share/vim/vim56/doc/gui_x11.txt
-share/vim/vim56/doc/hangulin.txt
-share/vim/vim56/doc/help.txt
-share/vim/vim56/doc/howto.txt
-share/vim/vim56/doc/if_cscope.txt
-share/vim/vim56/doc/if_ole.txt
-share/vim/vim56/doc/if_perl.txt
-share/vim/vim56/doc/if_python.txt
-share/vim/vim56/doc/if_sniff.txt
-share/vim/vim56/doc/if_tcl.txt
-share/vim/vim56/doc/index.txt
-share/vim/vim56/doc/insert.txt
-share/vim/vim56/doc/intro.txt
-share/vim/vim56/doc/map.txt
-share/vim/vim56/doc/message.txt
-share/vim/vim56/doc/motion.txt
-share/vim/vim56/doc/multibyte.txt
-share/vim/vim56/doc/options.txt
-share/vim/vim56/doc/os_amiga.txt
-share/vim/vim56/doc/os_beos.txt
-share/vim/vim56/doc/os_dos.txt
-share/vim/vim56/doc/os_mac.txt
-share/vim/vim56/doc/os_mint.txt
-share/vim/vim56/doc/os_msdos.txt
-share/vim/vim56/doc/os_os2.txt
-share/vim/vim56/doc/os_riscos.txt
-share/vim/vim56/doc/os_unix.txt
-share/vim/vim56/doc/os_vms.txt
-share/vim/vim56/doc/os_win32.txt
-share/vim/vim56/doc/pattern.txt
-share/vim/vim56/doc/quickfix.txt
-share/vim/vim56/doc/quotes.txt
-share/vim/vim56/doc/recover.txt
-share/vim/vim56/doc/repeat.txt
-share/vim/vim56/doc/rightleft.txt
-share/vim/vim56/doc/scroll.txt
-share/vim/vim56/doc/starting.txt
-share/vim/vim56/doc/syntax.txt
-share/vim/vim56/doc/tags
-share/vim/vim56/doc/tagsearch.txt
-share/vim/vim56/doc/term.txt
-share/vim/vim56/doc/tips.txt
-share/vim/vim56/doc/todo.txt
-share/vim/vim56/doc/uganda.txt
-share/vim/vim56/doc/undo.txt
-share/vim/vim56/doc/various.txt
-share/vim/vim56/doc/version4.txt
-share/vim/vim56/doc/version5.txt
-share/vim/vim56/doc/vi_diff.txt
-share/vim/vim56/doc/vim2html.pl
-share/vim/vim56/doc/visual.txt
-share/vim/vim56/doc/windows.txt
-share/vim/vim56/filetype.vim
-share/vim/vim56/ftoff.vim
-share/vim/vim56/gvimrc_example.vim
-share/vim/vim56/macros/README.txt
-share/vim/vim56/macros/diffwin.vim
-share/vim/vim56/macros/dvorak
-share/vim/vim56/macros/hanoi/click.me
-share/vim/vim56/macros/hanoi/hanoi.vim
-share/vim/vim56/macros/hanoi/poster
-share/vim/vim56/macros/html
-share/vim/vim56/macros/justify.vim
-share/vim/vim56/macros/life/click.me
-share/vim/vim56/macros/life/life.vim
-share/vim/vim56/macros/maze/Makefile
-share/vim/vim56/macros/maze/README.txt
-share/vim/vim56/macros/maze/maze.c
-share/vim/vim56/macros/maze/maze_5.78
-share/vim/vim56/macros/maze/maze_mac
-share/vim/vim56/macros/maze/mazeansi.c
-share/vim/vim56/macros/maze/poster
-share/vim/vim56/macros/shellmenu.vim
-share/vim/vim56/macros/swapmous.vim
-share/vim/vim56/macros/urm/README.txt
-share/vim/vim56/macros/urm/examples
-share/vim/vim56/macros/urm/urm
-share/vim/vim56/macros/urm/urm.vim
-share/vim/vim56/menu.vim
-share/vim/vim56/optwin.vim
-share/vim/vim56/scripts.vim
-share/vim/vim56/syntax/2html.vim
-share/vim/vim56/syntax/abc.vim
-share/vim/vim56/syntax/abel.vim
-share/vim/vim56/syntax/ada.vim
-share/vim/vim56/syntax/ahdl.vim
-share/vim/vim56/syntax/amiga.vim
-share/vim/vim56/syntax/aml.vim
-share/vim/vim56/syntax/apachestyle.vim
-share/vim/vim56/syntax/asm.vim
-share/vim/vim56/syntax/asmh8300.vim
-share/vim/vim56/syntax/asn.vim
-share/vim/vim56/syntax/aspvbs.vim
-share/vim/vim56/syntax/atlas.vim
-share/vim/vim56/syntax/ave.vim
-share/vim/vim56/syntax/awk.vim
-share/vim/vim56/syntax/basic.vim
-share/vim/vim56/syntax/bib.vim
-share/vim/vim56/syntax/btm.vim
-share/vim/vim56/syntax/c.vim
-share/vim/vim56/syntax/cf.vim
-share/vim/vim56/syntax/change.vim
-share/vim/vim56/syntax/clean.vim
-share/vim/vim56/syntax/clipper.vim
-share/vim/vim56/syntax/cobol.vim
-share/vim/vim56/syntax/colortest.vim
-share/vim/vim56/syntax/config.vim
-share/vim/vim56/syntax/cpp.vim
-share/vim/vim56/syntax/csh.vim
-share/vim/vim56/syntax/css.vim
-share/vim/vim56/syntax/cterm.vim
-share/vim/vim56/syntax/ctrlh.vim
-share/vim/vim56/syntax/cupl.vim
-share/vim/vim56/syntax/cuplsim.vim
-share/vim/vim56/syntax/cweb.vim
-share/vim/vim56/syntax/dcl.vim
-share/vim/vim56/syntax/def.vim
-share/vim/vim56/syntax/diff.vim
-share/vim/vim56/syntax/diva.vim
-share/vim/vim56/syntax/dosbatch.vim
-share/vim/vim56/syntax/dosini.vim
-share/vim/vim56/syntax/dracula.vim
-share/vim/vim56/syntax/dtd.vim
-share/vim/vim56/syntax/eiffel.vim
-share/vim/vim56/syntax/elf.vim
-share/vim/vim56/syntax/elmfilt.vim
-share/vim/vim56/syntax/erlang.vim
-share/vim/vim56/syntax/esqlc.vim
-share/vim/vim56/syntax/expect.vim
-share/vim/vim56/syntax/exports.vim
-share/vim/vim56/syntax/focexec.vim
-share/vim/vim56/syntax/forth.vim
-share/vim/vim56/syntax/fortran.vim
-share/vim/vim56/syntax/fvwm.vim
-share/vim/vim56/syntax/gdb.vim
-share/vim/vim56/syntax/gdmo.vim
-share/vim/vim56/syntax/gedcom.vim
-share/vim/vim56/syntax/gnuplot.vim
-share/vim/vim56/syntax/gp.vim
-share/vim/vim56/syntax/haskell.vim
-share/vim/vim56/syntax/help.vim
-share/vim/vim56/syntax/hitest.vim
-share/vim/vim56/syntax/html.vim
-share/vim/vim56/syntax/htmlm4.vim
-share/vim/vim56/syntax/icon.vim
-share/vim/vim56/syntax/idl.vim
-share/vim/vim56/syntax/idlang.vim
-share/vim/vim56/syntax/inform.vim
-share/vim/vim56/syntax/ishd.vim
-share/vim/vim56/syntax/ist.vim
-share/vim/vim56/syntax/java.vim
-share/vim/vim56/syntax/javacc.vim
-share/vim/vim56/syntax/javascript.vim
-share/vim/vim56/syntax/jgraph.vim
-share/vim/vim56/syntax/jsp.vim
-share/vim/vim56/syntax/kwt.vim
-share/vim/vim56/syntax/lace.vim
-share/vim/vim56/syntax/lex.vim
-share/vim/vim56/syntax/lhaskell.vim
-share/vim/vim56/syntax/lilo.vim
-share/vim/vim56/syntax/lisp.vim
-share/vim/vim56/syntax/lite.vim
-share/vim/vim56/syntax/lotos.vim
-share/vim/vim56/syntax/lout.vim
-share/vim/vim56/syntax/lss.vim
-share/vim/vim56/syntax/lua.vim
-share/vim/vim56/syntax/m4.vim
-share/vim/vim56/syntax/mail.vim
-share/vim/vim56/syntax/make.vim
-share/vim/vim56/syntax/man.vim
-share/vim/vim56/syntax/manual.vim
-share/vim/vim56/syntax/maple.vim
-share/vim/vim56/syntax/masm.vim
-share/vim/vim56/syntax/master.vim
-share/vim/vim56/syntax/matlab.vim
-share/vim/vim56/syntax/mf.vim
-share/vim/vim56/syntax/mib.vim
-share/vim/vim56/syntax/model.vim
-share/vim/vim56/syntax/modsim3.vim
-share/vim/vim56/syntax/modula2.vim
-share/vim/vim56/syntax/modula3.vim
-share/vim/vim56/syntax/mp.vim
-share/vim/vim56/syntax/msql.vim
-share/vim/vim56/syntax/muttrc.vim
-share/vim/vim56/syntax/nasm.vim
-share/vim/vim56/syntax/ncf.vim
-share/vim/vim56/syntax/nosyntax.vim
-share/vim/vim56/syntax/nroff.vim
-share/vim/vim56/syntax/objc.vim
-share/vim/vim56/syntax/ocaml.vim
-share/vim/vim56/syntax/opl.vim
-share/vim/vim56/syntax/pascal.vim
-share/vim/vim56/syntax/pcap.vim
-share/vim/vim56/syntax/pccts.vim
-share/vim/vim56/syntax/perl.vim
-share/vim/vim56/syntax/php3.vim
-share/vim/vim56/syntax/phtml.vim
-share/vim/vim56/syntax/pike.vim
-share/vim/vim56/syntax/pine.vim
-share/vim/vim56/syntax/plsql.vim
-share/vim/vim56/syntax/po.vim
-share/vim/vim56/syntax/pod.vim
-share/vim/vim56/syntax/postscr.vim
-share/vim/vim56/syntax/pov.vim
-share/vim/vim56/syntax/procmail.vim
-share/vim/vim56/syntax/prolog.vim
-share/vim/vim56/syntax/ptcap.vim
-share/vim/vim56/syntax/purifylog.vim
-share/vim/vim56/syntax/python.vim
-share/vim/vim56/syntax/radiance.vim
-share/vim/vim56/syntax/rc.vim
-share/vim/vim56/syntax/rcslog.vim
-share/vim/vim56/syntax/rebol.vim
-share/vim/vim56/syntax/remind.vim
-share/vim/vim56/syntax/rexx.vim
-share/vim/vim56/syntax/rpcgen.vim
-share/vim/vim56/syntax/sas.vim
-share/vim/vim56/syntax/sather.vim
-share/vim/vim56/syntax/scheme.vim
-share/vim/vim56/syntax/sdl.vim
-share/vim/vim56/syntax/sed.vim
-share/vim/vim56/syntax/sgml.vim
-share/vim/vim56/syntax/sgmllnx.vim
-share/vim/vim56/syntax/sh.vim
-share/vim/vim56/syntax/sicad.vim
-share/vim/vim56/syntax/simula.vim
-share/vim/vim56/syntax/skill.vim
-share/vim/vim56/syntax/sl.vim
-share/vim/vim56/syntax/slang.vim
-share/vim/vim56/syntax/slrnrc.vim
-share/vim/vim56/syntax/slrnsc.vim
-share/vim/vim56/syntax/sm.vim
-share/vim/vim56/syntax/smil.vim
-share/vim/vim56/syntax/spec.vim
-share/vim/vim56/syntax/spice.vim
-share/vim/vim56/syntax/spup.vim
-share/vim/vim56/syntax/sql.vim
-share/vim/vim56/syntax/sqr.vim
-share/vim/vim56/syntax/squid.vim
-share/vim/vim56/syntax/st.vim
-share/vim/vim56/syntax/synload.vim
-share/vim/vim56/syntax/syntax.vim
-share/vim/vim56/syntax/tads.vim
-share/vim/vim56/syntax/tags.vim
-share/vim/vim56/syntax/tcl.vim
-share/vim/vim56/syntax/tex.vim
-share/vim/vim56/syntax/texinfo.vim
-share/vim/vim56/syntax/tf.vim
-share/vim/vim56/syntax/tsalt.vim
-share/vim/vim56/syntax/uil.vim
-share/vim/vim56/syntax/vb.vim
-share/vim/vim56/syntax/verilog.vim
-share/vim/vim56/syntax/vgrindefs.vim
-share/vim/vim56/syntax/vhdl.vim
-share/vim/vim56/syntax/vim.vim
-share/vim/vim56/syntax/viminfo.vim
-share/vim/vim56/syntax/vrml.vim
-share/vim/vim56/syntax/web.vim
-share/vim/vim56/syntax/whitespace.vim
-share/vim/vim56/syntax/winbatch.vim
-share/vim/vim56/syntax/xdefaults.vim
-share/vim/vim56/syntax/xmath.vim
-share/vim/vim56/syntax/xml.vim
-share/vim/vim56/syntax/xpm.vim
-share/vim/vim56/syntax/xpm2.vim
-share/vim/vim56/syntax/xs.vim
-share/vim/vim56/syntax/xxd.vim
-share/vim/vim56/syntax/yacc.vim
-share/vim/vim56/syntax/z8a.vim
-share/vim/vim56/syntax/zsh.vim
-share/vim/vim56/tools/README.txt
-share/vim/vim56/tools/blink.c
-share/vim/vim56/tools/ccfilter.1
-share/vim/vim56/tools/ccfilter.c
-share/vim/vim56/tools/ccfilter_README.txt
-share/vim/vim56/tools/efm_filter.pl
-share/vim/vim56/tools/efm_filter.txt
-share/vim/vim56/tools/gvimdiff
-share/vim/vim56/tools/mve.awk
-share/vim/vim56/tools/mve.txt
-share/vim/vim56/tools/pltags.pl
-share/vim/vim56/tools/ref
-share/vim/vim56/tools/shtags.1
-share/vim/vim56/tools/shtags.pl
-share/vim/vim56/tools/tcltags
-share/vim/vim56/tools/vim132
-share/vim/vim56/tools/vimm
-share/vim/vim56/tools/vimspell.sh
-share/vim/vim56/tools/vimspell.txt
-share/vim/vim56/tutor/README.txt
-share/vim/vim56/tutor/tutor
-share/vim/vim56/vimrc_example.vim
-@dirrm share/vim/vim56/tutor
-@dirrm share/vim/vim56/tools
-@dirrm share/vim/vim56/syntax
-@dirrm share/vim/vim56/macros/urm
-@dirrm share/vim/vim56/macros/maze
-@dirrm share/vim/vim56/macros/life
-@dirrm share/vim/vim56/macros/hanoi
-@dirrm share/vim/vim56/macros
-@dirrm share/vim/vim56/doc
-@dirrm share/vim/vim56
-@dirrm share/vim