Attachment #55047 for bug #83261

View | Details | Raw Unified | Return to bug 83261
Collapse All | Expand All




#

PORTNAME=		fte
PORTVERSION=		20050108
CATEGORIES=		editors
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=		ports@FreeBSD.org
COMMENT=		A full-featured text editor for X11

BUILD_DEPENDS=  	unzip:${PORTSDIR}/archivers/unzip

WRKSRC=			${WRKDIR}/fte

EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS=
USE_XLIB=		yes
USE_ZIP=		yes
USE_PERL5_BUILD=	yes

Lines 1-4 Link Here

(-)fte/distinfo (-4 / +4 lines)
1	MD5 (fte-20020324-src.zip) = 6a0fb80491e4a4edfab0faf8f5a3dc49	1	MD5 (fte-20050108-src.zip) = 910ef0041d5d56ede596fc6eb90c1f11
2	SIZE (fte-20020324-src.zip) = 625459	2	SIZE (fte-20050108-src.zip) = 545246
3	MD5 (fte-20020324-common.zip) = 499b051f6484df3b4f93b43fe9143d0f	3	MD5 (fte-20050108-common.zip) = 200d22e821e550148c0494b54d7dfd25
4	SIZE (fte-20020324-common.zip) = 184928	4	SIZE (fte-20050108-common.zip) = 186252




--- src/fte-unix.mak.orig	Sat Jan  8 21:15:19 2005
+++ src/fte-unix.mak	Mon Jul 11 19:47:52 2005
@@ -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 vfte sfte
+TARGETS = xfte
 
 PRIMARY = xfte
 
@@ -36,22 +36,21 @@
 
 #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$(X11BASE)/include
+XLIBDIR  = -L$(X11BASE)/lib
+UOS = -DFREEBSD
+XLIBDIR = -L/usr/X11R6/lib
+XINCDIR = -I/usr/X11R6/include
 
 #######################################################################
 # HP/UX
@@ -141,8 +140,8 @@
 #OPTIMIZE = -O2
 #OPTIMIZE = -O2 -s
 
