- Switch to options helpers

- Regenerate patches
- Cleanup pkg-descr

5 files changed, 15 insertions, 16 deletions

diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 25c6a4bbdb9e..62082950ebd7 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -37,10 +37,12 @@ post-patch:
 		 /fterc/s|^|#|' ${WRKSRC}/install
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .for i in cfte xfte
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
diff --git a/editors/fte/files/patch-src__fte-unix.mak b/editors/fte/files/patch-src__fte-unix.mak
index 23a48039e4fb..487e31ff972f 100644
--- a/editors/fte/files/patch-src__fte-unix.mak
+++ b/editors/fte/files/patch-src__fte-unix.mak
@@ -1,5 +1,5 @@
---- src/fte-unix.mak	Sun Nov 13 12:47:25 2005
-+++ src/fte-unix.mak	Tue Feb 28 12:29:41 2006
+--- src/fte-unix.mak.orig	2010-03-16 18:03:51 UTC
++++ src/fte-unix.mak
 @@ -5,10 +5,10 @@
  
  #  vfte - for Linux console directly (with limitations, see con_linux.cpp)
@@ -14,7 +14,7 @@
  TGT_XFTE = xfte
  
  TARGETS = $(TGT_XFTE) $(TGT_VFTE) $(TGT_NFTE) $(TGT_SFTE) $(TGT_QFTE)
-@@ -27,15 +27,16 @@
+@@ -27,15 +27,16 @@ LD = $(CXX)
  CPPOPTIONS = -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Winline
  
  # try this for smaller/faster code and less dependencies
@@ -34,7 +34,7 @@
  
  #######################################################################
  # HP/UX
-@@ -55,7 +56,7 @@
+@@ -55,7 +56,7 @@ UOS      = -DLINUX
  #MINCDIR  = -I/usr/include/Motif1.2
  #MLIBDIR  = -L/usr/lib/Motif1.2
  
@@ -43,7 +43,7 @@
  
  #######################################################################
  # AIX
-@@ -111,18 +112,18 @@
+@@ -111,18 +112,18 @@ SINCDIR   = -I/usr/include/slang
  
  #######################################################################
  
@@ -67,7 +67,7 @@
  #OPTIMIZE = -O2
  #OPTIMIZE = -Os
  #OPTIMIZE = -O2 -s
-@@ -148,7 +149,7 @@
+@@ -148,7 +149,7 @@ SRCS = $(OBJS:.o=.cpp)\
   $(XOBJS:.o=.cpp)
  
  XLIBS    = $(XLIBDIR) -lX11 $(SOCKETLIB) $(XPMLIB) $(XTLIB)
@@ -76,7 +76,7 @@
  NLIBS    = $(NLIBDIR) -lncurses
  SLIBS    = $(SLIBDIR) -lslang
  #QLIBS    = $(QLIBDIR) -lqt
-@@ -223,6 +224,6 @@
+@@ -223,6 +224,6 @@ clean:
  #
  # include dependency files if they exist
  #
diff --git a/editors/fte/files/patch-src__stl_string.cpp b/editors/fte/files/patch-src__stl_string.cpp
index 2391d7c34abf..cce66aeacd17 100644
--- a/editors/fte/files/patch-src__stl_string.cpp
+++ b/editors/fte/files/patch-src__stl_string.cpp
@@ -1,4 +1,4 @@
---- src/stl_string.cpp.orig
+--- src/stl_string.cpp.orig	2010-03-05 20:40:08 UTC
 +++ src/stl_string.cpp
 @@ -10,6 +10,13 @@
  #include <stdlib.h>
diff --git a/editors/fte/files/patch-src__sysdep.h b/editors/fte/files/patch-src__sysdep.h
index 3ab3d907b2d7..070b2eec3b94 100644
--- a/editors/fte/files/patch-src__sysdep.h
+++ b/editors/fte/files/patch-src__sysdep.h
@@ -1,6 +1,6 @@
---- src/sysdep.h.orig	Sun Apr 13 14:43:59 2003
-+++ src/sysdep.h	Sun Apr 13 13:54:17 2003
-@@ -38,6 +38,7 @@
+--- src/sysdep.h.orig	2011-06-29 22:32:34 UTC
++++ src/sysdep.h
+@@ -21,6 +21,7 @@
      !defined(IRIX) && \
      !defined(SCO) && \
      !defined(SUNOS) && \
diff --git a/editors/fte/pkg-descr b/editors/fte/pkg-descr
index ef6a82546103..99d8666732f6 100644
--- a/editors/fte/pkg-descr
+++ b/editors/fte/pkg-descr
@@ -6,6 +6,3 @@ Among other features it supports syntax highlighting,
 compiler invocation and error parsing and folds.
 
 WWW: http://fte.sourceforge.net/
-
-Alexander Gelfenbain
-mail@gelf.com