2 files changed, 117 insertions, 75 deletions

diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 8289973dbcb7..052e4778cd5e 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -21,8 +21,27 @@ EXTRACT_CMD=		unzip
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=
 USE_NEWGCC=		yes
+USE_XLIB=		yes
 
-.include "${.CURDIR}/files/conffiles"
+ADDITIONAL_DOCS=	about.html \
+			cfgfiles.html \
+			cmdopt.html \
+			colorize.html \
+			colors.html \
+			command.html \
+			contents.html \
+			events.html \
+			global.html \
+			index.html \
+			install.html \
+			modes.html \
+			perftips.html \
+			regexp.html \
+			status.html
+
+.include <bsd.port.pre.mk>
+
+.include "${FILESDIR}/conffiles"
 
 do-build:
 	(cd ${WRKSRC}/src ; ${MAKE} -f fte-unix.mak)
@@ -31,18 +50,26 @@ do-build:
 do-install:
 	${MKDIR} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/etc/fte
-	${MKDIR} ${PREFIX}/lib/fte/etc/kbd
-	${MKDIR} ${PREFIX}/lib/fte/etc/menu
+	${MKDIR} ${PREFIX}/etc/fte/kbd
+	${MKDIR} ${PREFIX}/etc/fte/menu
 
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xfte ${PREFIX}/bin/fte
+	${LN} -sf ${PREFIX}/bin/fte ${PREFIX}/bin/xfte
+	${INSTALL_PROGRAM} ${WRKSRC}/src/cfte ${PREFIX}/bin/cfte
 	${INSTALL_DATA} ${WRKSRC}/config/fte-new.cnf ${PREFIX}/etc/fte/system.fterc
 .for CONFFILE in ${CONFFILES}
-	${INSTALL_DATA} ${WRKSRC}/config/${CONFFILE} ${PREFIX}/lib/fte/etc
+	${INSTALL_DATA} ${WRKSRC}/config/${CONFFILE} ${PREFIX}/etc/fte
 .endfor
 .for KBDFILE in ${KBDFILES}
-	${INSTALL_DATA} ${WRKSRC}/config/kbd/${KBDFILE} ${PREFIX}/lib/fte/etc/kbd
+	${INSTALL_DATA} ${WRKSRC}/config/kbd/${KBDFILE} ${PREFIX}/etc/fte/kbd
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/config/menu/m_c.fte ${PREFIX}/lib/fte/etc/menu
-	${INSTALL_DATA} ${WRKSRC}/config/menu/m_html.fte ${PREFIX}/lib/fte/etc/menu
+	${INSTALL_DATA} ${WRKSRC}/config/menu/m_c.fte ${PREFIX}/etc/fte/menu
+	${INSTALL_DATA} ${WRKSRC}/config/menu/m_html.fte ${PREFIX}/etc/fte/menu
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/fte
+	for i in $(ADDITIONAL_DOCS); do \
+	    ${INSTALL_MAN} ${WRKSRC}/doc/$$i ${PREFIX}/share/doc/fte; \
+	done
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/fte/pkg-plist b/editors/fte/pkg-plist
index 8a01c9166e1f..c94194d47629 100644
--- a/editors/fte/pkg-plist
+++ b/editors/fte/pkg-plist
@@ -1,70 +1,85 @@
 bin/fte
+bin/cfte
 etc/fte/system.fterc
