Attachment 55047 Details for Bug 83261 – file.diff

[patch] file.diff

file.diff (text/plain), 4.98 KB, created by Vsevolod Stakhov on 2005-07-11 17:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vsevolod Stakhov

Created: 2005-07-11 17:10:08 UTC

Size: 4.98 KB

patch

obsolete

>diff -ruPN fte.orig/Makefile fte/Makefile
>--- fte.orig/Makefile	Mon Jul 11 19:54:28 2005
>+++ fte/Makefile	Mon Jul 11 19:54:47 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=		fte
>-PORTVERSION=		20020324
>+PORTVERSION=		20050108
> CATEGORIES=		editors
> MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -16,12 +16,8 @@
> 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
>diff -ruPN fte.orig/distinfo fte/distinfo
>--- fte.orig/distinfo	Mon Jul 11 19:54:28 2005
>+++ fte/distinfo	Mon Jul 11 19:54:47 2005
>@@ -1,4 +1,4 @@
>-MD5 (fte-20020324-src.zip) = 6a0fb80491e4a4edfab0faf8f5a3dc49
>-SIZE (fte-20020324-src.zip) = 625459
>-MD5 (fte-20020324-common.zip) = 499b051f6484df3b4f93b43fe9143d0f
>-SIZE (fte-20020324-common.zip) = 184928
>+MD5 (fte-20050108-src.zip) = 910ef0041d5d56ede596fc6eb90c1f11
>+SIZE (fte-20050108-src.zip) = 545246
>+MD5 (fte-20050108-common.zip) = 200d22e821e550148c0494b54d7dfd25
>+SIZE (fte-20050108-common.zip) = 186252
>diff -ruPN fte.orig/files/patch-aa fte/files/patch-aa
>--- fte.orig/files/patch-aa	Mon Jul 11 19:54:28 2005
>+++ fte/files/patch-aa	Mon Jul 11 19:54:47 2005
>@@ -1,38 +1,73 @@
>---- src/fte-unix.mak.orig	Sun Apr 13 14:42:30 2003
>-+++ src/fte-unix.mak	Sun Apr 13 14:40:54 2003
>-@@ -5,8 +5,8 @@
>+--- 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 sfte
>+-TARGETS = xfte vfte nfte
>++#TARGETS = xfte vfte nfte
>+ #TARGETS = xfte vfte sfte nfte
> -#TARGETS = xfte
>-+#TARGETS = xfte vfte sfte
> +TARGETS = xfte
>  
>  PRIMARY = xfte
>  
>-@@ -48,8 +48,12 @@
>+@@ -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      = -DLINUX
>-+#XLIBDIR  = -L/usr/X11R6/lib -lstdc++
>-+
>-+UOS = -DFREEBSD
>-+XLIBDIR = -L/usr/X11R6/lib
>-+XINCDIR = -I/usr/X11R6/include
>++UOS      = -DFREEBSD
>++XINCDIR  = -I$(X11BASE)/include
>++XLIBDIR  = -L$(X11BASE)/lib
>  
>  #######################################################################
>  # HP/UX
>-@@ -150,7 +154,8 @@
>+@@ -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    = -lgpm -lncurses
>-+VLIBS = -lncurses
>++VLIBS    = -lncurses
>  # -ltermcap outdated by ncurses
>+ NLIBS    = -lncurses
>  SLIBS    = -lslang
>- QLIBS    = -lqt
>+@@ -227,6 +226,6 @@
>+ #
>+ # include dependency files if they exist
>+ #
>+-ifneq ($(wildcard .depend),)
>+-include .depend
>+-endif
>++#ifneq ($(wildcard .depend),)
>++#include .depend
>++#endif
>diff -ruPN fte.orig/pkg-plist fte/pkg-plist
>--- fte.orig/pkg-plist	Mon Jul 11 19:54:28 2005
>+++ fte/pkg-plist	Mon Jul 11 19:54:47 2005
>@@ -23,7 +23,6 @@
> 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
>@@ -72,18 +71,12 @@
> 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
>@@ -91,6 +84,14 @@
> 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

Actions: View | Diff

Attachments on bug 83261: 55047