aboutsummaryrefslogtreecommitdiffstats
path: root/editors/fte
diff options
context:
space:
mode:
Diffstat (limited to 'editors/fte')
-rw-r--r--editors/fte/Makefile45
-rw-r--r--editors/fte/distinfo8
-rw-r--r--editors/fte/files/patch-aa73
-rw-r--r--editors/fte/files/patch-src::fte-unix.mak88
-rw-r--r--editors/fte/files/patch-src::stl_string.cpp16
-rw-r--r--editors/fte/files/patch-src::sysdep.h (renamed from editors/fte/files/patch-ba)0
-rw-r--r--editors/fte/pkg-install8
-rw-r--r--editors/fte/pkg-plist49
8 files changed, 170 insertions, 117 deletions
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 2711837a5021..cd1ad8bf0b9d 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -1,34 +1,45 @@
# Created by: gelf
# $FreeBSD$
-PORTNAME= fte
-PORTVERSION= 20051115
-PORTREVISION= 2
-CATEGORIES= editors
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES= ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
- ${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
+PORTNAME= fte
+PORTVERSION= 20110708
+CATEGORIES= editors
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+DISTFILES= ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
+ ${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Full-featured text editor for X11
-WRKSRC= ${WRKDIR}/fte
+LICENSE= ART10 GPLv2
+LICENSE_COMB= dual
+
+WRKSRC= ${WRKDIR}/fte
-USE_XORG= x11 xpm
USES= perl5 zip
USE_PERL5= build
+USE_XORG= x11 xpm
+
+CFLAGS+= -DHAVE_STRLCAT -DHAVE_STRLCPY
+
+OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
post-patch:
- @${REINPLACE_CMD} -e 's,^PREFIX=,PREFIX?=,' \
- ${WRKSRC}/Makefile
+ @${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:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC}/doc && \
- ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+.for i in cfte xfte
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
+.endfor
.include <bsd.port.mk>
diff --git a/editors/fte/distinfo b/editors/fte/distinfo
index e5d82c63e875..5db90270a770 100644
--- a/editors/fte/distinfo
+++ b/editors/fte/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fte/fte-20051115-src.zip) = bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962
-SIZE (fte/fte-20051115-src.zip) = 549216
-SHA256 (fte/fte-20051115-common.zip) = 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4
-SIZE (fte/fte-20051115-common.zip) = 187849
+SHA256 (fte/fte-20110708-src.zip) = d6311c542d3f0f2890a54a661c3b67228e27b894b4164e9faf29f014f254499e
+SIZE (fte/fte-20110708-src.zip) = 504199
+SHA256 (fte/fte-20110708-common.zip) = 58411578b31958765f42d2bf29b7aedd9f916955c2c19c96909a1c03e0246af7
+SIZE (fte/fte-20110708-common.zip) = 200007
diff --git a/editors/fte/files/patch-aa b/editors/fte/files/patch-aa
deleted file mode 100644
index ba2ccd6b62aa..000000000000
--- a/editors/fte/files/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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)
-
--TARGETS = xfte vfte nfte
-+#TARGETS = xfte vfte nfte
- #TARGETS = xfte vfte sfte nfte
--#TARGETS = xfte
-+TARGETS = xfte
-
- PRIMARY = xfte
-
-@@ -40,22 +40,22 @@
-
- #gcc/g++
- COPTIONS = -Wall -Wpointer-arith -Wconversion -Wwrite-strings \
-- -Winline
-+ -Winline -fno-rtti -fno-exceptions
-
- #CC = g++
- #LD = g++
- # 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)
-
-
- # choose your os here
-
- #######################################################################
- # Linux
--UOS = -DLINUX
--XINCDIR = -I/usr/X11R6/include
--XLIBDIR = -L/usr/X11R6/lib -lstdc++
-+UOS = -DFREEBSD
-+XINCDIR = -I$(LOCALBASE)/include
-+XLIBDIR = -L$(LOCALBASE)/lib
-
- #######################################################################
- # HP/UX
-@@ -145,8 +145,8 @@
- #OPTIMIZE = -O2
- #OPTIMIZE = -O2 -s
-
--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
-
-@@ -158,7 +158,7 @@
- # Need -lXt below if USE_XTINIT is defined
- XLIBS = -lX11 $(SOCKETLIB) $(XPMLIB)
- #-lmpatrol -lelf
--VLIBS = -lgpm -lncurses
-+VLIBS = -lncurses
- # -ltermcap outdated by ncurses
- NLIBS = -lncurses
- SLIBS = -lslang
-@@ -231,6 +231,6 @@
- #
- # include dependency files if they exist
- #
--ifneq ($(wildcard .depend),)
--include .depend
--endif
-+#ifneq ($(wildcard .depend),)
-+#include .depend
-+#endif
diff --git a/editors/fte/files/patch-src::fte-unix.mak b/editors/fte/files/patch-src::fte-unix.mak
new file mode 100644
index 000000000000..23a48039e4fb
--- /dev/null
+++ b/editors/fte/files/patch-src::fte-unix.mak
@@ -0,0 +1,88 @@
+--- src/fte-unix.mak Sun Nov 13 12:47:25 2005
++++ src/fte-unix.mak Tue Feb 28 12:29:41 2006
+@@ -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 @@
+ 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 @@
+ #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 @@
+
+ #######################################################################
+
+-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 @@
+ $(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 @@
+ #
+ # include dependency files if they exist
+ #
+-ifneq ($(wildcard .depend),)
+-include .depend
+-endif
++#ifneq ($(wildcard .depend),)
++#include .depend
++#endif
diff --git a/editors/fte/files/patch-src::stl_string.cpp b/editors/fte/files/patch-src::stl_string.cpp
new file mode 100644
index 000000000000..2391d7c34abf
--- /dev/null
+++ b/editors/fte/files/patch-src::stl_string.cpp
@@ -0,0 +1,16 @@
+--- src/stl_string.cpp.orig
++++ src/stl_string.cpp
+@@ -10,6 +10,13 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#ifdef tolower
++#undef tolower
++#endif
++#ifdef toupper
++#undef toupper
++#endif
++
+ FTE_BEGIN_NAMESPACE;
+
+ /*
diff --git a/editors/fte/files/patch-ba b/editors/fte/files/patch-src::sysdep.h
index 3ab3d907b2d7..3ab3d907b2d7 100644
--- a/editors/fte/files/patch-ba
+++ b/editors/fte/files/patch-src::sysdep.h
diff --git a/editors/fte/pkg-install b/editors/fte/pkg-install
new file mode 100644
index 000000000000..b68a917033d8
--- /dev/null
+++ b/editors/fte/pkg-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ cd $PKG_PREFIX/lib/fte/config; $PKG_PREFIX/bin/cfte main.fte $PKG_PREFIX/lib/fte/system.fterc
+ exit 0
+ ;;
+esac
diff --git a/editors/fte/pkg-plist b/editors/fte/pkg-plist
index 9bbb13820b9a..75b2ba5b9014 100644
--- a/editors/fte/pkg-plist
+++ b/editors/fte/pkg-plist
@@ -1,26 +1,23 @@
+bin/cfte
bin/fte
bin/xfte
-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_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_c.fte
+lib/fte/config/ab_c_os2.fte
+lib/fte/config/ab_java.fte
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/kbd/k_c.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_perl.fte
+lib/fte/config/kbd/k_rexx.fte
+lib/fte/config/kbd/k_rst.fte
+lib/fte/config/kbd/k_sgml.fte
lib/fte/config/m_4gl.fte
lib/fte/config/m_a51.fte
lib/fte/config/m_ada.fte
@@ -52,6 +49,7 @@ lib/fte/config/m_plain.fte
lib/fte/config/m_py.fte
lib/fte/config/m_resdlg.fte
lib/fte/config/m_rexx.fte
+lib/fte/config/m_rst.fte
lib/fte/config/m_ruby.fte
lib/fte/config/m_sgml.fte
lib/fte/config/m_sh.fte
@@ -69,6 +67,11 @@ 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_rst.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
@@ -78,11 +81,13 @@ lib/fte/config/pal_bluez.fte
lib/fte/config/pal_gray.fte
lib/fte/config/pal_wht.fte
lib/fte/config/rgbcolor.fte
+lib/fte/config/slang/simple.keylist
+lib/fte/config/slang/slangkbd.map
lib/fte/config/ui_brief.fte
lib/fte/config/ui_fte.fte
lib/fte/config/ui_k_fte.fte
lib/fte/config/ui_k_joe.fte
-lib/fte/config/ab_c.fte
+lib/fte/config/ui_k_ne.fte
lib/fte/config/ui_k_ws.fte
lib/fte/config/ui_m_fte.fte
lib/fte/config/ui_m_ne.fte
@@ -92,10 +97,8 @@ 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/ui_k_ne.fte
-lib/fte/config/ab_c_os2.fte
-lib/fte/config/ab_java.fte
-lib/fte/system.fterc
+lib/fte/localconfig/systemmain.fte
+@rmtry lib/fte/system.fterc
%%PORTDOCS%%%%DOCSDIR%%/INDEX
%%PORTDOCS%%%%DOCSDIR%%/about.html
%%PORTDOCS%%%%DOCSDIR%%/cfgfiles.html
@@ -112,10 +115,10 @@ lib/fte/system.fterc
%%PORTDOCS%%%%DOCSDIR%%/perftips.html
%%PORTDOCS%%%%DOCSDIR%%/regexp.html
%%PORTDOCS%%%%DOCSDIR%%/status.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/fte/localconfig
-@dirrm lib/fte/config/kbd
-@dirrm lib/fte/config/menu
@dirrm lib/fte/config/slang
+@dirrm lib/fte/config/menu
+@dirrm lib/fte/config/kbd
@dirrm lib/fte/config
@dirrm lib/fte
-%%PORTDOCS%%@dirrm %%DOCSDIR%%