Re: UPDATE editors/joe

2018-01-16 Thread Landry Breuil 
On Tue, Jan 16, 2018 at 10:06:03PM +0100, Björn Ketelaars wrote:
> On Sun 14/01/2018 12:44, Stuart Henderson wrote:
> > On 2018/01/14 11:14, Landry Breuil wrote:
> > > On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> > > > On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > > > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
> > > > > > fixes
> > > > > > a couple of bugs. Changelog can be found at
> > > > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > > > > 
> > > > > > Output of 'make lib-depends-check' indicates that curses should be 
> > > > > > included as
> > > > > > WANTLIB instead of ncurses.
> > > > > > 
> > > > > > Comments?
> > > > > 
> > > > > Maybe portcheck warns about it, but if somehonw files are added into
> > > > > share/applications; then you need to run depends on 
> > > > > desktop-file-utils,
> > > > > update the plist so that the share/applications dir is removed from 
> > > > > it,
> > > > > and add the corresponding @exec @unexec-delete goos as found in many
> > > > > other ports. Or if you dont want to add the dependency, @comment the
> > > > > entries so that they're not installed.
> > > > 
> > > > Yes...portcheck warns about files in share/applications, and about
> > > > desktop-file-utils. My mistake.
> > > > 
> > > > New diff:
> > > 
> > > this one is okay for me if someone wants to commit it.
> > > 
> > 
> > The .desktop files are broken, "Exec=/usr/bin/joe %F"
> > 
> > Easy to patch, but do we really want an X dependency for a simple text
> > editor? It's the sort of thing you might install on a firewall for
> > someone who isn't comfortable with vi/mg.
> 
> My primary use case for joe is offering a young family member a relative easy
> terminal editor. There is no need for X. Of course, this use case is only one
> of many.
> 
> For reference purposes, my use case is best served by the diff below.

also okay for me :)

Re: UPDATE editors/joe

2018-01-16 Thread Björn Ketelaars 
On Sun 14/01/2018 12:44, Stuart Henderson wrote:
> On 2018/01/14 11:14, Landry Breuil wrote:
> > On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> > > On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
> > > > > fixes
> > > > > a couple of bugs. Changelog can be found at
> > > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > > > 
> > > > > Output of 'make lib-depends-check' indicates that curses should be 
> > > > > included as
> > > > > WANTLIB instead of ncurses.
> > > > > 
> > > > > Comments?
> > > > 
> > > > Maybe portcheck warns about it, but if somehonw files are added into
> > > > share/applications; then you need to run depends on desktop-file-utils,
> > > > update the plist so that the share/applications dir is removed from it,
> > > > and add the corresponding @exec @unexec-delete goos as found in many
> > > > other ports. Or if you dont want to add the dependency, @comment the
> > > > entries so that they're not installed.
> > > 
> > > Yes...portcheck warns about files in share/applications, and about
> > > desktop-file-utils. My mistake.
> > > 
> > > New diff:
> > 
> > this one is okay for me if someone wants to commit it.
> > 
> 
> The .desktop files are broken, "Exec=/usr/bin/joe %F"
> 
> Easy to patch, but do we really want an X dependency for a simple text
> editor? It's the sort of thing you might install on a firewall for
> someone who isn't comfortable with vi/mg.

My primary use case for joe is offering a young family member a relative easy
terminal editor. There is no need for X. Of course, this use case is only one
of many.

For reference purposes, my use case is best served by the diff below.


diff --git editors/joe/Makefile editors/joe/Makefile
index 2e0b050fe74..cecdeb0a8dc 100644
--- editors/joe/Makefile
+++ editors/joe/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME=  joe-4.5
+DISTNAME=  joe-4.6
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -11,7 +11,7 @@ HOMEPAGE= http://joe-editor.sourceforge.net/
 # GPLv2 only
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=   c ncurses m util
+WANTLIB=   c curses m util
 
 BUILD_DEPENDS= converters/libiconv
 
diff --git editors/joe/distinfo editors/joe/distinfo
index 6c37e9ba4e8..efbad7ef60a 100644
--- editors/joe/distinfo
+++ editors/joe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
-SIZE (joe-4.5.tar.gz) = 1275486
+SHA256 (joe-4.6.tar.gz) = SVoKYfJkBAcP6KcZ2AQG3H8zdiN4jkRbkqn23lEqud4=
+SIZE (joe-4.6.tar.gz) = 1895046
diff --git editors/joe/pkg/PLIST editors/joe/pkg/PLIST
index 9d337f09bf0..1f415e1b7e6 100644
--- editors/joe/pkg/PLIST
+++ editors/joe/pkg/PLIST
@@ -8,6 +8,11 @@ bin/rjoe
 man/ru/
 man/ru/man1/
 @man man/ru/man1/joe.1
+@comment share/applications/
+@comment share/applications/jmacs.desktop
+@comment share/applications/joe.desktop
+@comment share/applications/jpico.desktop
+@comment share/applications/jstar.desktop
 share/doc/joe/
 share/doc/joe/ChangeLog
 share/doc/joe/NEWS.md

