svn commit: r363361 - in head/editors/fte: . files
William Grzybowski
wg at freebsd.org
Tue Jul 29 17:19:19 UTC 2014
On Tue, Jul 29, 2014 at 2:10 PM, Adam Weinberger <adamw at adamw.org> wrote:
> On 29 Jul, 2014, at 12:46, William Grzybowski <wg at 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/
>>
>> Log:
>> editors/fte: update to 20110708
>>
>> - Support stage
>> - Add LICENSE
>> - Rename patches
>>
>> PR: 192202
>> Submitted by: tkato432 yahoo com
>>
>> 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’m 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 (§4.4.2) that the ‘:’ character is forbidden in patch names.
Sure, sorry about that :)
> --
> Adam Weinberger
> adamw at 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
>>
>> Modified: head/editors/fte/Makefile
>> ==============================================================================
>> --- 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$
>>
>> -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 at 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>
>>
>> Modified: head/editors/fte/distinfo
>> ==============================================================================
>> --- 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) = 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
>>
>> Copied and modified: head/editors/fte/files/patch-src::fte-unix.mak (from r363090, head/editors/fte/files/patch-aa)
>> ==============================================================================
>> --- 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 @@
>>
>> # 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
>> #
>>
>> Added: head/editors/fte/files/patch-src::stl_string.cpp
>> ==============================================================================
>> --- /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>
>> +
>> ++#ifdef tolower
>> ++#undef tolower
>> ++#endif
>> ++#ifdef toupper
>> ++#undef toupper
>> ++#endif
>> ++
>> + FTE_BEGIN_NAMESPACE;
>> +
>> + /*
>>
>> Copied: head/editors/fte/files/patch-src::sysdep.h (from r363090, head/editors/fte/files/patch-ba)
>> ==============================================================================
>> --- /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
>>
>> Added: head/editors/fte/pkg-install
>> ==============================================================================
>> --- /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
>>
>> Modified: head/editors/fte/pkg-plist
>> ==============================================================================
>> --- 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
>> + at 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
>> - at dirrm lib/fte/config/kbd
>> - at dirrm lib/fte/config/menu
>> @dirrm lib/fte/config/slang
>> + at dirrm lib/fte/config/menu
>> + at dirrm lib/fte/config/kbd
>> @dirrm lib/fte/config
>> @dirrm lib/fte
>> -%%PORTDOCS%%@dirrm %%DOCSDIR%%
>>
>
--
William Grzybowski / wg
FreeBSD Ports Committer
More information about the svn-ports-all
mailing list