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