View | Details | Raw Unified | Return to bug 159434 | Differences between
and this patch

Collapse All | Expand All

(-)editors/e93/Makefile (-21 / +31 lines)
Lines 6-42 Link Here
6
#
6
#
7
7
8
PORTNAME=	e93
8
PORTNAME=	e93
9
PORTVERSION=	1.3.4
9
PORTVERSION=	1.4.2
10
PORTREVISION=	2
10
CATEGORIES=	editors tcl
11
CATEGORIES=	editors tcl tk
12
MASTER_SITES=	ftp://ftp.e93.org/pub/
11
MASTER_SITES=	ftp://ftp.e93.org/pub/
13
DISTNAME=	${PORTNAME}-1.3r4X
12
DISTNAME=	${PORTNAME}-${PORTVERSION:R}r${PORTVERSION:E}X
14
EXTRACT_SUFX=	.tgz
13
EXTRACT_SUFX=	.tgz
15
14
16
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	A nifty editor based on Tcl/Tk
16
COMMENT=	A nifty editor based on Tcl
17
18
LICENSE=	GPLv2
19
LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
18
20
19
USE_TCL=	84
20
USE_TCL_BUILD=	84
21
USE_TK=		84
22
USE_TK_BUILD=	84
23
USE_XORG=	x11 xt
24
WRKSRC=		${WRKDIR}/${PORTNAME}
21
WRKSRC=		${WRKDIR}/${PORTNAME}
25
MAKE_JOBS_UNSAFE=	yes
22
23
USE_XORG=	x11 xinerama
24
USE_TCL_BUILD=	yes
25
USE_TCL=	yes
26
USE_GMAKE=	yes
27
MAKE_ARGS=	PREFIX="${PREFIX}" \
28
		TCL_INCLUDE="-I${TCL_INCLUDEDIR}" \
29
		TCL_LIB="-L${LOCALBASE}/lib" \
30
		TCL_VERSION="${TCL_VER:S/.//}" \
31
		X_INCLUDE="-I${LOCALBASE}/include" \
32
		X_LIB="-L${LOCALBASE}/lib" \
33
		EXTRALIBS="-lm" \
34
		CC="${CXX}" \
35
		OPTIONS="${CXXFLAGS}"
36
MAKE_JOBS_SAFE=	yes
26
37
27
post-patch:
38
post-patch:
28
	@${REINPLACE_CMD} 's|wish|wish${TK_VER}|' ${WRKSRC}/e93r
39
	@${REINPLACE_CMD} -e 's|-lstdc++||g ; \
29
	@${REINPLACE_CMD} 's|CFLAGS=|CFLAGS+=$$(TK_INCLUDE) -I${LOCALBASE}/include |' \
40
		 s|;make|;$$(MAKE)|g' ${WRKSRC}/Makefile
30
		${WRKSRC}/Makefile ${WRKSRC}/xgui/Makefile
41
	@${REINPLACE_CMD} -e '/<X11\/Intrinsic.h>/d ; \
42
		 /<X11\/Shell.h>/d' ${WRKSRC}/xgui/includes.h
31
43
32
do-install:
44
do-install:
33
	${INSTALL_PROGRAM} ${WRKSRC}/e93 ${PREFIX}/bin
45
	${INSTALL_PROGRAM} ${WRKSRC}/e93 ${PREFIX}/bin
34
	${INSTALL_SCRIPT} ${WRKSRC}/e93r ${PREFIX}/bin
46
	@${MKDIR} ${PREFIX}/lib/e93lib
35
	${MKDIR} ${PREFIX}/lib/e93lib
47
.for ext in e93 regex syntaxmaps
36
	${CP} -R ${WRKSRC}/e93lib/* ${PREFIX}/lib/e93lib
48
	${INSTALL_DATA} ${WRKSRC}/README.${ext} ${PREFIX}/lib/e93lib
37
.if !defined(NOPORTDOCS)
49
.endfor
38
	${MKDIR} ${DOCSDIR}
50
	@(cd ${WRKSRC}/e93lib && ${COPYTREE_SHARE} . ${PREFIX}/lib/e93lib)
39
	${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}
40
.endif
41
51
42
.include <bsd.port.mk>
52
.include <bsd.port.mk>
(-)editors/e93/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (e93-1.3r4X.tgz) = 479f584d8d35ebbb5ceb8ee957ffa2b1dc84fdfa6d38e384756db6667d5c1329
1
SHA256 (e93-1.4r2X.tgz) = 750d812fe5911a71cf18a4e0d623ae6c4ee420d9c7886205d3dcf19aecfbc3c1
2
SIZE (e93-1.3r4X.tgz) = 431179
2
SIZE (e93-1.4r2X.tgz) = 431733
(-)editors/e93/files/patch-machdef.mk (-44 lines)
Lines 1-44 Link Here
1
--- machdef.mk.orig	Fri Sep 29 02:47:44 2000
2
+++ machdef.mk	Fri Sep 29 02:50:54 2000
3
@@ -27,33 +27,32 @@
4
 #
5
 # e93 will install its single executable "e93" in $PREFIX/bin
6
 # and it will place a directory called "e93lib" in $PREFIX/lib
7
-PREFIX=/usr/local
8
 
9
 
10
 # The following lines may need to be altered if the Tcl
11
 # files are located elsewhere on your system:
12
-TCL_INCLUDE=-I/usr/local/include
13
-TCL_LIB=-L/usr/local/lib
14
+TCL_INCLUDE=-I${LOCALBASE}/include/tcl8.4
15
+TCL_LIB=-L${LOCALBASE}/lib
16
 # uncomment and change if you want to link with specific versions of Tcl/Tk
17
-#TCL_VERSION=8.3
18
+TCL_VERSION=84
19
+TK_INCLUDE=-I${LOCALBASE}/include/tk8.4
20
 
21
 
22
 # The following lines may need to be altered if the X include and library
23
 # files are located elsewhere on your system:
24
-X_INCLUDE=-I/usr/X11R6/include
25
-X_LIB=-L/usr/X11R6/lib
26
+X_INCLUDE=-I${LOCALBASE}/include
27
+X_LIB=-L${LOCALBASE}/lib
28
 
29
 
30
 # if your system needs some extra libraries, add them here:
31
-EXTRALIBS=-lm -ldl
32
+EXTRALIBS=-lm 
33
 
34
 # Uncomment this line if running Solaris:
35
 #MACHINESPEC=-DSOLARIS
36
 
37
 # set compiler to use
38
-CC=gcc
39
 
40
 
41
 # set some compiler options
42
-OPTIONS=-O2 -Wall -x c++ -g
43
+OPTIONS=-Wall -x c++
44
 #OPTIONS = -Wall -O2 -x c++ -mcpu=21164a -Wa,-m21164a -g
(-)editors/e93/pkg-plist (-7 / +4 lines)
Lines 1-5 Link Here
1
bin/e93
1
bin/e93
2
bin/e93r
2
lib/e93lib/README.e93
3
lib/e93lib/README.regex
4
lib/e93lib/README.syntaxmaps
3
lib/e93lib/e93rc.tcl
5
lib/e93lib/e93rc.tcl
4
lib/e93lib/examples/README
6
lib/e93lib/examples/README
5
lib/e93lib/examples/sethighlightscheme.tcl
7
lib/e93lib/examples/sethighlightscheme.tcl
Lines 18-23 Link Here
18
lib/e93lib/syntaxmaps/c.tcl
20
lib/e93lib/syntaxmaps/c.tcl
19
lib/e93lib/syntaxmaps/css.tcl
21
lib/e93lib/syntaxmaps/css.tcl
20
lib/e93lib/syntaxmaps/eiffel.tcl
22
lib/e93lib/syntaxmaps/eiffel.tcl
23
lib/e93lib/syntaxmaps/email.tcl
21
lib/e93lib/syntaxmaps/html.tcl
24
lib/e93lib/syntaxmaps/html.tcl
22
lib/e93lib/syntaxmaps/java.tcl
25
lib/e93lib/syntaxmaps/java.tcl
23
lib/e93lib/syntaxmaps/javaScript.tcl
26
lib/e93lib/syntaxmaps/javaScript.tcl
Lines 29-40 Link Here
29
lib/e93lib/syntaxmaps/vhdl.tcl
32
lib/e93lib/syntaxmaps/vhdl.tcl
30
lib/e93lib/syntaxmaps/xml.tcl
33
lib/e93lib/syntaxmaps/xml.tcl
31
lib/e93lib/syntaxmaps/xsl.tcl
34
lib/e93lib/syntaxmaps/xsl.tcl
32
%%PORTDOCS%%%%DOCSDIR%%/README
33
%%PORTDOCS%%%%DOCSDIR%%/README.e93
34
%%PORTDOCS%%%%DOCSDIR%%/README.rants
35
%%PORTDOCS%%%%DOCSDIR%%/README.regex
36
%%PORTDOCS%%%%DOCSDIR%%/README.syntaxmaps
37
%%PORTDOCS%%@dirrm %%DOCSDIR%%
38
@dirrm lib/e93lib/syntaxmaps
35
@dirrm lib/e93lib/syntaxmaps
39
@dirrm lib/e93lib/newstuff
36
@dirrm lib/e93lib/newstuff
40
@dirrm lib/e93lib/modules
37
@dirrm lib/e93lib/modules

Return to bug 159434