ports/80692: [UPDATE] editors/joe-devel: update to 3.2 & obsoletes PR 80664
chinsan
chinsan at mail2000.com.tw
Fri May 6 13:20:02 UTC 2005
>Number: 80692
>Category: ports
>Synopsis: [UPDATE] editors/joe-devel: update to 3.2 & obsoletes PR 80664
>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: Fri May 06 13:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root at harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
(Sorry to submit PR again.)
- This PR obsoletes PR 80664
- port maintainer(petef at FreeBSD.org) is CC'd
Thanks.
>How-To-Repeat:
>Fix:
--- joe-devel.diff begins here ---
diff -ruN joe-devel.orig/Makefile joe-devel/Makefile
--- joe-devel.orig/Makefile Thu May 5 19:00:54 2005
+++ joe-devel/Makefile Fri May 6 21:07:27 2005
@@ -6,49 +6,38 @@
#
PORTNAME= joe
-PORTVERSION= 3.1
+PORTVERSION= 3.2
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= joe-editor
+MASTER_SITE_SUBDIR= ${PORTNAME}-editor
PKGNAMESUFFIX= -devel
-DISTNAME= joe-${PORTVERSION}
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= petef at FreeBSD.org
-COMMENT= Development version of Joe's own editor
+COMMENT= Development version of Joe's Own Editor
CONFLICTS= joe-2.*
LATEST_LINK= joe-devel
+RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
+
+USE_GMAKE= yes
+USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -liconv"
-USE_GMAKE= yes
-USE_ICONV= yes
-USE_REINPLACE= yes
-
-ALL_TARGET= joe
-MAN1= joe.1
+ALL_TARGET= ${PORTNAME}
+MAN1= ${PORTNAME}.1
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-post-patch:
- @${REINPLACE_CMD} -e 's/towupper/__toupper/g' ${WRKSRC}/regex.c
- @${REINPLACE_CMD} -e 's/iswalnum(c)/__istype(c, _CTYPE_A|_CTYPE_D)/' ${WRKSRC}/utils.c
-.endif
-
post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/INFO ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/LIST ${DOCSDIR}/CommandList
-.endif
.for file in jmacsrc jpicorc jstarrc rjoerc joerc
-.if !exists(${PREFIX}/etc/joe/${file})
- @${CP} ${PREFIX}/etc/joe/${file} ${PREFIX}/etc/joe/${file}.dist
+.if !exists(${PREFIX}/etc/${PORTNAME}/${file})
+ @${CP} ${PREFIX}/etc/${PORTNAME}/${file} ${PREFIX}/etc/${PORTNAME}/${file}.dist
.endif
.endfor
diff -ruN joe-devel.orig/distinfo joe-devel/distinfo
--- joe-devel.orig/distinfo Thu May 5 19:00:54 2005
+++ joe-devel/distinfo Fri May 6 16:20:47 2005
@@ -1,2 +1,2 @@
-MD5 (joe-3.1.tar.gz) = 2a6ef018870fca9b7df85401994fb0e0
-SIZE (joe-3.1.tar.gz) = 381201
+MD5 (joe-3.2.tar.gz) = 07e8077ee4562256bb6a2bf03e3071c2
+SIZE (joe-3.2.tar.gz) = 431843
diff -ruN joe-devel.orig/files/patch-syntax-diff.jsf.in joe-devel/files/patch-syntax-diff.jsf.in
--- joe-devel.orig/files/patch-syntax-diff.jsf.in Thu Jan 1 08:00:00 1970
+++ joe-devel/files/patch-syntax-diff.jsf.in Fri May 6 18:21:39 2005
@@ -0,0 +1,42 @@
+--- syntax/diff.jsf.in.orig Fri May 6 18:14:53 2005
++++ syntax/diff.jsf.in Fri May 6 18:19:28 2005
+@@ -6,6 +6,7 @@
+
+ # Color definitions
+ =Idle
++=Options blue
+ =FileNew bold green
+ =FileOld bold red
+ =DiffStuff magenta
+@@ -15,6 +16,7 @@
+
+ :reset Idle
+ * goo
++ "d" goo
+ "-" preudiff buffer
+ "*" precdiff buffer
+ "0-9" ndiff recolor=-1
+@@ -33,8 +35,14 @@
+ done
+ "*" precdiff
+
++:options Options
++ * options
++ "\n" reset
++
+ :goo Idle
+- * goo
++ * goo strings
++ "diff" options recolor=-4
++done
+ "\n" reset
+
+ :udiff Idle
+@@ -58,6 +66,7 @@
+
+ :udiffhunk Idle
+ * reset
++ "d" goo buffer
+ "-" udiffoldordel recolor=-1
+ "+" udiffadd recolor=-1
+ " " udiffctx recolor=-1
diff -ruN joe-devel.orig/files/patch-tty.c joe-devel/files/patch-tty.c
--- joe-devel.orig/files/patch-tty.c Thu May 5 19:00:54 2005
+++ joe-devel/files/patch-tty.c Fri May 6 16:58:53 2005
@@ -1,7 +1,7 @@
---- tty.c.orig Fri Dec 7 19:19:54 2001
-+++ tty.c Fri Dec 7 19:20:13 2001
-@@ -1006,8 +1006,10 @@
-
+--- tty.c.orig Fri Mar 18 10:40:11 2005
++++ tty.c Fri May 6 16:58:38 2005
+@@ -1074,8 +1074,10 @@
+ setsid(); /* I think you do setprgp(0,0) on systems with no setsid() */
#ifndef SETPGRP_VOID
setpgrp(0, 0);
+/*
@@ -10,4 +10,4 @@
+*/
#endif
- for (x = 0; x != 32; ++x)
+ #endif
diff -ruN joe-devel.orig/pkg-descr joe-devel/pkg-descr
--- joe-devel.orig/pkg-descr Thu May 5 19:00:54 2005
+++ joe-devel/pkg-descr Fri May 6 16:20:47 2005
@@ -9,6 +9,8 @@
fully usable at 2400 baud), simple installation, and all of the
UNIX-integration features of VI.
+JOE(-devel) now has UTF-8 support and Syntax Highlighting.
+
WWW: http://sourceforge.net/projects/joe-editor/
-Pete
diff -ruN joe-devel.orig/pkg-plist joe-devel/pkg-plist
--- joe-devel.orig/pkg-plist Thu May 5 19:00:54 2005
+++ joe-devel/pkg-plist Fri May 6 18:10:57 2005
@@ -20,10 +20,12 @@
@unexec if cmp -s %D/etc/joe/rjoerc.dist %D/etc/joe/rjoerc; then rm -f %D/etc/joe/rjoerc; fi
etc/joe/rjoerc.dist
@exec if [ ! -f %D/etc/joe/rjoerc ]; then cp %D/etc/joe/%f %D/etc/joe/rjoerc; fi
+etc/joe/syntax/4gl.jsf
etc/joe/syntax/asm.jsf
etc/joe/syntax/c.jsf
etc/joe/syntax/conf.jsf
etc/joe/syntax/csh.jsf
+etc/joe/syntax/css.jsf
etc/joe/syntax/diff.jsf
etc/joe/syntax/fortran.jsf
etc/joe/syntax/html.jsf
@@ -31,19 +33,25 @@
etc/joe/syntax/lisp.jsf
etc/joe/syntax/mail.jsf
etc/joe/syntax/mason.jsf
+etc/joe/syntax/ocaml.jsf
etc/joe/syntax/pascal.jsf
etc/joe/syntax/perl.jsf
etc/joe/syntax/php.jsf
etc/joe/syntax/python.jsf
etc/joe/syntax/sh.jsf
+etc/joe/syntax/sml.jsf
etc/joe/syntax/tcl.jsf
+etc/joe/syntax/tex.jsf
etc/joe/syntax/verilog.jsf
etc/joe/syntax/vhdl.jsf
etc/joe/syntax/xml.jsf
-%%PORTDOCS%%%%DOCSDIR%%/CommandList
-%%PORTDOCS%%%%DOCSDIR%%/INFO
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm etc/joe/charmaps
- at dirrm etc/joe/syntax
- at dirrm etc/joe
+etc/joe/doc/ChangeLog
+etc/joe/doc/LIST
+etc/joe/doc/HACKING
+etc/joe/doc/HINTS
+etc/joe/doc/NEWS
+etc/joe/doc/README
+ at unexec rmdir %D/etc/joe/doc 2>/dev/null || true
+ at unexec rmdir %D/etc/joe/charmaps 2>/dev/null || true
+ at unexec rmdir %D/etc/joe/syntax 2>/dev/null || true
+ at unexec rmdir %D/etc/joe 2>/dev/null || true
--- joe-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list