Re: UPDATE editors/joe

2018-01-14 Thread Jeremie Courreges-Anglas 
On Sun, Jan 14 2018, Stuart Henderson  wrote:
> On 2018/01/14 11:14, Landry Breuil wrote:
>> On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
>> > On Sun 14/01/2018 10:10, Landry Breuil wrote:
>> > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
>> > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
>> > > > fixes
>> > > > a couple of bugs. Changelog can be found at
>> > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
>> > > > 
>> > > > Output of 'make lib-depends-check' indicates that curses should be 
>> > > > included as
>> > > > WANTLIB instead of ncurses.
>> > > > 
>> > > > Comments?
>> > > 
>> > > Maybe portcheck warns about it, but if somehonw files are added into
>> > > share/applications; then you need to run depends on desktop-file-utils,
>> > > update the plist so that the share/applications dir is removed from it,
>> > > and add the corresponding @exec @unexec-delete goos as found in many
>> > > other ports. Or if you dont want to add the dependency, @comment the
>> > > entries so that they're not installed.
>> > 
>> > Yes...portcheck warns about files in share/applications, and about
>> > desktop-file-utils. My mistake.
>> > 
>> > New diff:
>> 
>> this one is okay for me if someone wants to commit it.
>> 
>
> The .desktop files are broken, "Exec=/usr/bin/joe %F"
>
> Easy to patch, but do we really want an X dependency for a simple text
> editor? It's the sort of thing you might install on a firewall for
> someone who isn't comfortable with vi/mg.

+1 to avoid the extra dep.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE editors/joe

2018-01-14 Thread Stuart Henderson 
On 2018/01/14 11:14, Landry Breuil wrote:
> On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> > On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
> > > > fixes
> > > > a couple of bugs. Changelog can be found at
> > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > > 
> > > > Output of 'make lib-depends-check' indicates that curses should be 
> > > > included as
> > > > WANTLIB instead of ncurses.
> > > > 
> > > > Comments?
> > > 
> > > Maybe portcheck warns about it, but if somehonw files are added into
> > > share/applications; then you need to run depends on desktop-file-utils,
> > > update the plist so that the share/applications dir is removed from it,
> > > and add the corresponding @exec @unexec-delete goos as found in many
> > > other ports. Or if you dont want to add the dependency, @comment the
> > > entries so that they're not installed.
> > 
> > Yes...portcheck warns about files in share/applications, and about
> > desktop-file-utils. My mistake.
> > 
> > New diff:
> 
> this one is okay for me if someone wants to commit it.
> 

The .desktop files are broken, "Exec=/usr/bin/joe %F"

Easy to patch, but do we really want an X dependency for a simple text
editor? It's the sort of thing you might install on a firewall for
someone who isn't comfortable with vi/mg.

Re: UPDATE editors/joe

2018-01-14 Thread Landry Breuil 
On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> > > a couple of bugs. Changelog can be found at
> > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > 
> > > Output of 'make lib-depends-check' indicates that curses should be 
> > > included as
> > > WANTLIB instead of ncurses.
> > > 
> > > Comments?
> > 
> > Maybe portcheck warns about it, but if somehonw files are added into
> > share/applications; then you need to run depends on desktop-file-utils,
> > update the plist so that the share/applications dir is removed from it,
> > and add the corresponding @exec @unexec-delete goos as found in many
> > other ports. Or if you dont want to add the dependency, @comment the
> > entries so that they're not installed.
> 
> Yes...portcheck warns about files in share/applications, and about
> desktop-file-utils. My mistake.
> 
> New diff:

this one is okay for me if someone wants to commit it.

Re: UPDATE editors/joe

2018-01-14 Thread Björn Ketelaars 
On Sun 14/01/2018 10:10, Landry Breuil wrote:
> On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> > a couple of bugs. Changelog can be found at
> > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > 
> > Output of 'make lib-depends-check' indicates that curses should be included 
> > as
> > WANTLIB instead of ncurses.
> > 
> > Comments?
> 
> Maybe portcheck warns about it, but if somehonw files are added into
> share/applications; then you need to run depends on desktop-file-utils,
> update the plist so that the share/applications dir is removed from it,
> and add the corresponding @exec @unexec-delete goos as found in many
> other ports. Or if you dont want to add the dependency, @comment the
> entries so that they're not installed.

Yes...portcheck warns about files in share/applications, and about
desktop-file-utils. My mistake.

New diff:


diff --git editors/joe/Makefile editors/joe/Makefile
index 2e0b050fe74..6926504071b 100644
--- editors/joe/Makefile
+++ editors/joe/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME=  joe-4.5
+DISTNAME=  joe-4.6
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -11,9 +11,10 @@ HOMEPAGE=http://joe-editor.sourceforge.net/
 # GPLv2 only
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=   c ncurses m util
+WANTLIB=   c curses m util
 
 BUILD_DEPENDS= converters/libiconv
