Date: Sat, 01 May 2004 09:21:41 +0200 From: Kirill Ponomarew <krion@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66136: Update editors/joe-devel: 2.9.8 -> 3.0 Message-ID: <E1BJoof-000EYz-0K@voodoo.oberon.net> Resent-Message-ID: <200405010730.i417UJGH039108@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66136
>Category: ports
>Synopsis: Update editors/joe-devel: 2.9.8 -> 3.0
>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: Sat May 01 00:30:19 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kirill Ponomarew
>Release: FreeBSD 5.2.1-RELEASE-p4 i386
>Organization:
Oberon.net
>Environment:
System: FreeBSD voodoo.oberon.net
>Description:
- Update to version 3.0
* UTF support and syntax highlighting were added
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /FreeBSD/ports/editors/joe-devel/Makefile joe-devel/Makefile
--- /FreeBSD/ports/editors/joe-devel/Makefile Wed Feb 4 06:20:00 2004
+++ joe-devel/Makefile Sat May 1 09:14:22 2004
@@ -5,34 +5,40 @@
# $FreeBSD: ports/editors/joe-devel/Makefile,v 1.26 2004/02/04 05:20:00 marcus Exp $
#
-PORTNAME= joe-devel
-PORTVERSION= 2.9.8
-PORTREVISION= 1
+PORTNAME= joe
+PORTVERSION= 3.0
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= joe-editor
+PKGNAMESUFFIX= -devel
DISTNAME= joe-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
COMMENT= Development version of Joe's own editor
-MAN1= joe.1
+CONFLICTS= joe-2.*
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
ALL_TARGET= joe
+MAN1= joe.1
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/joe
- ${INSTALL_DATA} ${WRKSRC}/INFO ${WRKSRC}/README ${PREFIX}/share/doc/joe
- ${INSTALL_DATA} ${WRKSRC}/LIST ${PREFIX}/share/doc/joe/CommandList
+ @${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/${file})
- @${CP} ${PREFIX}/etc/${file}.dist ${PREFIX}/etc/${file}
+.if !exists(${PREFIX}/etc/joe/${file})
+ @${CP} ${PREFIX}/etc/joe/${file} ${PREFIX}/etc/joe/${file}.dist
.endif
.endfor
diff -ruN --exclude=CVS /FreeBSD/ports/editors/joe-devel/distinfo joe-devel/distinfo
--- /FreeBSD/ports/editors/joe-devel/distinfo Wed Mar 31 05:07:37 2004
+++ joe-devel/distinfo Sat May 1 08:01:58 2004
@@ -1,2 +1,2 @@
-MD5 (joe-2.9.8.tar.gz) = c7c66cc641f53ba820f47a73c5b2377f
-SIZE (joe-2.9.8.tar.gz) = 283596
+MD5 (joe-3.0.tar.gz) = 05395f2f8566351d660c48390cf31dc6
+SIZE (joe-3.0.tar.gz) = 310584
diff -ruN --exclude=CVS /FreeBSD/ports/editors/joe-devel/files/patch-Makefile.in joe-devel/files/patch-Makefile.in
--- /FreeBSD/ports/editors/joe-devel/files/patch-Makefile.in Fri Dec 26 20:25:09 2003
+++ joe-devel/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,35 +0,0 @@
---- Makefile.in.orig Mon May 5 11:15:32 2003
-+++ Makefile.in Fri Dec 26 11:04:29 2003
-@@ -275,8 +275,8 @@
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
-+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \
- else :; fi; \
- done
-
-@@ -391,8 +391,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file"; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$file; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-@@ -422,8 +422,8 @@
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
-- $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-+ echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.dist"; \
-+ $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.dist; \
- done
-
- uninstall-sysconfDATA:
diff -ruN --exclude=CVS /FreeBSD/ports/editors/joe-devel/files/patch-ad joe-devel/files/patch-ad
--- /FreeBSD/ports/editors/joe-devel/files/patch-ad Mon Dec 24 03:09:54 2001
+++ joe-devel/files/patch-ad Thu Jan 1 01:00:00 1970
@@ -1,63 +0,0 @@
---- b.c.orig Fri Dec 7 19:13:04 2001
-+++ b.c Fri Dec 7 19:13:10 2001
-@@ -17,6 +17,9 @@
- #include <pwd.h>
- #endif
- #include <errno.h>
-+#include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <stdlib.h>
- #include <ctype.h>
- #include <string.h>
-@@ -187,6 +190,7 @@
- else
- b->o = pdefault;
- mset(b->marks, 0, sizeof(b->marks));
-+ b->filehandle = -1; /* initialize filehande &&& ob */
- b->rdonly = 0;
- b->orphan = 0;
- b->oldcur = 0;
-@@ -239,6 +243,10 @@
- void brm(B * b)
- {
- if (b && !--b->count) {
-+ if (b->filehandle != -1) {
-+ /* close filehandle, free lock &&& ob */
-+ close (b->filehandle);
-+ }
- if (b->changed)
- abrerr(b->name);
- if (b == errbuf)
-@@ -1805,7 +1813,8 @@
- B *b;
- long skip, amnt;
- char *n;
-- int nowrite = 0;
-+ struct stat sb;
-+ int nowrite = 0, fh = -1;
-
- if (!s || !s[0]) {
- error = -1;
-@@ -1852,6 +1861,12 @@
- goto opnerr;
- }
-
-+ /* Lock the file &&& ob,petef */
-+ if (fi) {
-+ fh = dup( fileno(fi) );
-+ nowrite = (flock (fh, LOCK_EX | LOCK_NB));
-+ }
-+
- /* Skip data if we need to */
- if (skip && lseek(fileno(fi), skip, 0) < 0) {
- int r;
-@@ -1907,6 +1922,8 @@
- vsrm(n);
-
- b->er = error;
-+ if (fh != -1)
-+ b->filehandle = fh;
- return b;
- }
-
diff -ruN --exclude=CVS /FreeBSD/ports/editors/joe-devel/pkg-plist joe-devel/pkg-plist
--- /FreeBSD/ports/editors/joe-devel/pkg-plist Sun Jul 22 05:21:13 2001
+++ joe-devel/pkg-plist Sat May 1 09:05:12 2004
@@ -4,22 +4,31 @@
bin/jstar
bin/rjoe
bin/termidx
-@unexec if cmp -s %D/etc/jmacsrc.dist %D/etc/jmacsrc; then rm -f %D/etc/jmacsrc; fi
-etc/jmacsrc.dist
-@exec if [ ! -f %D/etc/jmacsrc ]; then cp %D/etc/%f %D/etc/jmacsrc; fi
-@unexec if cmp -s %D/etc/joerc.dist %D/etc/joerc; then rm -f %D/etc/joerc; fi
-etc/joerc.dist
-@exec if [ ! -f %D/etc/joerc ]; then cp %D/etc/%f %D/etc/joerc; fi
-@unexec if cmp -s %D/etc/jpicorc.dist %D/etc/jpicorc; then rm -f %D/etc/jpicorc; fi
-etc/jpicorc.dist
-@exec if [ ! -f %D/etc/jpicorc ]; then cp %D/etc/%f %D/etc/jpicorc; fi
-@unexec if cmp -s %D/etc/jstarrc.dist %D/etc/jstarrc; then rm -f %D/etc/jstarrc; fi
-etc/jstarrc.dist
-@exec if [ ! -f %D/etc/jstarrc ]; then cp %D/etc/%f %D/etc/jstarrc; fi
-@unexec if cmp -s %D/etc/rjoerc.dist %D/etc/rjoerc; then rm -f %D/etc/rjoerc; fi
-etc/rjoerc.dist
-@exec if [ ! -f %D/etc/rjoerc ]; then cp %D/etc/%f %D/etc/rjoerc; fi
-%%PORTDOCS%%share/doc/joe/INFO
-%%PORTDOCS%%share/doc/joe/README
-%%PORTDOCS%%share/doc/joe/CommandList
-%%PORTDOCS%%@dirrm share/doc/joe
+@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
+@exec if [ ! -f %D/etc/joe/jmacsrc ]; then cp %D/etc/joe/%f %D/etc/joe/jmacsrc; fi
+@unexec if cmp -s %D/etc/joe/joerc.dist %D/etc/joe/joerc; then rm -f %D/etc/joe/joerc; fi
+etc/joe/joerc.dist
+@exec if [ ! -f %D/etc/joe/joerc ]; then cp %D/etc/joe/%f %D/etc/joe/joerc; fi
+@unexec if cmp -s %D/etc/joe/jpicorc.dist %D/etc/joe/jpicorc; then rm -f %D/etc/joe/jpicorc; fi
+etc/joe/jpicorc.dist
+@exec if [ ! -f %D/etc/joe/jpicorc ]; then cp %D/etc/joe/%f %D/etc/joe/jpicorc; fi
+@unexec if cmp -s %D/etc/joe/jstarrc.dist %D/etc/joe/jstarrc; then rm -f %D/etc/joe/jstarrc; fi
+etc/joe/jstarrc.dist
+@exec if [ ! -f %D/etc/joe/jstarrc ]; then cp %D/etc/joe/%f %D/etc/joe/jstarrc; fi
+@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/c.jsf
+etc/joe/syntax/conf.jsf
+etc/joe/syntax/perl.jsf
+etc/joe/syntax/php.jsf
+etc/joe/syntax/python.jsf
+etc/joe/syntax/sh.jsf
+etc/joe/syntax/verilog.jsf
+%%PORTDOCS%%%%DOCSDIR%%/CommandList
+%%PORTDOCS%%%%DOCSDIR%%/INFO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/joe/syntax
+@dirrm etc/joe
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BJoof-000EYz-0K>