Index: pkgsrc/editors/vim-gtk2/Makefile
===================================================================
--- pkgsrc/editors/vim-gtk2/Makefile	(revision 155)
+++ pkgsrc/editors/vim-gtk2/Makefile	(working copy)
@@ -14,7 +14,7 @@
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]* vim-photon-[0-9]*
 
 CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
 
Index: pkgsrc/editors/vim-motif/Makefile
===================================================================
--- pkgsrc/editors/vim-motif/Makefile	(revision 155)
+++ pkgsrc/editors/vim-motif/Makefile	(working copy)
@@ -11,7 +11,7 @@
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]* vim-photon-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=motif
 CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
Index: pkgsrc/editors/vim-share/distinfo
===================================================================
--- pkgsrc/editors/vim-share/distinfo	(revision 155)
+++ pkgsrc/editors/vim-share/distinfo	(working copy)
@@ -158,6 +158,7 @@
 Size (vim7.2/vim-7.2.tar.bz2) = 7203291 bytes
 SHA1 (patch-aa) = ce047db2552b9b2757766dcf45246f1ee43553c7
 SHA1 (patch-ab) = 6d27ed09cb741313e57b3550e62977797f7b285e
+SHA1 (patch-ac) = fc2ea6316eeb6b8c8d18d06a7a53d655732fd93d
 SHA1 (patch-ad) = c75cdf6f60781a9827a8fce06704dd75ada26a9b
 SHA1 (patch-af) = 0b43a34040bd0ce29f358119b2eaa777914ed6b6
 SHA1 (patch-zb) = 3a4daf47e709cf5a882a0b0a947a3a44f48b0ed6
Index: pkgsrc/editors/vim-share/patches/patch-ac
===================================================================
--- pkgsrc/editors/vim-share/patches/patch-ac	(revision 0)
+++ pkgsrc/editors/vim-share/patches/patch-ac	(revision 0)
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- src/gui_photon.c.orig	2007-05-07 15:44:46.000000000 -0400
++++ src/gui_photon.c
+@@ -838,7 +838,12 @@ gui_ph_handle_window_open(
+     static void
+ gui_ph_draw_start( void )
+ {
++    PhGC_t *gc;
++
++    gc = PgGetGC();
+     PgSetRegion( PtWidgetRid( PtFindDisjoint( gui.vimTextArea ) ) );
++    PgClearClippingsCx( gc );
++    PgClearTranslationCx( gc );
+ 
+     PtWidgetOffset( gui.vimTextArea, &gui_ph_raw_offset );
+     PhTranslatePoint( &gui_ph_raw_offset, PtWidgetPos( gui.vimTextArea, NULL ) );
+@@ -2970,7 +2975,7 @@ gui_mch_init_font(char_u *vim_font_name,
+     if( vim_font_name == NULL )
+     {
+ 	/* Default font */
+-	vim_font_name = "PC Term";
++	vim_font_name = "PC Terminal";
+     }
+ 
+     if( STRCMP( vim_font_name, "*" ) == 0 )
Index: pkgsrc/editors/vim-xaw/Makefile
===================================================================
--- pkgsrc/editors/vim-xaw/Makefile	(revision 155)
+++ pkgsrc/editors/vim-xaw/Makefile	(working copy)
@@ -11,7 +11,7 @@
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=		vim-motif-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=		vim-motif-[0-9]* vim-kde-[0-9]* vim-photon-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=athena
 CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
Index: pkgsrc/editors/vim/Makefile
===================================================================
--- pkgsrc/editors/vim/Makefile	(revision 155)
+++ pkgsrc/editors/vim/Makefile	(working copy)
@@ -12,7 +12,7 @@
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
 CONFLICTS+=		vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]* vim-photon-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=no --without-x
 CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
Index: pkgsrc/editors/vim-photon/DESCR
===================================================================
--- pkgsrc/editors/vim-photon/DESCR	(revision 0)
+++ pkgsrc/editors/vim-photon/DESCR	(revision 0)
@@ -0,0 +1,11 @@
+Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+have been added: multi level undo, syntax highlighting, command line history,
+on-line help, filename completion, block operations, etc.
+
+If you are building the package from source you may want to enable some
+features such as a perl or python interpreter which are not enabled by
+default.
+
+This version also contains a photon GUI for the QNX operating system. If you
+don't have QNX, look at the `vim' package instead.
+
Index: pkgsrc/editors/vim-photon/PLIST
===================================================================
--- pkgsrc/editors/vim-photon/PLIST	(revision 0)
+++ pkgsrc/editors/vim-photon/PLIST	(revision 0)
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.2 2006/03/02 10:41:41 martti Exp $
+bin/gview
+bin/gvim
+bin/rgview
+bin/rgvim
+bin/rview
+bin/rvim
+bin/vim
+man/man1/gview.1
+man/man1/gvim.1
+man/man1/rgview.1
+man/man1/rgvim.1
Index: pkgsrc/editors/vim-photon/Makefile
===================================================================
--- pkgsrc/editors/vim-photon/Makefile	(revision 0)
+++ pkgsrc/editors/vim-photon/Makefile	(revision 0)
@@ -0,0 +1,40 @@
+
+PKGNAME=		vim-photon-${VIM_VERSION}.${VIM_PATCHLEVEL}
+#PKGREVISION=		1
+
+COMMENT=		Vim editor (vi clone) with photon GUI
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include		"../../editors/vim-share/Makefile.common"
+
+DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
+
+CONFLICTS+=		vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]* vim-gtk-[0-9]*
+
+CONFIGURE_ARGS+=	--enable-gui=photon
+CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
+
+BUILD_TARGET=		vim
+INSTALL_TARGET=		installvimbin
+
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
+
+post-install:
+.for f in gvim.1 gview.1 rgvim.1 rgview.1
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+	${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
+.endfor
+.for f in gvim gview rgvim rgview rvim rview
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
+.endfor
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/vim-gtk/Makefile
===================================================================
--- pkgsrc/editors/vim-gtk/Makefile	(revision 155)
+++ pkgsrc/editors/vim-gtk/Makefile	(working copy)
@@ -11,7 +11,7 @@
 
 DEPENDS+=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]* vim-photon-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=gtk
 CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}