- Update to 20051115

- Add USE_X_PREFIX, it's use X
- Add NOPORTDOCS
- Pass maintainership to submitter

PR:		ports/93950
Submitted by:	Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>

4 files changed, 78 insertions, 46 deletions

diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index d01466ab4f83..daa633f0b6d8 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -6,20 +6,33 @@
 #
 
 PORTNAME=		fte
-PORTVERSION=		20050108
+PORTVERSION=		20051115
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=		${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
 			${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		acardenas@bsd.org.pe
 COMMENT=		A full-featured text editor for X11
 
 WRKSRC=			${WRKDIR}/fte
 
+USE_X_PREFIX=	yes
 USE_XLIB=		yes
 USE_ZIP=		yes
 USE_PERL5_BUILD=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,^PREFIX=,PREFIX?=,' \
+		${WRKSRC}/Makefile
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/doc && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+.endif
+
 .include <bsd.port.mk>
diff --git a/editors/fte/distinfo b/editors/fte/distinfo
index fa42c77bdc18..46ccb78dd514 100644
--- a/editors/fte/distinfo
+++ b/editors/fte/distinfo
@@ -1,6 +1,6 @@
-MD5 (fte-20050108-src.zip) = 910ef0041d5d56ede596fc6eb90c1f11
-SHA256 (fte-20050108-src.zip) = 57b3b883cba32663a5380c9a3f4c48d61319857f319833849ef210467a0bcbde
-SIZE (fte-20050108-src.zip) = 545246
-MD5 (fte-20050108-common.zip) = 200d22e821e550148c0494b54d7dfd25
-SHA256 (fte-20050108-common.zip) = 8350045541a36df625d5615f14f9febb3614624b2e6a4f7e776a93f7e4d55921
-SIZE (fte-20050108-common.zip) = 186252
+MD5 (fte/fte-20051115-src.zip) = 01ca652803cea52a8321067adf159053
+SHA256 (fte/fte-20051115-src.zip) = bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962
+SIZE (fte/fte-20051115-src.zip) = 549216
+MD5 (fte/fte-20051115-common.zip) = fcbee61dfde33ba9aed59863c34b64c0
+SHA256 (fte/fte-20051115-common.zip) = 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4
+SIZE (fte/fte-20051115-common.zip) = 187849
diff --git a/editors/fte/files/patch-aa b/editors/fte/files/patch-aa
index da37f147d027..393b9544ff52 100644
--- a/editors/fte/files/patch-aa
+++ b/editors/fte/files/patch-aa
@@ -1,5 +1,5 @@
---- src/fte-unix.mak.orig	Sat Jan  8 21:15:19 2005
-+++ src/fte-unix.mak	Mon Jul 11 19:47:52 2005
+--- src/fte-unix.mak	Sun Nov 13 12:47:25 2005
++++ src/fte-unix.mak	Tue Feb 28 12:29:41 2006
 @@ -5,9 +5,9 @@
  
  #  vfte - for Linux console directly (with limitations, see con_linux.cpp)
@@ -12,7 +12,7 @@
  
  PRIMARY = xfte
  
-@@ -36,22 +36,21 @@
+@@ -40,22 +40,22 @@
  
  #gcc/g++
  COPTIONS = -Wall -Wpointer-arith -Wconversion -Wwrite-strings \
@@ -24,9 +24,9 @@
  # try this for smaller/faster code and less dependencies
 -CC       = g++ -fno-rtti -fno-exceptions
 -LD       = g++ -fno-rtti -fno-exceptions
--
 +CC       = $(CXX)
-+LD	 = $(CXX)
++LD      = $(CXX)
+ 
  
  # choose your os here
  
@@ -41,27 +41,27 @@
  
  #######################################################################
  # HP/UX
-@@ -141,8 +140,8 @@
+@@ -145,8 +145,8 @@
  #OPTIMIZE = -O2
  #OPTIMIZE = -O2 -s
  
--CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
+-CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(USE_XICON) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
 -LDFLAGS  = $(OPTIMIZE) $(LIBDIR) $(XLIBDIR) $(QLIBDIR) $(MLIBDIR)
 +CCFLAGS  = $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
 +LDFLAGS  += $(LIBDIR) $(XLIBDIR) $(MLIBDIR)
  
  OEXT     = o
  
-@@ -154,7 +153,7 @@
+@@ -158,7 +158,7 @@
  # Need -lXt below if USE_XTINIT is defined
- XLIBS    = -lX11 $(SOCKETLIB)
+ XLIBS    = -lX11 $(SOCKETLIB) $(XPMLIB)
  #-lmpatrol -lelf
 -VLIBS    = -lgpm -lncurses
 +VLIBS    = -lncurses
  # -ltermcap outdated by ncurses
  NLIBS    = -lncurses
  SLIBS    = -lslang
-@@ -227,6 +226,6 @@
+@@ -231,6 +231,6 @@
  #
  # include dependency files if they exist
  #
diff --git a/editors/fte/pkg-plist b/editors/fte/pkg-plist
index 599c06b50360..9bbb13820b9a 100644
--- a/editors/fte/pkg-plist
+++ b/editors/fte/pkg-plist
@@ -1,21 +1,26 @@
-bin/cfte
 bin/fte
 bin/xfte
-lib/fte/config/ab_c.fte
-lib/fte/config/ab_c_os2.fte
-lib/fte/config/ab_java.fte
-lib/fte/config/ab_rexx.fte
-lib/fte/config/ab_sh.fte
-lib/fte/config/color.fte
-lib/fte/config/global.fte
-lib/fte/config/k_brief.fte
-lib/fte/config/kbd/k_c.fte
+bin/cfte
+lib/fte/localconfig/systemmain.fte
+lib/fte/config/kbd/k_java.fte
 lib/fte/config/kbd/k_fte.fte
 lib/fte/config/kbd/k_html.fte
-lib/fte/config/kbd/k_java.fte
+lib/fte/config/kbd/k_c.fte
 lib/fte/config/kbd/k_perl.fte
 lib/fte/config/kbd/k_rexx.fte
 lib/fte/config/kbd/k_sgml.fte
+lib/fte/config/menu/m_c.fte
+lib/fte/config/menu/m_html.fte
+lib/fte/config/menu/m_rexx.fte
+lib/fte/config/menu/m_sgml.fte
+lib/fte/config/slang/simple.keylist
+lib/fte/config/slang/slangkbd.map
+lib/fte/config/ab_perl.fte
+lib/fte/config/ab_rexx.fte
+lib/fte/config/ab_sh.fte
+lib/fte/config/color.fte
+lib/fte/config/global.fte
+lib/fte/config/k_brief.fte
 lib/fte/config/m_4gl.fte
 lib/fte/config/m_a51.fte
 lib/fte/config/m_ada.fte
@@ -23,17 +28,20 @@ lib/fte/config/m_asm.fte
 lib/fte/config/m_asm370.fte
 lib/fte/config/m_bin.fte
 lib/fte/config/m_c.fte
+lib/fte/config/m_catbs.fte
 lib/fte/config/m_clario.fte
 lib/fte/config/m_diff.fte
 lib/fte/config/m_ebnf.fte
 lib/fte/config/m_fort90.fte
 lib/fte/config/m_fte.fte
+lib/fte/config/m_gawk.fte
 lib/fte/config/m_html.fte
 lib/fte/config/m_idl.fte
 lib/fte/config/m_ipf.fte
 lib/fte/config/m_java.fte
 lib/fte/config/m_ldsgml.fte
 lib/fte/config/m_make.fte
+lib/fte/config/m_merge.fte
 lib/fte/config/m_mod3.fte
 lib/fte/config/m_msg.fte
 lib/fte/config/m_mvsasm.fte
@@ -55,26 +63,26 @@ lib/fte/config/m_tcl.fte
 lib/fte/config/m_tex.fte
 lib/fte/config/m_texi.fte
 lib/fte/config/m_text.fte
+lib/fte/config/m_unrealscript.fte
 lib/fte/config/m_vi.fte
 lib/fte/config/m_xml.fte
 lib/fte/config/m_xp.fte
+lib/fte/config/m_xslt.fte
 lib/fte/config/main.fte
-lib/fte/config/menu/m_c.fte
-lib/fte/config/menu/m_html.fte
-lib/fte/config/menu/m_rexx.fte
-lib/fte/config/menu/m_sgml.fte
 lib/fte/config/mymain.fte
 lib/fte/config/pal_b_kb.fte
 lib/fte/config/pal_base.fte
 lib/fte/config/pal_blk.fte
+lib/fte/config/pal_blue.fte
+lib/fte/config/pal_bluez.fte
 lib/fte/config/pal_gray.fte
 lib/fte/config/pal_wht.fte
-lib/fte/config/slang/simple.keylist
-lib/fte/config/slang/slangkbd.map
+lib/fte/config/rgbcolor.fte
 lib/fte/config/ui_brief.fte
 lib/fte/config/ui_fte.fte
 lib/fte/config/ui_k_fte.fte
-lib/fte/config/ui_k_ne.fte
+lib/fte/config/ui_k_joe.fte
+lib/fte/config/ab_c.fte
 lib/fte/config/ui_k_ws.fte
 lib/fte/config/ui_m_fte.fte
 lib/fte/config/ui_m_ne.fte
@@ -84,19 +92,30 @@ lib/fte/config/ui_ne.fte
 lib/fte/config/ui_vi.fte
 lib/fte/config/ui_ws.fte
 lib/fte/config/uicstyle.fte
-lib/fte/config/ab_perl.fte
-lib/fte/config/m_catbs.fte
-lib/fte/config/m_gawk.fte
-lib/fte/config/m_merge.fte
-lib/fte/config/m_unrealscript.fte
-lib/fte/config/m_xslt.fte
-lib/fte/config/pal_blue.fte
-lib/fte/config/ui_k_joe.fte
-lib/fte/localconfig/systemmain.fte
+lib/fte/config/ui_k_ne.fte
+lib/fte/config/ab_c_os2.fte
+lib/fte/config/ab_java.fte
 lib/fte/system.fterc
+%%PORTDOCS%%%%DOCSDIR%%/INDEX
+%%PORTDOCS%%%%DOCSDIR%%/about.html
+%%PORTDOCS%%%%DOCSDIR%%/cfgfiles.html
+%%PORTDOCS%%%%DOCSDIR%%/cmdopt.html
+%%PORTDOCS%%%%DOCSDIR%%/colorize.html
+%%PORTDOCS%%%%DOCSDIR%%/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/command.html
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/events.html
+%%PORTDOCS%%%%DOCSDIR%%/global.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/modes.html
+%%PORTDOCS%%%%DOCSDIR%%/perftips.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp.html
+%%PORTDOCS%%%%DOCSDIR%%/status.html
+@dirrm lib/fte/localconfig
 @dirrm lib/fte/config/kbd
 @dirrm lib/fte/config/menu
 @dirrm lib/fte/config/slang
 @dirrm lib/fte/config
-@dirrm lib/fte/localconfig
 @dirrm lib/fte
+%%PORTDOCS%%@dirrm %%DOCSDIR%%