Index: head/editors/fte/Makefile =================================================================== --- head/editors/fte/Makefile (revision 436386) +++ head/editors/fte/Makefile (revision 436387) @@ -1,46 +1,48 @@ # Created by: gelf # $FreeBSD$ PORTNAME= fte PORTVERSION= 20110708 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \ ${DISTNAME}-common${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Full-featured text editor for X11 LICENSE= ART10 GPLv2 LICENSE_COMB= dual WRKSRC= ${WRKDIR}/fte USES= perl5 zip USE_PERL5= build USE_XORG= x11 xpm CFLAGS+= -DHAVE_STRLCAT -DHAVE_STRLCPY MAKE_ENV= INSTALL_NONROOT=1 OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's|^PREFIX=|PREFIX?=|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e \ 's|\([[:space:]]\)\($$BINDIR\)|\1$$DESTDIR\2|g ; \ s|\([[:space:]]\)\($$LIBDIR\)|\1$$DESTDIR\2|g ; \ s|\([[:space:]]\)\($$CONFIGDIR\)|\1$$DESTDIR\2|g ; \ s|\([[:space:]]\)\($$LOCALCONFIGDIR\)|\1$$DESTDIR\2|g ; \ /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 Index: head/editors/fte/files/patch-src__fte-unix.mak =================================================================== --- head/editors/fte/files/patch-src__fte-unix.mak (revision 436386) +++ head/editors/fte/files/patch-src__fte-unix.mak (revision 436387) @@ -1,88 +1,88 @@ ---- 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) -TGT_NFTE = nfte +#TGT_NFTE = nfte #TGT_QFTE = qfte -TGT_SFTE = sfte -TGT_VFTE = vfte +#TGT_SFTE = sfte +#TGT_VFTE = vfte 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 -#NOEXCEPTION = -fno-rtti -fno-exceptions +NOEXCEPTION = -fno-rtti -fno-exceptions # choose your os here ####################################################################### # Linux -UOS = -DLINUX -#XLIBDIR = +UOS = -DFREEBSD +XINCDIR = -I$(LOCALBASE)/include +XLIBDIR = -L$(LOCALBASE)/lib ####################################################################### # HP/UX -@@ -55,7 +56,7 @@ +@@ -55,7 +56,7 @@ UOS = -DLINUX #MINCDIR = -I/usr/include/Motif1.2 #MLIBDIR = -L/usr/lib/Motif1.2 -SINCDIR = -I/usr/include/slang +#SINCDIR = -I/usr/include/slang ####################################################################### # AIX -@@ -111,18 +112,18 @@ +@@ -111,18 +112,18 @@ SINCDIR = -I/usr/include/slang ####################################################################### -QTDIR = /usr/lib64/qt-3.3 +#QTDIR = /usr/lib64/qt-3.3 #/users/markom/qt -QLIBDIR = -L$(QTDIR)/lib +#QLIBDIR = -L$(QTDIR)/lib #QINCDIR = -I$(QTDIR)/include #QINCDIR = -I/usr/include/qt -QINCDIR = -I/usr/include/qt3 -I/usr/lib64/qt-3.3/include -MOC = moc +#QINCDIR = -I/usr/include/qt3 -I/usr/lib64/qt-3.3/include +#MOC = moc LIBDIRS = INCDIRS = $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR) -OPTIMIZE = -g # -O -g +#OPTIMIZE = -g # -O -g #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) -VLIBS = $(VLIBDIR) -lgpm +VLIBS = $(VLIBDIR) -lncurses NLIBS = $(NLIBDIR) -lncurses SLIBS = $(SLIBDIR) -lslang #QLIBS = $(QLIBDIR) -lqt -@@ -223,6 +224,6 @@ +@@ -223,6 +224,6 @@ clean: # # include dependency files if they exist # -ifneq ($(wildcard .depend),) -include .depend -endif +#ifneq ($(wildcard .depend),) +#include .depend +#endif Index: head/editors/fte/files/patch-src__stl_string.cpp =================================================================== --- head/editors/fte/files/patch-src__stl_string.cpp (revision 436386) +++ head/editors/fte/files/patch-src__stl_string.cpp (revision 436387) @@ -1,16 +1,16 @@ ---- 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 #include +#ifdef tolower +#undef tolower +#endif +#ifdef toupper +#undef toupper +#endif + FTE_BEGIN_NAMESPACE; /* Index: head/editors/fte/files/patch-src__sysdep.h =================================================================== --- head/editors/fte/files/patch-src__sysdep.h (revision 436386) +++ head/editors/fte/files/patch-src__sysdep.h (revision 436387) @@ -1,10 +1,10 @@ ---- 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) && \ + !defined(FREEBSD) && \ !defined(NCR) # error Target not supported. #endif Index: head/editors/fte/pkg-descr =================================================================== --- head/editors/fte/pkg-descr (revision 436386) +++ head/editors/fte/pkg-descr (revision 436387) @@ -1,11 +1,8 @@ A port of an extremely powerful FTE editor that was originally developed for OS/2 and ported by its author, Marko Macek, to X11/UNIX. Among other features it supports syntax highlighting, compiler invocation and error parsing and folds. WWW: http://fte.sourceforge.net/ - -Alexander Gelfenbain -mail@gelf.com