+RUN_DEPENDS=   devel/desktop-file-utils
 
 CONFIGURE_STYLE=   gnu
 
diff --git editors/joe/distinfo editors/joe/distinfo
index 6c37e9ba4e8..efbad7ef60a 100644
--- editors/joe/distinfo
+++ editors/joe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
-SIZE (joe-4.5.tar.gz) = 1275486
+SHA256 (joe-4.6.tar.gz) = SVoKYfJkBAcP6KcZ2AQG3H8zdiN4jkRbkqn23lEqud4=
+SIZE (joe-4.6.tar.gz) = 1895046
diff --git editors/joe/pkg/PLIST editors/joe/pkg/PLIST
index 9d337f09bf0..b42373727c7 100644
--- editors/joe/pkg/PLIST
+++ editors/joe/pkg/PLIST
@@ -8,6 +8,10 @@ bin/rjoe
 man/ru/
 man/ru/man1/
 @man man/ru/man1/joe.1
+share/applications/jmacs.desktop
+share/applications/joe.desktop
+share/applications/jpico.desktop
+share/applications/jstar.desktop
 share/doc/joe/
 share/doc/joe/ChangeLog
 share/doc/joe/NEWS.md
@@ -221,3 +225,5 @@ share/joe/syntax/xml.jsf
 @sample ${SYSCONFDIR}/joe/syntax/xml.jsf
 share/joe/syntax/yaml.jsf
 @sample ${SYSCONFDIR}/joe/syntax/yaml.jsf
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

Re: UPDATE editors/joe

2018-01-14 Thread Landry Breuil 
On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> a couple of bugs. Changelog can be found at
> https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> 
> Output of 'make lib-depends-check' indicates that curses should be included as
> WANTLIB instead of ncurses.
> 
> Comments?

Maybe portcheck warns about it, but if somehonw files are added into
share/applications; then you need to run depends on desktop-file-utils,
update the plist so that the share/applications dir is removed from it,
and add the corresponding @exec @unexec-delete goos as found in many
other ports. Or if you dont want to add the dependency, @comment the
entries so that they're not installed.

Re: [UPDATE] editors/joe

2017-11-04 Thread Brian Callahan 



On 11/04/17 14:20, Frederic Cambus wrote:

Hi ports@,

Here is a diff to update joe to 4.5.

Comments? OK?


One nit.


Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile1 Jun 2017 14:18:06 -   1.49
+++ Makefile4 Nov 2017 17:43:59 -
@@ -2,8 +2,7 @@
  
  COMMENT=		Joe's Own Editor
  
-DISTNAME =		joe-4.4

-REVISION = 0
+DISTNAME=  joe-4.5
  CATEGORIES=   editors
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
  
@@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
  
  WANTLIB=		c ncurses m util
  
-BUILD_DEPENDS =		converters/libiconv

+BUILD_DEPENDS= converters/libiconv
  
  CONFIGURE_STYLE=	gnu
  
Index: distinfo

===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo11 May 2017 14:01:57 -  1.13
+++ distinfo4 Nov 2017 17:43:59 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.4.tar.gz) = pXBIKLvKKay54gBBT+9SLGbN+c4oFQ9ALWdn2kNGCXk=
-SIZE (joe-4.4.tar.gz) = 1350062
+SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
+SIZE (joe-4.5.tar.gz) = 1275486
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST   1 Nov 2016 21:07:25 -   1.18
+++ pkg/PLIST   4 Nov 2017 17:43:59 -
@@ -40,6 +40,16 @@ share/examples/joe/shell.sh
  share/joe/
  share/joe/charmaps/
  share/joe/charmaps/klingon
+share/joe/colors/
+share/joe/colors/default.jcf
+share/joe/colors/gruvbox.jcf
+share/joe/colors/ir_black.jcf
+share/joe/colors/molokai.jcf
+share/joe/colors/solarized.jcf
+share/joe/colors/wombat.jcf
+share/joe/colors/xoria.jcf
+share/joe/colors/zenburn-hc.jcf
+share/joe/colors/zenburn.jcf
  share/joe/lang/
  @sample ${SYSCONFDIR}/joe/lang/
  share/joe/lang/de.po
@@ -121,6 +131,7 @@ share/joe/syntax/iptables.jsf
  @sample ${SYSCONFDIR}/joe/syntax/iptables.jsf
  share/joe/syntax/java.jsf
  @sample ${SYSCONFDIR}/joe/syntax/java.jsf
+share/joe/syntax/jcf.jsf


Missing the @sample line for this.

Otherwise ok.

~Brian


  share/joe/syntax/joerc.jsf
  @sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
  share/joe/syntax/js.jsf

[UPDATE] editors/joe

2017-11-04 Thread Frederic Cambus 
Hi ports@,

