Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Feb 2006 18:16:49 GMT
From:      Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/93950: [PATCH] editors/fte: update to 20051115, take maintainership
Message-ID:  <200602281816.k1SIGnam046050@www.freebsd.org>
Resent-Message-ID: <200602281820.k1SIK3Ir080269@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         93950
>Category:       ports
>Synopsis:       [PATCH] editors/fte: update to 20051115, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 28 18:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jose Alonso Cardenas Marquez
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
BSDPeru (http://www.bsd.org.pe)
>Environment:
FreeBSD HellFire.BSD.org.pe 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Wed Feb 15 20:23:11 PET 2006
>Description:
- Update to 20051115
- Add USE_X_PREFIX, it's use X
- Add NOPORTDOCS
- Respect use characters [-+._a-zA-Z0-9] on patch name 
- Take maintainership

Added file(s):
- files/patch-src_fte-unix.mak
- files/patch-src_sysdep.h

Removed file(s):
- files/patch-aa
- files/patch-ba
>How-To-Repeat:

>Fix:
--- fte-20051115.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/fte/Makefile /usr/ports/editors/fte-new/Makefile
--- /usr/ports/editors/fte/Makefile	Tue Jul 12 08:06:47 2005
+++ /usr/ports/editors/fte-new/Makefile	Tue Feb 28 13:06:55 2006
@@ -6,20 +6,29 @@
 #
 
 PORTNAME=		fte
-PORTVERSION=		20050108
+PORTVERSION=		20051115
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=		${PORTNAME}-${PORTVERSION:S/./b/}-src.zip \
 			${PORTNAME}-${PORTVERSION:S/./b/}-common.zip
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		acardenas@bsd.org.pe
 COMMENT=		A full-featured text editor for X11
 
 WRKSRC=			${WRKDIR}/fte
 
+USE_X_PREFIX=	yes
 USE_XLIB=		yes
 USE_ZIP=		yes
 USE_PERL5_BUILD=	yes
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/doc && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+.endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/editors/fte/distinfo /usr/ports/editors/fte-new/distinfo
--- /usr/ports/editors/fte/distinfo	Thu Nov 24 13:54:51 2005
+++ /usr/ports/editors/fte-new/distinfo	Tue Feb 28 12:34:31 2006
@@ -1,6 +1,6 @@
-MD5 (fte-20050108-src.zip) = 910ef0041d5d56ede596fc6eb90c1f11
-SHA256 (fte-20050108-src.zip) = 57b3b883cba32663a5380c9a3f4c48d61319857f319833849ef210467a0bcbde
-SIZE (fte-20050108-src.zip) = 545246
-MD5 (fte-20050108-common.zip) = 200d22e821e550148c0494b54d7dfd25
-SHA256 (fte-20050108-common.zip) = 8350045541a36df625d5615f14f9febb3614624b2e6a4f7e776a93f7e4d55921
-SIZE (fte-20050108-common.zip) = 186252
+MD5 (fte/fte-20051115-src.zip) = 01ca652803cea52a8321067adf159053
+SHA256 (fte/fte-20051115-src.zip) = bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962
+SIZE (fte/fte-20051115-src.zip) = 549216
+MD5 (fte/fte-20051115-common.zip) = fcbee61dfde33ba9aed59863c34b64c0
+SHA256 (fte/fte-20051115-common.zip) = 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4
+SIZE (fte/fte-20051115-common.zip) = 187849
diff -ruN --exclude=CVS /usr/ports/editors/fte/files/patch-aa /usr/ports/editors/fte-new/files/patch-aa
--- /usr/ports/editors/fte/files/patch-aa	Tue Jul 12 08:06:47 2005
+++ /usr/ports/editors/fte-new/files/patch-aa	Wed Dec 31 19:00:00 1969
@@ -1,73 +0,0 @@
---- 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
- 
- 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
- 
- #######################################################################
- # 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
- # -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
diff -ruN --exclude=CVS /usr/ports/editors/fte/files/patch-ba /usr/ports/editors/fte-new/files/patch-ba
--- /usr/ports/editors/fte/files/patch-ba	Sun Nov 16 22:05:57 2003
+++ /usr/ports/editors/fte-new/files/patch-ba	Wed Dec 31 19:00:00 1969
@@ -1,10 +0,0 @@
---- 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
diff -ruN --exclude=CVS /usr/ports/editors/fte/files/patch-src_fte-unix.mak /usr/ports/editors/fte-new/files/patch-src_fte-unix.mak
--- /usr/ports/editors/fte/files/patch-src_fte-unix.mak	Wed Dec 31 19:00:00 1969
+++ /usr/ports/editors/fte-new/files/patch-src_fte-unix.mak	Tue Feb 28 12:33:24 2006
@@ -0,0 +1,73 @@
+--- 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 @@
+ 
+ #  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
+ 
+ #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
+ 
+ #######################################################################
+ # HP/UX
+@@ -145,8 +145,8 @@
+ #OPTIMIZE = -O2
+ #OPTIMIZE = -O2 -s
+ 
+-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 @@
+ #
+ # include dependency files if they exist
+ #
+-ifneq ($(wildcard .depend),)
+-include .depend
+-endif
++#ifneq ($(wildcard .depend),)
++#include .depend
++#endif
diff -ruN --exclude=CVS /usr/ports/editors/fte/files/patch-src_sysdep.h /usr/ports/editors/fte-new/files/patch-src_sysdep.h
--- /usr/ports/editors/fte/files/patch-src_sysdep.h	Wed Dec 31 19:00:00 1969
+++ /usr/ports/editors/fte-new/files/patch-src_sysdep.h	Tue Feb 28 12:34:16 2006
@@ -0,0 +1,10 @@
+--- src/sysdep.h	Sun Jan 25 11:15:25 2004
++++ src/sysdep.h	Tue Feb 28 12:30:32 2006
+@@ -38,6 +38,7 @@
+     !defined(IRIX) && \
+     !defined(SCO) && \
+     !defined(SUNOS) && \
++    !defined(FREEBSD) && \
+     !defined(NCR)
+ #    error Target not supported.
+ #endif
diff -ruN --exclude=CVS /usr/ports/editors/fte/pkg-plist /usr/ports/editors/fte-new/pkg-plist
--- /usr/ports/editors/fte/pkg-plist	Tue Jul 12 08:06:47 2005
+++ /usr/ports/editors/fte-new/pkg-plist	Tue Feb 28 13:02:45 2006
@@ -1,21 +1,26 @@
-bin/cfte
 bin/fte
 bin/xfte
-lib/fte/config/ab_c.fte
-lib/fte/config/ab_c_os2.fte
-lib/fte/config/ab_java.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
+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_java.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_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/m_4gl.fte
 lib/fte/config/m_a51.fte
 lib/fte/config/m_ada.fte
@@ -23,17 +28,20 @@
 lib/fte/config/m_asm370.fte
 lib/fte/config/m_bin.fte
 lib/fte/config/m_c.fte
+lib/fte/config/m_catbs.fte
 lib/fte/config/m_clario.fte
 lib/fte/config/m_diff.fte
 lib/fte/config/m_ebnf.fte
 lib/fte/config/m_fort90.fte
 lib/fte/config/m_fte.fte
+lib/fte/config/m_gawk.fte
 lib/fte/config/m_html.fte
 lib/fte/config/m_idl.fte
 lib/fte/config/m_ipf.fte
 lib/fte/config/m_java.fte
 lib/fte/config/m_ldsgml.fte
 lib/fte/config/m_make.fte
+lib/fte/config/m_merge.fte
 lib/fte/config/m_mod3.fte
 lib/fte/config/m_msg.fte
 lib/fte/config/m_mvsasm.fte
@@ -55,26 +63,26 @@
 lib/fte/config/m_tex.fte
 lib/fte/config/m_texi.fte
 lib/fte/config/m_text.fte
+lib/fte/config/m_unrealscript.fte
 lib/fte/config/m_vi.fte
 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_sgml.fte
 lib/fte/config/mymain.fte
 lib/fte/config/pal_b_kb.fte
 lib/fte/config/pal_base.fte
 lib/fte/config/pal_blk.fte
+lib/fte/config/pal_blue.fte
+lib/fte/config/pal_bluez.fte
 lib/fte/config/pal_gray.fte
 lib/fte/config/pal_wht.fte
-lib/fte/config/slang/simple.keylist
-lib/fte/config/slang/slangkbd.map
+lib/fte/config/rgbcolor.fte
 lib/fte/config/ui_brief.fte
 lib/fte/config/ui_fte.fte
 lib/fte/config/ui_k_fte.fte
-lib/fte/config/ui_k_ne.fte
+lib/fte/config/ui_k_joe.fte
+lib/fte/config/ab_c.fte
 lib/fte/config/ui_k_ws.fte
 lib/fte/config/ui_m_fte.fte
 lib/fte/config/ui_m_ne.fte
@@ -84,19 +92,30 @@
 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/config/ui_k_ne.fte
+lib/fte/config/ab_c_os2.fte
+lib/fte/config/ab_java.fte
 lib/fte/system.fterc
+%%PORTDOCS%%%%DOCSDIR%%/INDEX
+%%PORTDOCS%%%%DOCSDIR%%/about.html
+%%PORTDOCS%%%%DOCSDIR%%/cfgfiles.html
+%%PORTDOCS%%%%DOCSDIR%%/cmdopt.html
+%%PORTDOCS%%%%DOCSDIR%%/colorize.html
+%%PORTDOCS%%%%DOCSDIR%%/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/command.html
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/events.html
+%%PORTDOCS%%%%DOCSDIR%%/global.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/modes.html
+%%PORTDOCS%%%%DOCSDIR%%/perftips.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp.html
+%%PORTDOCS%%%%DOCSDIR%%/status.html
+@dirrm lib/fte/localconfig
 @dirrm lib/fte/config/kbd
 @dirrm lib/fte/config/menu
 @dirrm lib/fte/config/slang
 @dirrm lib/fte/config
-@dirrm lib/fte/localconfig
 @dirrm lib/fte
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- fte-20051115.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602281816.k1SIGnam046050>