Attachment 145089 Details for Bug 192202 – editors_fte.diff

[patch] editors_fte.diff

editors_fte.diff (text/plain), 10.19 KB, created by tkato432 on 2014-07-28 18:33:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-07-28 18:33:06 UTC

Size: 10.19 KB

patch

obsolete

>diff -urN /usr/ports/editors/fte/Makefile editors/fte/Makefile
>--- /usr/ports/editors/fte/Makefile	2014-07-24 03:55:49.000000000 +0900
>+++ editors/fte/Makefile	2014-07-29 00:00:00.000000000 +0900
>@@ -1,34 +1,45 @@
> # Created by: gelf
> # $FreeBSD: head/editors/fte/Makefile 362705 2014-07-23 16:44:27Z bapt $
> 
>-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 -urN /usr/ports/editors/fte/distinfo editors/fte/distinfo
>--- /usr/ports/editors/fte/distinfo	2014-06-21 17:47:48.000000000 +0900
>+++ editors/fte/distinfo	2014-07-29 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/editors/fte/files/patch-aa editors/fte/files/patch-aa
>--- /usr/ports/editors/fte/files/patch-aa	2014-06-21 17:47:48.000000000 +0900
>+++ editors/fte/files/patch-aa	2014-07-29 00:00:00.000000000 +0900
>@@ -1,31 +1,25 @@
> --- 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 @@
>+@@ -5,10 +5,10 @@
>  
>  #  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
>+-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
>  
>- #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)
>+-#NOEXCEPTION = -fno-rtti -fno-exceptions
>++NOEXCEPTION = -fno-rtti -fno-exceptions
>  
>  
>  # choose your os here
>@@ -33,35 +27,56 @@
>  #######################################################################
>  # Linux
> -UOS      = -DLINUX
>--XINCDIR  = -I/usr/X11R6/include
>--XLIBDIR  = -L/usr/X11R6/lib -lstdc++
>+-#XLIBDIR  = 
> +UOS      = -DFREEBSD
> +XINCDIR  = -I$(LOCALBASE)/include
> +XLIBDIR  = -L$(LOCALBASE)/lib
>  
>  #######################################################################
>  # HP/UX
>-@@ -145,8 +145,8 @@
>+@@ -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)
>  
>--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 @@
>+ 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
>  #
>diff -urN /usr/ports/editors/fte/files/patch-zz editors/fte/files/patch-zz
>--- /usr/ports/editors/fte/files/patch-zz	1970-01-01 09:00:00.000000000 +0900
>+++ editors/fte/files/patch-zz	2014-07-29 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/editors/fte/pkg-install editors/fte/pkg-install
>--- /usr/ports/editors/fte/pkg-install	1970-01-01 09:00:00.000000000 +0900
>+++ editors/fte/pkg-install	2014-07-29 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/editors/fte/pkg-plist editors/fte/pkg-plist
>--- /usr/ports/editors/fte/pkg-plist	2014-06-21 17:47:48.000000000 +0900
>+++ editors/fte/pkg-plist	2014-07-29 00:00:00.000000000 +0900
>@@ -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_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_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_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_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 @@
> %%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%%

Actions: View | Diff

Attachments on bug 192202: 145089