Here is a diff to update joe to 4.5.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile1 Jun 2017 14:18:06 -   1.49
+++ Makefile4 Nov 2017 17:43:59 -
@@ -2,8 +2,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME = joe-4.4
-REVISION = 0
+DISTNAME=  joe-4.5
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=   c ncurses m util
 
-BUILD_DEPENDS =converters/libiconv
+BUILD_DEPENDS= converters/libiconv
 
 CONFIGURE_STYLE=   gnu
 
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo11 May 2017 14:01:57 -  1.13
+++ distinfo4 Nov 2017 17:43:59 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.4.tar.gz) = pXBIKLvKKay54gBBT+9SLGbN+c4oFQ9ALWdn2kNGCXk=
-SIZE (joe-4.4.tar.gz) = 1350062
+SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
+SIZE (joe-4.5.tar.gz) = 1275486
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST   1 Nov 2016 21:07:25 -   1.18
+++ pkg/PLIST   4 Nov 2017 17:43:59 -
@@ -40,6 +40,16 @@ share/examples/joe/shell.sh
 share/joe/
 share/joe/charmaps/
 share/joe/charmaps/klingon
+share/joe/colors/
+share/joe/colors/default.jcf
+share/joe/colors/gruvbox.jcf
+share/joe/colors/ir_black.jcf
+share/joe/colors/molokai.jcf
+share/joe/colors/solarized.jcf
+share/joe/colors/wombat.jcf
+share/joe/colors/xoria.jcf
+share/joe/colors/zenburn-hc.jcf
+share/joe/colors/zenburn.jcf
 share/joe/lang/
 @sample ${SYSCONFDIR}/joe/lang/
 share/joe/lang/de.po
@@ -121,6 +131,7 @@ share/joe/syntax/iptables.jsf
 @sample ${SYSCONFDIR}/joe/syntax/iptables.jsf
 share/joe/syntax/java.jsf
 @sample ${SYSCONFDIR}/joe/syntax/java.jsf
+share/joe/syntax/jcf.jsf
 share/joe/syntax/joerc.jsf
 @sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
 share/joe/syntax/js.jsf

update editors/joe

2016-03-25 Thread Daniel Jakots 
Hi,

Here's an update to the latest release. Changelog is available on SF
[0].

Quickly tested on amd64.

[0]: https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile3 Oct 2015 17:58:07 -   1.45
+++ Makefile25 Mar 2016 20:14:53 -
@@ -3,7 +3,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME=  joe-4.1
+DISTNAME=  joe-4.2
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo3 Oct 2015 17:58:07 -   1.10
+++ distinfo25 Mar 2016 20:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.1.tar.gz) = gWIRsr2VH3kt42Aq/XTqS1FhL//dm8JKeAhmAFP+9ts=
-SIZE (joe-4.1.tar.gz) = 1292957
+SHA256 (joe-4.2.tar.gz) = vF2mS8VoOreyliozIUs1N+oX/2Uoo8YLoXA1njHoaXQ=
+SIZE (joe-4.2.tar.gz) = 1341048
Index: patches/patch-joe_main_c
===
RCS file: patches/patch-joe_main_c
diff -N patches/patch-joe_main_c
--- patches/patch-joe_main_c3 Oct 2015 17:58:07 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-joe_main_c,v 1.1 2015/10/03 17:58:07 jca Exp $
-
-Committed upstream
-
-  
http://sourceforge.net/p/joe-editor/mercurial/ci/e26894707ac52a56d02c55af6e412d8fd96df94d/#diff-2
-
 joe/main.c.origMon Aug 31 04:59:43 2015