-lib/fte/etc/ab_c.fte
-lib/fte/etc/ab_c_os2.fte
-lib/fte/etc/color.fte
-lib/fte/etc/global.fte
-lib/fte/etc/k_brief.fte
-lib/fte/etc/m_ada.fte
-lib/fte/etc/m_asm.fte
-lib/fte/etc/m_asm370.fte
-lib/fte/etc/m_bin.fte
-lib/fte/etc/m_c.fte
-lib/fte/etc/m_clario.fte
-lib/fte/etc/m_diff.fte
-lib/fte/etc/m_ebnf.fte
-lib/fte/etc/m_fort90.fte
-lib/fte/etc/m_fte.fte
-lib/fte/etc/m_html.fte
-lib/fte/etc/m_ipf.fte
-lib/fte/etc/m_java.fte
-lib/fte/etc/m_ldsgml.fte
-lib/fte/etc/m_make.fte
-lib/fte/etc/m_msg.fte
-lib/fte/etc/m_mvsasm.fte
-lib/fte/etc/m_pascal.fte
-lib/fte/etc/m_perl.fte
-lib/fte/etc/m_plain.fte
-lib/fte/etc/m_resdlg.fte
-lib/fte/etc/m_rexx.fte
-lib/fte/etc/m_sh.fte
-lib/fte/etc/m_siod.fte
-lib/fte/etc/m_tcl.fte
-lib/fte/etc/m_tex.fte
-lib/fte/etc/m_texi.fte
-lib/fte/etc/m_text.fte
-lib/fte/etc/m_vi.fte
-lib/fte/etc/m_xp.fte
-lib/fte/etc/main.fte
-lib/fte/etc/pal_blk.fte
-lib/fte/etc/pal_blue.fte
-lib/fte/etc/pal_wht.fte
-lib/fte/etc/ui_brief.fte
-lib/fte/etc/ui_fte.fte
-lib/fte/etc/ui_fte2.fte
-lib/fte/etc/ui_k_fte.fte
-lib/fte/etc/ui_k_fte2.fte
-lib/fte/etc/ui_k_ne.fte
-lib/fte/etc/ui_k_ws.fte
-lib/fte/etc/ui_m_fte.fte
-lib/fte/etc/ui_m_fte2.fte
-lib/fte/etc/ui_m_ne.fte
-lib/fte/etc/ui_m_ws.fte
-lib/fte/etc/ui_mew.fte
-lib/fte/etc/ui_ne.fte
-lib/fte/etc/ui_vi.fte
-lib/fte/etc/ui_ws.fte
-lib/fte/etc/uicstyle.fte
-lib/fte/etc/kbd/k_c.fte
-lib/fte/etc/kbd/k_fte.fte
-lib/fte/etc/kbd/k_html.fte
-lib/fte/etc/kbd/k_java.fte
-lib/fte/etc/kbd/k_perl.fte
-lib/fte/etc/kbd/k_rexx.fte
-lib/fte/etc/menu/m_c.fte
-lib/fte/etc/menu/m_html.fte
+etc/fte/ab_c.fte
+etc/fte/ab_c_os2.fte
+etc/fte/color.fte
+etc/fte/global.fte
+etc/fte/k_brief.fte
+etc/fte/m_ada.fte
+etc/fte/m_asm.fte
+etc/fte/m_asm370.fte
+etc/fte/m_bin.fte
+etc/fte/m_c.fte
+etc/fte/m_clario.fte
+etc/fte/m_diff.fte
+etc/fte/m_ebnf.fte
+etc/fte/m_fort90.fte
+etc/fte/m_fte.fte
+etc/fte/m_html.fte
+etc/fte/m_ipf.fte
+etc/fte/m_java.fte
+etc/fte/m_ldsgml.fte
+etc/fte/m_make.fte
+etc/fte/m_msg.fte
+etc/fte/m_mvsasm.fte
+etc/fte/m_pascal.fte
+etc/fte/m_perl.fte
+etc/fte/m_plain.fte
+etc/fte/m_resdlg.fte
+etc/fte/m_rexx.fte
+etc/fte/m_sh.fte
+etc/fte/m_siod.fte
+etc/fte/m_tcl.fte
+etc/fte/m_tex.fte
+etc/fte/m_texi.fte
+etc/fte/m_text.fte
+etc/fte/m_vi.fte
+etc/fte/m_xp.fte
+etc/fte/main.fte
+etc/fte/pal_blk.fte
+etc/fte/pal_blue.fte
+etc/fte/pal_wht.fte
+etc/fte/ui_brief.fte
+etc/fte/ui_fte.fte
+etc/fte/ui_fte2.fte
+etc/fte/ui_k_fte.fte
+etc/fte/ui_k_fte2.fte
+etc/fte/ui_k_ne.fte
+etc/fte/ui_k_ws.fte
+etc/fte/ui_m_fte.fte
+etc/fte/ui_m_fte2.fte
+etc/fte/ui_m_ne.fte
+etc/fte/ui_m_ws.fte
+etc/fte/ui_mew.fte
+etc/fte/ui_ne.fte
+etc/fte/ui_vi.fte
+etc/fte/ui_ws.fte
+etc/fte/uicstyle.fte
+etc/fte/kbd/k_c.fte
+etc/fte/kbd/k_fte.fte
+etc/fte/kbd/k_html.fte
+etc/fte/kbd/k_java.fte
+etc/fte/kbd/k_perl.fte
+etc/fte/kbd/k_rexx.fte
+etc/fte/menu/m_c.fte
+etc/fte/menu/m_html.fte
+share/doc/fte/about.html
+share/doc/fte/cfgfiles.html
+share/doc/fte/cmdopt.html
+share/doc/fte/colorize.html
+share/doc/fte/colors.html
+share/doc/fte/command.html
+share/doc/fte/contents.html
+share/doc/fte/events.html
+share/doc/fte/global.html
+share/doc/fte/index.html
+share/doc/fte/install.html
+share/doc/fte/modes.html
+share/doc/fte/perftips.html
+share/doc/fte/regexp.html
+share/doc/fte/status.html
+@dirrm share/doc/fte
+@dirrm etc/fte/kbd
+@dirrm etc/fte/menu
 @dirrm etc/fte
-@dirrm lib/fte/etc/kbd
-@dirrm lib/fte/etc/menu
-@dirrm lib/fte/etc
-@dirrm lib/fte