-CCFLAGS  = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(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 @@
 # Need -lXt below if USE_XTINIT is defined
 XLIBS    = -lX11 $(SOCKETLIB)
 #-lmpatrol -lelf
-VLIBS    = -lgpm -lncurses
+VLIBS    = -lncurses
+VLIBS = -lncurses
 # -ltermcap outdated by ncurses
 NLIBS    = -lncurses
 SLIBS    = -lslang
@@ -227,6 +226,6 @@
 #
 # include dependency files if they exist
 #
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+#ifneq ($(wildcard .depend),)
+#include .depend
+#endif




lib/fte/config/m_asm370.fte
lib/fte/config/m_bin.fte
lib/fte/config/m_c.fte
lib/fte/config/m_c_kb.fte
lib/fte/config/m_clario.fte
lib/fte/config/m_diff.fte
lib/fte/config/m_ebnf.fte

lib/fte/config/pal_wht.fte
lib/fte/config/slang/simple.keylist
lib/fte/config/slang/slangkbd.map
lib/fte/config/texput.log
lib/fte/config/ui_brief.fte
lib/fte/config/ui_fte.fte
lib/fte/config/ui_fte2.fte
lib/fte/config/ui_k_fte.fte
lib/fte/config/ui_k_fte2.fte
lib/fte/config/ui_k_ne.fte
lib/fte/config/ui_k_ws.fte
lib/fte/config/ui_kb.fte
lib/fte/config/ui_m_fte.fte
lib/fte/config/ui_m_fte2.fte
lib/fte/config/ui_m_kb.fte
lib/fte/config/ui_m_ne.fte
lib/fte/config/ui_m_ws.fte
lib/fte/config/ui_mew.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/system.fterc
@dirrm lib/fte/config/kbd

Return to bug 83261

Lines 6-12 Link Here

(-)fte/Makefile (-5 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= fte	8	PORTNAME= fte
9	PORTVERSION= 20020324	9	PORTVERSION= 20050108
10	CATEGORIES= editors	10	CATEGORIES= editors
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-27 Link Here
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A full-featured text editor for X11	17	COMMENT= A full-featured text editor for X11
18		18
19	BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
20
21	WRKSRC= ${WRKDIR}/fte	19	WRKSRC= ${WRKDIR}/fte
22		20
23	EXTRACT_BEFORE_ARGS=
24	EXTRACT_AFTER_ARGS=
25	USE_XLIB= yes	21	USE_XLIB= yes
26	USE_ZIP= yes	22	USE_ZIP= yes
27	USE_PERL5_BUILD= yes	23	USE_PERL5_BUILD= yes

Lines 1-38 Link Here

(-)fte/files/patch-aa (-16 / +51 lines)
1	--- src/fte-unix.mak.orig Sun Apr 13 14:42:30 2003	1	--- src/fte-unix.mak.orig Sat Jan 8 21:15:19 2005
2	+++ src/fte-unix.mak Sun Apr 13 14:40:54 2003	2	+++ src/fte-unix.mak Mon Jul 11 19:47:52 2005
3	@@ -5,8 +5,8 @@	3	@@ -5,9 +5,9 @@
4		4
5	# vfte - for Linux console directly (with limitations, see con_linux.cpp)	5	# vfte - for Linux console directly (with limitations, see con_linux.cpp)
6		6
7	-TARGETS = xfte vfte sfte	7	-TARGETS = xfte vfte nfte
		8	+#TARGETS = xfte vfte nfte
		9	#TARGETS = xfte vfte sfte nfte
8	-#TARGETS = xfte	10	-#TARGETS = xfte
9	+#TARGETS = xfte vfte sfte
10	+TARGETS = xfte	11	+TARGETS = xfte
11		12
12	PRIMARY = xfte	13	PRIMARY = xfte
13		14
14	@@ -48,8 +48,12 @@	15	@@ -36,22 +36,21 @@
		16
		17	#gcc/g++
		18	COPTIONS = -Wall -Wpointer-arith -Wconversion -Wwrite-strings \
		19	- -Winline
		20	+ -Winline -fno-rtti -fno-exceptions
		21
		22	#CC = g++
		23	#LD = g++
		24	# try this for smaller/faster code and less dependencies
		25	-CC = g++ -fno-rtti -fno-exceptions
		26	-LD = g++ -fno-rtti -fno-exceptions
		27	-
		28	+CC = $(CXX)
		29	+LD = $(CXX)
		30
		31	# choose your os here
15		32
16	#######################################################################	33	#######################################################################
17	# Linux	34	# Linux
18	-UOS = -DLINUX	35	-UOS = -DLINUX
		36	-XINCDIR = -I/usr/X11R6/include
19	-XLIBDIR = -L/usr/X11R6/lib -lstdc++	37	-XLIBDIR = -L/usr/X11R6/lib -lstdc++
20	+#UOS = -DLINUX	38	+UOS = -DFREEBSD
21	+#XLIBDIR = -L/usr/X11R6/lib -lstdc++	39	+XINCDIR = -I$(X11BASE)/include
22	+	40	+XLIBDIR = -L$(X11BASE)/lib
23	+UOS = -DFREEBSD
24	+XLIBDIR = -L/usr/X11R6/lib
25	+XINCDIR = -I/usr/X11R6/include
26		41
27	#######################################################################	42	#######################################################################
28	# HP/UX	43	# HP/UX
29	@@ -150,7 +154,8 @@	44	@@ -141,8 +140,8 @@
		45	#OPTIMIZE = -O2
		46	#OPTIMIZE = -O2 -s
		47
		48	-CCFLAGS = $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
		49	-LDFLAGS = $(OPTIMIZE) $(LIBDIR) $(XLIBDIR) $(QLIBDIR) $(MLIBDIR)
		50	+CCFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(I18NOPTIONS) $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR)
		51	+LDFLAGS += $(LIBDIR) $(XLIBDIR) $(MLIBDIR)
		52
		53	OEXT = o
30		54
		55	@@ -154,7 +153,7 @@
31	# Need -lXt below if USE_XTINIT is defined	56	# Need -lXt below if USE_XTINIT is defined
32	XLIBS = -lX11 $(SOCKETLIB)	57	XLIBS = -lX11 $(SOCKETLIB)
		58	#-lmpatrol -lelf
33	-VLIBS = -lgpm -lncurses	59	-VLIBS = -lgpm -lncurses
34	+#VLIBS = -lgpm -lncurses	60	+VLIBS = -lncurses
35	+VLIBS = -lncurses
36	# -ltermcap outdated by ncurses	61	# -ltermcap outdated by ncurses
		62	NLIBS = -lncurses
37	SLIBS = -lslang	63	SLIBS = -lslang
38	QLIBS = -lqt	64	@@ -227,6 +226,6 @@
		65	#
		66	# include dependency files if they exist
		67	#
		68	-ifneq ($(wildcard .depend),)
		69	-include .depend
		70	-endif
		71	+#ifneq ($(wildcard .depend),)
		72	+#include .depend
		73	+#endif

Lines 23-29 Link Here

(-)fte/pkg-plist (-7 / +8 lines)
23	lib/fte/config/m_asm370.fte	23	lib/fte/config/m_asm370.fte
24	lib/fte/config/m_bin.fte	24	lib/fte/config/m_bin.fte
25	lib/fte/config/m_c.fte	25	lib/fte/config/m_c.fte
26	lib/fte/config/m_c_kb.fte
27	lib/fte/config/m_clario.fte	26	lib/fte/config/m_clario.fte
28	lib/fte/config/m_diff.fte	27	lib/fte/config/m_diff.fte
29	lib/fte/config/m_ebnf.fte	28	lib/fte/config/m_ebnf.fte
Lines 72-89 Link Here
72	lib/fte/config/pal_wht.fte	71	lib/fte/config/pal_wht.fte
73	lib/fte/config/slang/simple.keylist	72	lib/fte/config/slang/simple.keylist
74	lib/fte/config/slang/slangkbd.map	73	lib/fte/config/slang/slangkbd.map
75	lib/fte/config/texput.log
76	lib/fte/config/ui_brief.fte	74	lib/fte/config/ui_brief.fte
77	lib/fte/config/ui_fte.fte	75	lib/fte/config/ui_fte.fte
78	lib/fte/config/ui_fte2.fte
79	lib/fte/config/ui_k_fte.fte	76	lib/fte/config/ui_k_fte.fte
80	lib/fte/config/ui_k_fte2.fte
81	lib/fte/config/ui_k_ne.fte	77	lib/fte/config/ui_k_ne.fte
82	lib/fte/config/ui_k_ws.fte	78	lib/fte/config/ui_k_ws.fte
83	lib/fte/config/ui_kb.fte
84	lib/fte/config/ui_m_fte.fte	79	lib/fte/config/ui_m_fte.fte
85	lib/fte/config/ui_m_fte2.fte
86	lib/fte/config/ui_m_kb.fte
87	lib/fte/config/ui_m_ne.fte	80	lib/fte/config/ui_m_ne.fte
88	lib/fte/config/ui_m_ws.fte	81	lib/fte/config/ui_m_ws.fte
89	lib/fte/config/ui_mew.fte	82	lib/fte/config/ui_mew.fte
Lines 91-96 Link Here
91	lib/fte/config/ui_vi.fte	84	lib/fte/config/ui_vi.fte
92	lib/fte/config/ui_ws.fte	85	lib/fte/config/ui_ws.fte
93	lib/fte/config/uicstyle.fte	86	lib/fte/config/uicstyle.fte
		87	lib/fte/config/ab_perl.fte
		88	lib/fte/config/m_catbs.fte
		89	lib/fte/config/m_gawk.fte
		90	lib/fte/config/m_merge.fte
		91	lib/fte/config/m_unrealscript.fte
		92	lib/fte/config/m_xslt.fte
		93	lib/fte/config/pal_blue.fte
		94	lib/fte/config/ui_k_joe.fte
94	lib/fte/localconfig/systemmain.fte	95	lib/fte/localconfig/systemmain.fte
95	lib/fte/system.fterc	96	lib/fte/system.fterc
96	@dirrm lib/fte/config/kbd	97	@dirrm lib/fte/config/kbd