-+++ joe/main.c Sat Oct  3 18:09:12 2015
-@@ -211,7 +211,7 @@ int edloop(int flg)
-   }
- 
-   /* Restore modes */
--  if (maint->curwin->watom->what & TYPETW) {
-+  if (!leave && maint->curwin->watom->what & TYPETW) {
-   bw = (BW *)maint->curwin->object;
- 
-   if (auto_off) {
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST   3 Oct 2015 17:58:07 -   1.16
+++ pkg/PLIST   25 Mar 2016 20:14:53 -
@@ -87,6 +87,8 @@ share/joe/syntax/debian.jsf
 @sample ${SYSCONFDIR}/joe/syntax/debian.jsf
 share/joe/syntax/diff.jsf
 @sample ${SYSCONFDIR}/joe/syntax/diff.jsf
+share/joe/syntax/dockerfile.jsf
+@sample ${SYSCONFDIR}/joe/syntax/dockerfile.jsf
 share/joe/syntax/elixir.jsf
 @sample ${SYSCONFDIR}/joe/syntax/elixir.jsf
 share/joe/syntax/erb.jsf

Re: update editors/joe

2015-10-03 Thread Stuart Henderson 
On 2015/10/03 09:41, Daniel Jakots wrote:
> Here's an update to the latest stable release. My really light testing
> discovered a use after free. Thanks Quentin Rameau for providing a
> patch for it (committed upstream now).
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/joe/Makefile,v
> retrieving revision 1.44
> diff -u -p -r1.44 Makefile
> --- Makefile  25 Aug 2015 13:18:25 -  1.44
> +++ Makefile  3 Oct 2015 07:24:52 -
> @@ -3,10 +3,9 @@
>  
>  COMMENT= Joe's Own Editor
>  
> -DISTNAME=joe-4.0
> +DISTNAME=joe-4.1
>  CATEGORIES=  editors
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=joe-editor/}
> -REVISION=0
>  
>  HOMEPAGE=http://joe-editor.sourceforge.net/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/joe/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  31 Mar 2015 12:26:40 -  1.9
> +++ distinfo  3 Oct 2015 07:24:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (joe-4.0.tar.gz) = xVat/3f9l78bhhmN5suC4Lks2hhXnE/vbIO2CNLtKRU=
> -SIZE (joe-4.0.tar.gz) = 838783
> +SHA256 (joe-4.1.tar.gz) = gWIRsr2VH3kt42Aq/XTqS1FhL//dm8JKeAhmAFP+9ts=
> +SIZE (joe-4.1.tar.gz) = 1292957
> Index: patches/patch-src_use_after_free
> ===
> RCS file: patches/patch-src_use_after_free
> diff -N patches/patch-src_use_after_free
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_use_after_free  3 Oct 2015 07:24:52 -
> @@ -0,0 +1,16 @@
> +Committed upstream
> +
> +  
> http://sourceforge.net/p/joe-editor/mercurial/ci/e26894707ac52a56d02c55af6e412d8fd96df94d/#diff-2
> +
> +--- joe/main.c.orig  Fri Oct  2 19:36:29 2015
>  joe/main.c   Fri Oct  2 19:36:52 2015
> +@@ -211,7 +211,7 @@ int edloop(int flg)
> + }
> + 
> + /* Restore modes */
> +-if (maint->curwin->watom->what & TYPETW) {
> ++if (!leave && maint->curwin->watom->what & TYPETW) {
> + bw = (BW *)maint->curwin->object;
> + 
> + if (auto_off) {
> +
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -p -r1.15 PLIST
> --- pkg/PLIST 31 Mar 2015 12:26:40 -  1.15
> +++ pkg/PLIST 3 Oct 2015 07:24:52 -
> @@ -4,8 +4,6 @@ bin/jmacs
>  bin/jpico
>  bin/jstar
>  bin/rjoe
> -@bin bin/stringify
> -@bin bin/termidx
>  @man man/man1/joe.1
>  man/ru/
>  man/ru/man1/
> @@ -27,6 +25,7 @@ share/examples/joe/jmacsrc
>  @sample ${SYSCONFDIR}/joe/jmacsrc
>  share/examples/joe/joerc
>  @sample ${SYSCONFDIR}/joe/joerc
> +share/examples/joe/joerc.zh_TW
>  share/examples/joe/jpicorc
>  @sample ${SYSCONFDIR}/joe/jpicorc

The new files under /usr/local/share/examples will want @sample'ing
into ${SYSCONFDIR}

>  share/examples/joe/jstarrc
> @@ -50,6 +49,7 @@ share/joe/lang/ru.po
>  @sample ${SYSCONFDIR}/joe/lang/ru.po
>  share/joe/lang/uk.po
>  @sample ${SYSCONFDIR}/joe/lang/uk.po
> +share/joe/lang/zh.po

OTOH, I'm surprised that the files in /usr/local/share/joe/ are
@sample'd (including the existing ones), given the directory names
I'd expect it to pick these up directly. Probably worth trying to
remove those and see if it still works.

>  share/joe/syntax/
>  @sample ${SYSCONFDIR}/joe/syntax/
>  share/joe/syntax/4gl.jsf
> @@ -60,14 +60,17 @@ share/joe/syntax/ant.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/ant.jsf
>  share/joe/syntax/asm.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/asm.jsf
> +share/joe/syntax/avr.jsf
>  share/joe/syntax/awk.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/awk.jsf
>  share/joe/syntax/batch.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/batch.jsf
>  share/joe/syntax/c.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/c.jsf
> +share/joe/syntax/clojure.jsf
>  share/joe/syntax/cobol.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/cobol.jsf
> +share/joe/syntax/coffee.jsf
>  share/joe/syntax/comment_todo.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/comment_todo.jsf
>  share/joe/syntax/conf.jsf
> @@ -78,6 +81,7 @@ share/joe/syntax/csharp.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/csharp.jsf
>  share/joe/syntax/css.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/css.jsf
> +share/joe/syntax/d.jsf
>  share/joe/syntax/debian.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/debian.jsf
>  share/joe/syntax/diff.jsf
> @@ -96,6 +100,7 @@ share/joe/syntax/git-commit.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/git-commit.jsf
>  share/joe/syntax/go.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/go.jsf
> +share/joe/syntax/groovy.jsf
>  share/joe/syntax/haml.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/haml.jsf
>  share/joe/syntax/haskell.jsf
> @@ -154,10 +159,13 @@ share/joe/syntax/puppet.jsf
>  @sample ${SYSCONFDIR}/joe/syntax/puppet.jsf
>  share/joe/syntax/python.jsf
>  @sample

Re: update editors/joe

2015-10-03 Thread Jérémie Courrèges-Anglas 
Daniel Jakots  writes:

> On Sat, 3 Oct 2015 14:14:59 +0100, Stuart Henderson 
> wrote:
>
>> On 2015/10/03 09:41, Daniel Jakots wrote:
>> > Here's an update to the latest stable release. My really light
>> > testing discovered a use after free. Thanks Quentin Rameau for
>> > providing a patch for it (committed upstream now).
>
> Thanks for your input, updated diff.

Regarding Stuart's comments, that your diff addresses:
- joerc.zh_TW should indeed have been @sampled, it is a config file
- .po files didn't need to be @sampled at all
- the new syntax files should have been @sampled too

Your updated diff also switched the bugfix in patches/ from
a hand-rolled patch to the result of ''make update-patches'', which is
desirable.

Describing the changes you've done makes it easier for reviewers. ;)

I have just committed your diff.  Thanks!
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: editors/joe

2015-03-30 Thread Ryan Freeman 
On Sun, Mar 29, 2015 at 09:24:09PM -0400, Brian Callahan wrote:
 Hi ports --
 
 Joe put out their first new release since 2008 a few days ago. Here's an
 update.
 Only lightly tested but I don't foresee any problems.
 Changelog:
 http://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
 
 I also found that the groff and mandoc created man pages look identical,
 so drop USE_GROFF.
 
 OK?

My coworker, Joe, (seriously) insisted I install this update on our local
openbsd server.

That being said, all seems good on *drumroll* amd64! (mar 16th snap)

 
 ~Brian
 

 Index: Makefile
 ===
 RCS file: /cvs/ports/editors/joe/Makefile,v
 retrieving revision 1.42
 diff -u -p -r1.42 Makefile
 --- Makefile  11 Mar 2013 11:02:50 -  1.42
 +++ Makefile  30 Mar 2015 01:17:59 -
 @@ -3,21 +3,20 @@
  
  COMMENT= Joe's Own Editor
  
 -DISTNAME=joe-3.7
 -REVISION=1
 +DISTNAME=joe-4.0
  CATEGORIES=  editors
  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=joe-editor/}
  
 +MAINTAINER=  Brian Callahan bcal...@openbsd.org
  HOMEPAGE=http://joe-editor.sourceforge.net/
  
 -# GPL
 +# GPLv2 only
  PERMIT_PACKAGE_CDROM=Yes
  
  WANTLIB= c ncurses m util
  
  CONFIGURE_STYLE= gnu
  
 -USE_GROFF =  Yes
  FAKE_FLAGS=  sysconf_joedir=${PREFIX}/share/examples/joe \
   sysconf_docdir=${PREFIX}/share/doc/joe
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/editors/joe/distinfo,v
 retrieving revision 1.8
 diff -u -p -r1.8 distinfo
 --- distinfo  18 Jan 2015 03:13:49 -  1.8
 +++ distinfo  30 Mar 2015 01:17:59 -
 @@ -1,2 +1,2 @@
 -SHA256 (joe-3.7.tar.gz) = yuRW4a1ajB08lJIKNBbCNHJ3c5smDjSU07wPK5tzEG8=
 -SIZE (joe-3.7.tar.gz) = 696036
 +SHA256 (joe-4.0.tar.gz) = xVat/3f9l78bhhmN5suC4Lks2hhXnE/vbIO2CNLtKRU=
 +SIZE (joe-4.0.tar.gz) = 838783
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
 retrieving revision 1.14
 diff -u -p -r1.14 PLIST
 --- pkg/PLIST 1 Feb 2009 09:45:09 -   1.14
 +++ pkg/PLIST 30 Mar 2015 01:17:59 -
 @@ -4,6 +4,7 @@ bin/jmacs
  bin/jpico
  bin/jstar
  bin/rjoe
 +@bin bin/stringify
  @bin bin/termidx
  @man man/man1/joe.1
  man/ru/
 @@ -11,11 +12,11 @@ man/ru/man1/
  @man man/ru/man1/joe.1
  share/doc/joe/
  share/doc/joe/ChangeLog
 -share/doc/joe/HACKING
 -share/doc/joe/HINTS
 -share/doc/joe/LIST
 -share/doc/joe/NEWS
 -share/doc/joe/README
 +share/doc/joe/NEWS.md
 +share/doc/joe/README.md
 +share/doc/joe/README.old
 +share/doc/joe/hacking.md
 +share/doc/joe/man.md
  share/examples/joe/
  @sample ${SYSCONFDIR}/joe/
  share/examples/joe/ftyperc
 @@ -32,6 +33,10 @@ share/examples/joe/jstarrc
  @sample ${SYSCONFDIR}/joe/jstarrc
  share/examples/joe/rjoerc
  @sample ${SYSCONFDIR}/joe/rjoerc
 +share/examples/joe/shell.csh
 +@sample ${SYSCONFDIR}/joe/shell.csh
 +share/examples/joe/shell.sh
 +@sample ${SYSCONFDIR}/joe/shell.sh
  share/joe/
  share/joe/charmaps/
  share/joe/charmaps/klingon
 @@ -51,36 +56,70 @@ share/joe/syntax/4gl.jsf
  @sample ${SYSCONFDIR}/joe/syntax/4gl.jsf
  share/joe/syntax/ada.jsf
  @sample ${SYSCONFDIR}/joe/syntax/ada.jsf
 +share/joe/syntax/ant.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/ant.jsf
  share/joe/syntax/asm.jsf
  @sample ${SYSCONFDIR}/joe/syntax/asm.jsf
  share/joe/syntax/awk.jsf
  @sample ${SYSCONFDIR}/joe/syntax/awk.jsf
 +share/joe/syntax/batch.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/batch.jsf
  share/joe/syntax/c.jsf
  @sample ${SYSCONFDIR}/joe/syntax/c.jsf
  share/joe/syntax/cobol.jsf
  @sample ${SYSCONFDIR}/joe/syntax/cobol.jsf
 +share/joe/syntax/comment_todo.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/comment_todo.jsf
  share/joe/syntax/conf.jsf
  @sample ${SYSCONFDIR}/joe/syntax/conf.jsf
  share/joe/syntax/csh.jsf
  @sample ${SYSCONFDIR}/joe/syntax/csh.jsf
 +share/joe/syntax/csharp.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/csharp.jsf
  share/joe/syntax/css.jsf
  @sample ${SYSCONFDIR}/joe/syntax/css.jsf
 +share/joe/syntax/debian.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/debian.jsf
  share/joe/syntax/diff.jsf
  @sample ${SYSCONFDIR}/joe/syntax/diff.jsf
 +share/joe/syntax/elixir.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/elixir.jsf
 +share/joe/syntax/erb.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/erb.jsf
 +share/joe/syntax/erlang.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/erlang.jsf
 +share/joe/syntax/filename.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/filename.jsf
  share/joe/syntax/fortran.jsf
  @sample ${SYSCONFDIR}/joe/syntax/fortran.jsf
 +share/joe/syntax/git-commit.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/git-commit.jsf
 +share/joe/syntax/go.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/go.jsf
 +share/joe/syntax/haml.jsf
 +@sample ${SYSCONFDIR}/joe/syntax/haml.jsf
  share/joe/syntax/haskell.jsf
  @sample ${SYSCONFDIR}/joe/syntax/haskell.jsf

UPDATE: editors/joe

2015-03-29 Thread Brian Callahan 
Hi ports --

Joe put out their first new release since 2008 a few days ago. Here's an
update.
Only lightly tested but I don't foresee any problems.
Changelog:
http://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md

I also found that the groff and mandoc created man pages look identical,
so drop USE_GROFF.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile	11 Mar 2013 11:02:50 -	1.42
+++ Makefile	30 Mar 2015 01:17:59 -
@@ -3,21 +3,20 @@
 
 COMMENT=		Joe's Own Editor
 
-DISTNAME=		joe-3.7
-REVISION=		1
+DISTNAME=		joe-4.0
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
+MAINTAINER=		Brian Callahan bcal...@openbsd.org
 HOMEPAGE=		http://joe-editor.sourceforge.net/
 
-# GPL
+# GPLv2 only
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c ncurses m util
 
 CONFIGURE_STYLE=	gnu
 
-USE_GROFF =	Yes
 FAKE_FLAGS=	sysconf_joedir=${PREFIX}/share/examples/joe \
 		sysconf_docdir=${PREFIX}/share/doc/joe
 
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	18 Jan 2015 03:13:49 -	1.8
+++ distinfo	30 Mar 2015 01:17:59 -
@@ -1,2 +1,2 @@
-SHA256 (joe-3.7.tar.gz) = yuRW4a1ajB08lJIKNBbCNHJ3c5smDjSU07wPK5tzEG8=
-SIZE (joe-3.7.tar.gz) = 696036
+SHA256 (joe-4.0.tar.gz) = xVat/3f9l78bhhmN5suC4Lks2hhXnE/vbIO2CNLtKRU=
+SIZE (joe-4.0.tar.gz) = 838783
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST	1 Feb 2009 09:45:09 -	1.14
+++ pkg/PLIST	30 Mar 2015 01:17:59 -
@@ -4,6 +4,7 @@ bin/jmacs
 bin/jpico
 bin/jstar
 bin/rjoe
+@bin bin/stringify
 @bin bin/termidx
 @man man/man1/joe.1
 man/ru/
@@ -11,11 +12,11 @@ man/ru/man1/
 @man man/ru/man1/joe.1
 share/doc/joe/
 share/doc/joe/ChangeLog
-share/doc/joe/HACKING
-share/doc/joe/HINTS
-share/doc/joe/LIST
-share/doc/joe/NEWS
-share/doc/joe/README
+share/doc/joe/NEWS.md
+share/doc/joe/README.md
+share/doc/joe/README.old
+share/doc/joe/hacking.md
+share/doc/joe/man.md
 share/examples/joe/
 @sample ${SYSCONFDIR}/joe/
 share/examples/joe/ftyperc
@@ -32,6 +33,10 @@ share/examples/joe/jstarrc
 @sample ${SYSCONFDIR}/joe/jstarrc
 share/examples/joe/rjoerc
 @sample ${SYSCONFDIR}/joe/rjoerc
+share/examples/joe/shell.csh
+@sample ${SYSCONFDIR}/joe/shell.csh
+share/examples/joe/shell.sh
+@sample ${SYSCONFDIR}/joe/shell.sh
 share/joe/
 share/joe/charmaps/
 share/joe/charmaps/klingon
@@ -51,36 +56,70 @@ share/joe/syntax/4gl.jsf
 @sample ${SYSCONFDIR}/joe/syntax/4gl.jsf
 share/joe/syntax/ada.jsf
 @sample ${SYSCONFDIR}/joe/syntax/ada.jsf
+share/joe/syntax/ant.jsf
+@sample ${SYSCONFDIR}/joe/syntax/ant.jsf
 share/joe/syntax/asm.jsf
 @sample ${SYSCONFDIR}/joe/syntax/asm.jsf
 share/joe/syntax/awk.jsf
 @sample ${SYSCONFDIR}/joe/syntax/awk.jsf
+share/joe/syntax/batch.jsf
+@sample ${SYSCONFDIR}/joe/syntax/batch.jsf
 share/joe/syntax/c.jsf
 @sample ${SYSCONFDIR}/joe/syntax/c.jsf
 share/joe/syntax/cobol.jsf
 @sample ${SYSCONFDIR}/joe/syntax/cobol.jsf
+share/joe/syntax/comment_todo.jsf
+@sample ${SYSCONFDIR}/joe/syntax/comment_todo.jsf
 share/joe/syntax/conf.jsf
 @sample ${SYSCONFDIR}/joe/syntax/conf.jsf
 share/joe/syntax/csh.jsf
 @sample ${SYSCONFDIR}/joe/syntax/csh.jsf
+share/joe/syntax/csharp.jsf
+@sample ${SYSCONFDIR}/joe/syntax/csharp.jsf
 share/joe/syntax/css.jsf
 @sample ${SYSCONFDIR}/joe/syntax/css.jsf
+share/joe/syntax/debian.jsf
+@sample ${SYSCONFDIR}/joe/syntax/debian.jsf
 share/joe/syntax/diff.jsf
 @sample ${SYSCONFDIR}/joe/syntax/diff.jsf
+share/joe/syntax/elixir.jsf
+@sample ${SYSCONFDIR}/joe/syntax/elixir.jsf
+share/joe/syntax/erb.jsf
+@sample ${SYSCONFDIR}/joe/syntax/erb.jsf
+share/joe/syntax/erlang.jsf
+@sample ${SYSCONFDIR}/joe/syntax/erlang.jsf
+share/joe/syntax/filename.jsf
+@sample ${SYSCONFDIR}/joe/syntax/filename.jsf
 share/joe/syntax/fortran.jsf
 @sample ${SYSCONFDIR}/joe/syntax/fortran.jsf
+share/joe/syntax/git-commit.jsf
+@sample ${SYSCONFDIR}/joe/syntax/git-commit.jsf
+share/joe/syntax/go.jsf
+@sample ${SYSCONFDIR}/joe/syntax/go.jsf
+share/joe/syntax/haml.jsf
+@sample ${SYSCONFDIR}/joe/syntax/haml.jsf
 share/joe/syntax/haskell.jsf
 @sample ${SYSCONFDIR}/joe/syntax/haskell.jsf
 share/joe/syntax/html.jsf
 @sample ${SYSCONFDIR}/joe/syntax/html.jsf
+share/joe/syntax/htmlerb.jsf
+@sample ${SYSCONFDIR}/joe/syntax/htmlerb.jsf
+share/joe/syntax/ini.jsf
+@sample ${SYSCONFDIR}/joe/syntax/ini.jsf
+share/joe/syntax/iptables.jsf
+@sample ${SYSCONFDIR}/joe/syntax/iptables.jsf
 share/joe/syntax/java.jsf
 @sample ${SYSCONFDIR}/joe/syntax/java.jsf
 share/joe/syntax/joerc.jsf
 @sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
+share/joe/syntax/js.jsf
+@sample ${SYSCONFDIR}/joe/syntax/js.jsf
 share/joe/syntax/jsf.jsf
 @sample