Date: Tue, 29 Jul 2014 13:10:45 -0400 From: Adam Weinberger <adamw@adamw.org> To: William Grzybowski <wg@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r363361 - in head/editors/fte: . files Message-ID: <41D25BC1-AC62-4280-A342-8A2BDD84B1E0@adamw.org> In-Reply-To: <201407291646.s6TGkjHH090335@svn.freebsd.org> References: <201407291646.s6TGkjHH090335@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29 Jul, 2014, at 12:46, William Grzybowski <wg@freebsd.org> wrote: > Author: wg > Date: Tue Jul 29 16:46:44 2014 > New Revision: 363361 > URL: http://svnweb.freebsd.org/changeset/ports/363361 > QAT: https://qat.redports.org/buildarchive/r363361/ >=20 > Log: > editors/fte: update to 20110708 >=20 > - Support stage > - Add LICENSE > - Rename patches >=20 > PR: 192202 > Submitted by: tkato432 yahoo com >=20 > Added: > head/editors/fte/files/patch-src::fte-unix.mak > - copied, changed from r363090, head/editors/fte/files/patch-aa > head/editors/fte/files/patch-src::stl_string.cpp (contents, props = changed) > head/editors/fte/files/patch-src::sysdep.h > - copied unchanged from r363090, head/editors/fte/files/patch-ba I=92m about to rename all patches that contain ::. Can we please stop = producing patches with :: as a path separator, and use __ instead? The = PHB does note (=A74.4.2) that the =91:=92 character is forbidden in = patch names. # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org > head/editors/fte/pkg-install (contents, props changed) > Deleted: > head/editors/fte/files/patch-aa > head/editors/fte/files/patch-ba > Modified: > head/editors/fte/Makefile > head/editors/fte/distinfo > head/editors/fte/pkg-plist >=20 > Modified: head/editors/fte/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/editors/fte/Makefile Tue Jul 29 16:42:11 2014 = (r363360) > +++ head/editors/fte/Makefile Tue Jul 29 16:46:44 2014 = (r363361) > @@ -1,34 +1,45 @@ > # Created by: gelf > # $FreeBSD$ >=20 > -PORTNAME=3D fte > -PORTVERSION=3D 20051115 > -PORTREVISION=3D 2 > -CATEGORIES=3D editors > -MASTER_SITES=3D = SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} > -DISTFILES=3D ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \ > - ${PORTNAME}-${PORTVERSION:S/./b/}-common.zip > +PORTNAME=3D fte > +PORTVERSION=3D 20110708 > +CATEGORIES=3D editors > +MASTER_SITES=3D = SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} > +DISTFILES=3D ${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \ > + ${PORTNAME}-${PORTVERSION:S/./b/}-common.zip > DIST_SUBDIR=3D ${PORTNAME} >=20 > MAINTAINER=3D ports@FreeBSD.org > COMMENT=3D Full-featured text editor for X11 >=20 > -WRKSRC=3D ${WRKDIR}/fte > +LICENSE=3D ART10 GPLv2 > +LICENSE_COMB=3D dual > + > +WRKSRC=3D ${WRKDIR}/fte >=20 > -USE_XORG=3D x11 xpm > USES=3D perl5 zip > USE_PERL5=3D build > +USE_XORG=3D x11 xpm > + > +CFLAGS+=3D -DHAVE_STRLCAT -DHAVE_STRLCPY > + > +OPTIONS_DEFINE=3D DOCS >=20 > -NO_STAGE=3D yes > post-patch: > - @${REINPLACE_CMD} -e 's,^PREFIX=3D,PREFIX?=3D,' \ > - ${WRKSRC}/Makefile > + @${REINPLACE_CMD} -e \ > + 's|^PREFIX=3D|PREFIX?=3D|' ${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 >=20 > 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 >=20 > .include <bsd.port.mk> >=20 > Modified: head/editors/fte/distinfo > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/editors/fte/distinfo Tue Jul 29 16:42:11 2014 = (r363360) > +++ head/editors/fte/distinfo Tue Jul 29 16:46:44 2014 = (r363361) > @@ -1,4 +1,4 @@ > -SHA256 (fte/fte-20051115-src.zip) =3D = bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962 > -SIZE (fte/fte-20051115-src.zip) =3D 549216 > -SHA256 (fte/fte-20051115-common.zip) =3D = 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4 > -SIZE (fte/fte-20051115-common.zip) =3D 187849 > +SHA256 (fte/fte-20110708-src.zip) =3D = d6311c542d3f0f2890a54a661c3b67228e27b894b4164e9faf29f014f254499e > +SIZE (fte/fte-20110708-src.zip) =3D 504199 > +SHA256 (fte/fte-20110708-common.zip) =3D = 58411578b31958765f42d2bf29b7aedd9f916955c2c19c96909a1c03e0246af7 > +SIZE (fte/fte-20110708-common.zip) =3D 200007 >=20 > Copied and modified: head/editors/fte/files/patch-src::fte-unix.mak = (from r363090, head/editors/fte/files/patch-aa) > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/editors/fte/files/patch-aa Sun Jul 27 18:37:45 2014 = (r363090, copy source) > +++ head/editors/fte/files/patch-src::fte-unix.mak Tue Jul 29 = 16:46:44 2014 (r363361) > @@ -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 @@ >=20 > # vfte - for Linux console directly (with limitations, see = con_linux.cpp) >=20 > --TARGETS =3D xfte vfte nfte > -+#TARGETS =3D xfte vfte nfte > - #TARGETS =3D xfte vfte sfte nfte > --#TARGETS =3D xfte > -+TARGETS =3D xfte > -=20 > - PRIMARY =3D xfte > -=20 > -@@ -40,22 +40,22 @@ > -=20 > - #gcc/g++ > - COPTIONS =3D -Wall -Wpointer-arith -Wconversion -Wwrite-strings \ > -- -Winline > -+ -Winline -fno-rtti -fno-exceptions > +-TGT_NFTE =3D nfte > ++#TGT_NFTE =3D nfte > + #TGT_QFTE =3D qfte > +-TGT_SFTE =3D sfte > +-TGT_VFTE =3D vfte > ++#TGT_SFTE =3D sfte > ++#TGT_VFTE =3D vfte > + TGT_XFTE =3D xfte > +=20 > + TARGETS =3D $(TGT_XFTE) $(TGT_VFTE) $(TGT_NFTE) $(TGT_SFTE) = $(TGT_QFTE) > +@@ -27,15 +27,16 @@ > + CPPOPTIONS =3D -Wall -Wpointer-arith -Wconversion -Wwrite-strings = -Winline >=20 > - #CC =3D g++ > - #LD =3D g++ > # try this for smaller/faster code and less dependencies > --CC =3D g++ -fno-rtti -fno-exceptions > --LD =3D g++ -fno-rtti -fno-exceptions > -+CC =3D $(CXX) > -+LD =3D $(CXX) > +-#NOEXCEPTION =3D -fno-rtti -fno-exceptions > ++NOEXCEPTION =3D -fno-rtti -fno-exceptions >=20 >=20 > # choose your os here > @@ -33,35 +27,56 @@ > = ####################################################################### > # Linux > -UOS =3D -DLINUX > --XINCDIR =3D -I/usr/X11R6/include > --XLIBDIR =3D -L/usr/X11R6/lib -lstdc++ > +-#XLIBDIR =3D=20 > +UOS =3D -DFREEBSD > +XINCDIR =3D -I$(LOCALBASE)/include > +XLIBDIR =3D -L$(LOCALBASE)/lib >=20 > = ####################################################################### > # HP/UX > -@@ -145,8 +145,8 @@ > +@@ -55,7 +56,7 @@ > + #MINCDIR =3D -I/usr/include/Motif1.2 > + #MLIBDIR =3D -L/usr/lib/Motif1.2 > +=20 > +-SINCDIR =3D -I/usr/include/slang > ++#SINCDIR =3D -I/usr/include/slang > +=20 > + = ####################################################################### > + # AIX > +@@ -111,18 +112,18 @@ > +=20 > + = ####################################################################### > +=20 > +-QTDIR =3D /usr/lib64/qt-3.3 > ++#QTDIR =3D /usr/lib64/qt-3.3 > + #/users/markom/qt > +-QLIBDIR =3D -L$(QTDIR)/lib > ++#QLIBDIR =3D -L$(QTDIR)/lib > + #QINCDIR =3D -I$(QTDIR)/include > + #QINCDIR =3D -I/usr/include/qt > +-QINCDIR =3D -I/usr/include/qt3 -I/usr/lib64/qt-3.3/include > +-MOC =3D moc > ++#QINCDIR =3D -I/usr/include/qt3 -I/usr/lib64/qt-3.3/include > ++#MOC =3D moc > +=20 > + LIBDIRS =3D > + INCDIRS =3D $(XINCDIR) $(QINCDIR) $(MINCDIR) $(SINCDIR) > +=20 > +-OPTIMIZE =3D -g # -O -g > ++#OPTIMIZE =3D -g # -O -g > #OPTIMIZE =3D -O2 > + #OPTIMIZE =3D -Os > #OPTIMIZE =3D -O2 -s > +@@ -148,7 +149,7 @@ > + $(XOBJS:.o=3D.cpp) >=20 > --CCFLAGS =3D $(OPTIMIZE) $(I18NOPTIONS) $(APPOPTIONS) $(USE_XICON) = $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) $(MINCDIR) = $(SINCDIR) > --LDFLAGS =3D $(OPTIMIZE) $(LIBDIR) $(XLIBDIR) $(QLIBDIR) $(MLIBDIR) > -+CCFLAGS =3D $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $(I18NOPTIONS) = $(APPOPTIONS) $(COPTIONS) -DUNIX $(UOS) $(INCDIR) $(XINCDIR) $(QINCDIR) = $(MINCDIR) $(SINCDIR) > -+LDFLAGS +=3D $(LIBDIR) $(XLIBDIR) $(MLIBDIR) > -=20 > - OEXT =3D o > -=20 > -@@ -158,7 +158,7 @@ > - # Need -lXt below if USE_XTINIT is defined > - XLIBS =3D -lX11 $(SOCKETLIB) $(XPMLIB) > - #-lmpatrol -lelf > --VLIBS =3D -lgpm -lncurses > -+VLIBS =3D -lncurses > - # -ltermcap outdated by ncurses > - NLIBS =3D -lncurses > - SLIBS =3D -lslang > -@@ -231,6 +231,6 @@ > + XLIBS =3D $(XLIBDIR) -lX11 $(SOCKETLIB) $(XPMLIB) $(XTLIB) > +-VLIBS =3D $(VLIBDIR) -lgpm > ++VLIBS =3D $(VLIBDIR) -lncurses > + NLIBS =3D $(NLIBDIR) -lncurses > + SLIBS =3D $(SLIBDIR) -lslang > + #QLIBS =3D $(QLIBDIR) -lqt > +@@ -223,6 +224,6 @@ > # > # include dependency files if they exist > # >=20 > Added: head/editors/fte/files/patch-src::stl_string.cpp > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/editors/fte/files/patch-src::stl_string.cpp Tue Jul 29 = 16:46:44 2014 (r363361) > @@ -0,0 +1,16 @@ > +--- src/stl_string.cpp.orig > ++++ src/stl_string.cpp > +@@ -10,6 +10,13 @@ > + #include <stdlib.h> > + #include <string.h> > +=20 > ++#ifdef tolower > ++#undef tolower > ++#endif > ++#ifdef toupper > ++#undef toupper > ++#endif > ++ > + FTE_BEGIN_NAMESPACE; > +=20 > + /* >=20 > Copied: head/editors/fte/files/patch-src::sysdep.h (from r363090, = head/editors/fte/files/patch-ba) > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/editors/fte/files/patch-src::sysdep.h Tue Jul 29 = 16:46:44 2014 (r363361, copy of r363090, = head/editors/fte/files/patch-ba) > @@ -0,0 +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 @@ > + !defined(IRIX) && \ > + !defined(SCO) && \ > + !defined(SUNOS) && \ > ++ !defined(FREEBSD) && \ > + !defined(NCR) > + # error Target not supported. > + #endif >=20 > Added: head/editors/fte/pkg-install > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/editors/fte/pkg-install Tue Jul 29 16:46:44 2014 = (r363361) > @@ -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 >=20 > Modified: head/editors/fte/pkg-plist > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/editors/fte/pkg-plist Tue Jul 29 16:42:11 2014 = (r363360) > +++ head/editors/fte/pkg-plist Tue Jul 29 16:46:44 2014 = (r363361) > @@ -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%% >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41D25BC1-AC62-4280-A342-8A2BDD84B1E0>