From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 5 14:30:05 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F20B416A4CE for ; Thu, 5 May 2005 14:30:04 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C37AA43D55 for ; Thu, 5 May 2005 14:30:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j45EU33Z034664 for ; Thu, 5 May 2005 14:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j45EU3o8034663; Thu, 5 May 2005 14:30:03 GMT (envelope-from gnats) Resent-Date: Thu, 5 May 2005 14:30:03 GMT Resent-Message-Id: <200505051430.j45EU3o8034663@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB06E16A4CE; Thu, 5 May 2005 14:23:48 +0000 (GMT) Received: from chinsan.twbbs.org (sw169-31-180.adsl.seed.net.tw [221.169.31.180]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8C0043D83; Thu, 5 May 2005 14:23:47 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: from chinsan.twbbs.org (localhost [127.0.0.1]) by chinsan.twbbs.org (8.13.1/8.13.1) with ESMTP id j45ENqW5013349; Thu, 5 May 2005 22:23:52 +0800 (CST) (envelope-from root@chinsan.twbbs.org) Received: (from root@localhost) by chinsan.twbbs.org (8.13.1/8.13.1/Submit) id j45ENqta013348; Thu, 5 May 2005 22:23:52 +0800 (CST) (envelope-from root) Message-Id: <200505051423.j45ENqta013348@chinsan.twbbs.org> Date: Thu, 5 May 2005 22:23:52 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: petef@FreeBSD.org Subject: ports/80664: [UPDATE] editors/joe-devel: update to 3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2005 14:30:05 -0000 >Number: 80664 >Category: ports >Synopsis: [UPDATE] editors/joe-devel: update to 3.2 >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: Thu May 05 14:30:03 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@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: - update to 3.2 - port maintainer(petef@FreeBSD.org) is CC'd >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 Thu May 5 22:10:47 2005 @@ -6,13 +6,13 @@ # 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@FreeBSD.org COMMENT= Development version of Joe's own editor @@ -27,28 +27,22 @@ USE_GMAKE= yes USE_ICONV= yes -USE_REINPLACE= yes -ALL_TARGET= joe -MAN1= joe.1 +ALL_TARGET= ${PORTNAME} +MAN1= ${PORTNAME}.1 .include -.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}/README ${WRKSRC}/HINTS ${WRKSRC}/ChangeLog \ + ${WRKSRC}/HACKING ${WRKSRC}/NEWS ${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 Thu May 5 20:43:33 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-Makefile.in joe-devel/files/patch-Makefile.in --- joe-devel.orig/files/patch-Makefile.in Thu Jan 1 08:00:00 1970 +++ joe-devel/files/patch-Makefile.in Thu May 5 21:48:58 2005 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu May 5 21:48:03 2005 ++++ Makefile.in Thu May 5 21:48:03 2005 +@@ -39,7 +39,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ +-bin_PROGRAMS = joe$(EXEEXT) termidx$(EXEEXT) ++bin_PROGRAMS = joe$(EXEEXT) # termidx$(EXEEXT) + DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/autoconf.h.in $(top_srcdir)/charmaps/klingon.in \ 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 Thu May 5 22:02:50 2005 @@ -0,0 +1,40 @@ +--- syntax/diff.jsf.in.orig Thu May 5 21:58:38 2005 ++++ syntax/diff.jsf.in Thu May 5 21:58:38 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 buffer + "-" preudiff buffer + "*" precdiff buffer + "0-9" ndiff recolor=-1 +@@ -33,12 +35,20 @@ + done + "*" precdiff + ++:options Options ++ * options ++ "\n" reset ++ + :goo Idle +- * goo ++ * goo strings ++ "diff" options recolor=-4 ++done ++ + "\n" reset + + :udiff Idle + * reset ++ "d" goo buffer + "-" udiffold recolor=-1 + "+" udiffnew recolor=-1 + "@" udiffhunkbegin 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 Thu May 5 20:47:04 2005 @@ -1,13 +1,15 @@ ---- 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 Thu May 5 20:46:08 2005 ++++ tty.c Thu May 5 20:46:08 2005 +@@ -1073,9 +1073,11 @@ + setsid(); /* I think you do setprgp(0,0) on systems with no setsid() */ #ifndef SETPGRP_VOID - setpgrp(0, 0); +- setpgrp(0, 0); ++ setpgrp(0, getpid()); +/* #else setpgrp(); +*/ #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 Thu May 5 21:33:26 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 Thu May 5 21:42:04 2005 @@ -3,7 +3,6 @@ bin/jpico bin/jstar bin/rjoe -bin/termidx etc/joe/charmaps/klingon @unexec if cmp -s %D/etc/joe/jmacsrc.dist %D/etc/joe/jmacsrc; then rm -f %D/etc/joe/jmacsrc; fi etc/joe/jmacsrc.dist @@ -20,10 +19,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 @@ -36,14 +37,19 @@ 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%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/CommandList -%%PORTDOCS%%%%DOCSDIR%%/INFO +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/HINTS +%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/joe/charmaps -@dirrm etc/joe/syntax -@dirrm etc/joe +%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@unexec rmdir %D/etc/joe/charmaps 2>/dev/null || true +@unexec rmdir %D/etc/joe/syntax 2>/dev/null || true +@unexec rmdir %D/etc/joe 2>/dev/null || true --- joe-devel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: