svn commit: r497120 - in head: . editors editors/e93 editors/e93/files

Alexey Dokuchaev danfe at FreeBSD.org
Fri Mar 29 13:58:26 UTC 2019 

Author: danfe
Date: Fri Mar 29 13:58:23 2019
New Revision: 497120
URL: https://svnweb.freebsd.org/changeset/ports/497120

Log:
  - Resurrect `editors/e93' and fix distfile fetching (unfortunately,
    new distfile name does not contain version number, but its checksum
    is the same as the previous one)
  - Provide more descriptive and elaborate COMMENT text
  - Register dependency between the program and its internal GUI library
    which allows to remove MAKE_JOBS_UNSAFE (hopefully)
  - Stop bogusly requesting C++ compiler (apparently, it was wanted
    because of its `bool' type), instead simply #include <stdbool.h>
  - Localize build configuration in one place (port-patch): having
    MAKE_ARGS blurred the picture and it was not quite accurate anyway
    (e.g., passed down those bogus C++ bits)
  - Drop `gmake' from USES, no longer needed WRKSRC, define LICENSE_FILE
  - Make docfiles installation optional and install them to appropriate
    location using standard helper target
  - Reformat port description (shorten the lines, kill EOL whitespace,
    separate sentences with double spaces)

Added:
  head/editors/e93/
     - copied from r402561, head/editors/e93/
  head/editors/e93/files/patch-Makefile   (contents, props changed)
  head/editors/e93/files/patch-search.h   (contents, props changed)
Deleted:
  head/editors/e93/files/patch-includes.h
Modified:
  head/MOVED
  head/editors/Makefile
  head/editors/e93/Makefile
  head/editors/e93/distinfo
  head/editors/e93/pkg-descr
  head/editors/e93/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Mar 29 13:43:40 2019	(r497119)
+++ head/MOVED	Fri Mar 29 13:58:23 2019	(r497120)
@@ -7877,7 +7877,6 @@ graphics/rubyphoto||2015-11-28|Has expired: Broken for
 german/bsdpaste||2015-11-28|Has expired: Broken for more than 6 months
 audio/amrcoder||2015-11-28|Has expired: Broken for more than 6 months
 sysutils/bashburn||2015-11-28|Has expired: Broken for more than 6 months
-editors/e93||2015-11-28|Has expired: Broken for more than 6 months
 audio/tepsonic||2015-11-28|Has expired: Broken for more than 6 months
 astro/ephem||2015-11-28|Has expired: Broken for more than 6 months
 chinese/cce||2015-11-28|Has expired: Broken for more than 6 months

Modified: head/editors/Makefile
==============================================================================
--- head/editors/Makefile	Fri Mar 29 13:43:40 2019	(r497119)
+++ head/editors/Makefile	Fri Mar 29 13:58:23 2019	(r497120)
@@ -21,8 +21,8 @@
     SUBDIR += chexedit
     SUBDIR += codelite
     SUBDIR += cooledit
-    SUBDIR += cudatext
     SUBDIR += cream
+    SUBDIR += cudatext
     SUBDIR += deforaos-editor
     SUBDIR += dexed
     SUBDIR += dhex
@@ -32,6 +32,7 @@
     SUBDIR += drjava
     SUBDIR += dte
     SUBDIR += e3
+    SUBDIR += e93
     SUBDIR += ecce
     SUBDIR += ecrire
     SUBDIR += edith

Modified: head/editors/e93/Makefile
==============================================================================
--- head/editors/e93/Makefile	Sat Nov 28 21:35:51 2015	(r402561)
+++ head/editors/e93/Makefile	Fri Mar 29 13:58:23 2019	(r497120)
@@ -4,45 +4,43 @@
 PORTNAME=	e93
 PORTVERSION=	1.4.2
 CATEGORIES=	editors tcl
-MASTER_SITES=	ftp://ftp.e93.org/pub/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}r${PORTVERSION:E}X
+MASTER_SITES=	http://www.sqrt.com/downloads/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Nifty editor based on Tcl
+COMMENT=	Tcl-based text editor oriented to the programmers
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-BROKEN=		Unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2015-11-26
-USES=		gmake tcl tar:tgz
+USES=		tar:tgz tcl
 USE_XORG=	x11 xinerama
-MAKE_ARGS=	PREFIX="${PREFIX}" \
-		TCL_INCLUDE="-I${TCL_INCLUDEDIR}" \
-		TCL_LIB="-L${LOCALBASE}/lib" \
-		TCL_VERSION="${TCL_VER:S/.//}" \
-		X_INCLUDE="-I${LOCALBASE}/include" \
-		X_LIB="-L${LOCALBASE}/lib" \
-		EXTRALIBS="-lm" \
-		CC="${CXX}" \
-		OPTIONS="${CXXFLAGS}"
 
-MAKE_JOBS_UNSAFE=	yes
+MAKE_ENV=	TCL_VERSION=${TCL_SHLIB_VER}
 
+PORTDOCS=	README* TODO
+
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g ; \
-		 s|;make|;$$(MAKE)|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e '/<X11\/Intrinsic.h>/d ; \
-		 /<X11\/Shell.h>/d' ${WRKSRC}/xgui/includes.h
+	@${REINPLACE_CMD} -E \
+		'/^TCL_INCLUDE=/s,/usr/local/include,${TCL_INCLUDEDIR}, \
+		;/^X_(INCLUDE|LIB)=/s,/usr/X11R6,${LOCALBASE}, \
+		;/^EXTRALIBS=/s, -ldl,, \
+		;/^OPTIONS=/s,-O2.*-g,${CFLAGS}, \
+		;/^(PREFIX|CC)/s,=,?=,' ${WRKSRC}/machdef.mk
+	@${REINPLACE_CMD} -e '30s,^,#include	<stdbool.h>,' \
+		${WRKSRC}/includes.h
+	@${REINPLACE_CMD} -E '/X11\/(Intrinsic|Shell)\.h/d' \
+		${WRKSRC}/xgui/includes.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/e93 ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/e93lib
 	cd ${WRKSRC}/e93lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/e93lib
-.for ext in e93 regex syntaxmaps
-	${INSTALL_DATA} ${WRKSRC}/README.${ext} ${STAGEDIR}${PREFIX}/lib/e93lib
-.endfor
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/editors/e93/distinfo
==============================================================================
--- head/editors/e93/distinfo	Sat Nov 28 21:35:51 2015	(r402561)
+++ head/editors/e93/distinfo	Fri Mar 29 13:58:23 2019	(r497120)
@@ -1,2 +1,3 @@
-SHA256 (e93-1.4r2X.tgz) = 750d812fe5911a71cf18a4e0d623ae6c4ee420d9c7886205d3dcf19aecfbc3c1
-SIZE (e93-1.4r2X.tgz) = 431733
+TIMESTAMP = 1248219511
+SHA256 (e93.tgz) = 750d812fe5911a71cf18a4e0d623ae6c4ee420d9c7886205d3dcf19aecfbc3c1
+SIZE (e93.tgz) = 431733

Added: head/editors/e93/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/e93/files/patch-Makefile	Fri Mar 29 13:58:23 2019	(r497120)
@@ -0,0 +1,24 @@
+--- Makefile.orig	2009-07-21 15:04:13 UTC
++++ Makefile
+@@ -49,17 +49,17 @@ OBJECTS = \
+ 	abort.o \
+ 	errors.o
+ 
+-all : libgui e93
++all : e93
+ 
+ e93 : $(OBJECTS) xgui/libgui.a
+-	$(CC) -O $(OBJECTS) -Lxgui -lgui -lstdc++ \
++	$(CC) $(CFLAGS:N-D*:N-I*) $(OBJECTS) -Lxgui -lgui \
+ 		$(X_LIB) -lX11 -lXinerama \
+ 		$(TCL_LIB) -ltcl$(TCL_VERSION) \
+ 		$(EXTRALIBS) \
+ 		-o e93
+ 
+-libgui :
+-	cd xgui;make
++xgui/libgui.a :
++	$(MAKE) -C xgui
+ 
+ clean :
+ 	cd xgui;make clean

Added: head/editors/e93/files/patch-search.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/e93/files/patch-search.h	Fri Mar 29 13:58:23 2019	(r497120)
@@ -0,0 +1,13 @@
+--- search.h.orig	2009-01-03 17:37:00 UTC
++++ search.h
+@@ -14,8 +14,8 @@
+ 
+ bool LiteralMatch(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 numToSearch,CHUNK_HEADER **endChunk,UINT32 *endOffset);
+ bool LiteralMatchTT(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 numToSearch,const UINT8 *translateTable,CHUNK_HEADER **endChunk,UINT32 *endOffset);
+-bool SearchForwardLiteral(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 forTextLength,UINT32 numToSearch,bool ignoreCase,UINT32 *matchOffset,CHUNK_HEADER **startChunk,UINT32 *startOffset,CHUNK_HEADER **endChunk,UINT32 *endOffset,ABORT_TEST_FUNCTION *abortFunction);
+-bool SearchBackwardLiteral(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 forTextLength,UINT32 numToSearch,bool ignoreCase,UINT32 *matchOffset,CHUNK_HEADER **startChunk,UINT32 *startOffset,CHUNK_HEADER **endChunk,UINT32 *endOffset,ABORT_TEST_FUNCTION *abortFunction);
++bool SearchForwardLiteral(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 forTextLength,UINT32 numToSearch,bool ignoreCase,bool *foundMatch,UINT32 *matchOffset,UINT32 *numMatched,CHUNK_HEADER **startChunk,UINT32 *startOffset,CHUNK_HEADER **endChunk,UINT32 *endOffset,ABORT_TEST_FUNCTION *abortFunction);
++bool SearchBackwardLiteral(CHUNK_HEADER *chunk,UINT32 offset,CHUNK_HEADER *forTextChunk,UINT32 forTextOffset,UINT32 forTextLength,UINT32 numToSearch,bool ignoreCase,bool *foundMatch,UINT32 *matchOffset,UINT32 *numMatched,CHUNK_HEADER **startChunk,UINT32 *startOffset,CHUNK_HEADER **endChunk,UINT32 *endOffset,ABORT_TEST_FUNCTION *abortFunction);
+ bool EditorFind(EDITOR_BUFFER *buffer,SELECTION_UNIVERSE *selectionUniverse,TEXT_UNIVERSE *searchForText,bool backward,bool wrapAround,bool selectionExpr,bool ignoreCase,bool *foundMatch,SELECTION_UNIVERSE *resultSelectionUniverse,ABORT_TEST_FUNCTION *abortFunction);
+ bool EditorFindAll(EDITOR_BUFFER *buffer,SELECTION_UNIVERSE *selectionUniverse,TEXT_UNIVERSE *searchForText,bool backward,bool wrapAround,bool selectionExpr,bool ignoreCase,bool limitScope,bool *foundMatch,SELECTION_UNIVERSE *resultSelectionUniverse,ABORT_TEST_FUNCTION *abortFunction);
+ bool EditorReplace(EDITOR_BUFFER *buffer,SELECTION_UNIVERSE *selectionUniverse,TEXT_UNIVERSE *searchForText,TEXT_UNIVERSE *replaceWithText,bool backward,bool wrapAround,bool selectionExpr,bool ignoreCase,bool replaceProc,bool *foundMatch,SELECTION_UNIVERSE *resultSelectionUniverse,ABORT_TEST_FUNCTION *abortFunction);

Modified: head/editors/e93/pkg-descr
==============================================================================
--- head/editors/e93/pkg-descr	Sat Nov 28 21:35:51 2015	(r402561)
+++ head/editors/e93/pkg-descr	Fri Mar 29 13:58:23 2019	(r497120)
@@ -1,20 +1,21 @@
 e93 is a portable window based text editor oriented to the needs of
-programmers.  It was begun in 1993 (thus the name). It uses the mouse,
+programmers.  It was begun in 1993 (thus the name).  It uses the mouse,
 selections, cut/copy/paste, and closely follows the model of editors
-on the Macintosh and NeXT platforms. 
+on the Macintosh and NeXT platforms.
 
-*  e93 supports columnar selection. It achieves this by allowing multiple pieces
-   of the text to be selected simultaneously (this is perhaps its most unique
-   feature). 
+e93 supports columnar selection.  It achieves this by allowing multiple
+pieces of the text to be selected simultaneously (this is perhaps its
+most unique feature).
 
-*  e93 imposes no limits on the line length, file length, or number of
-   simultaneous files which it can edit. 
+e93 imposes no limits on the line length, file length, or number of
+simultaneous files which it can edit.
 
-*  e93 is able to handle all 8-bit binary codes without complaint, or confusion.
+e93 is able to handle all 8-bit binary codes without complaint, or
+confusion.
 
-*  e93 is highly configurable without recompiling because scripts which control
-   the editor can be written in Tcl. 
+e93 is highly configurable without recompiling because scripts which
+control the editor can be written in Tcl.
 
-*  e93 supports user-configurable syntax highlighting. 
+e93 supports user-configurable syntax highlighting.
 
 WWW: http://www.e93.org/

Modified: head/editors/e93/pkg-plist
==============================================================================
--- head/editors/e93/pkg-plist	Sat Nov 28 21:35:51 2015	(r402561)
+++ head/editors/e93/pkg-plist	Fri Mar 29 13:58:23 2019	(r497120)
@@ -1,7 +1,4 @@
 bin/e93
-lib/e93lib/README.e93
-lib/e93lib/README.regex
-lib/e93lib/README.syntaxmaps
 lib/e93lib/e93rc.tcl
 lib/e93lib/examples/README
 lib/e93lib/examples/sethighlightscheme.tcl

More information about the svn-ports-all mailing list