Date: Sat, 16 May 2026 18:45:22 +0000 From: Kousuke Kannagi <mce@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 264b611f65fb - main - editors/joe: Flavorize Message-ID: <6a08bb42.2736b.344c6f66@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/ports/commit/?id=264b611f65fb70953e54e866cc2e6537b40d8027 commit 264b611f65fb70953e54e866cc2e6537b40d8027 Author: Kousuke Kannagi <mce@FreeBSD.org> AuthorDate: 2026-05-16 12:52:22 +0000 Commit: Kousuke Kannagi <mce@FreeBSD.org> CommitDate: 2026-05-16 18:42:10 +0000 editors/joe: Flavorize flavore for those who don't need the desktop file. PR: 295330 Approved by: fluffy (mentor) --- editors/joe/Makefile | 19 ++++++++++++++++++- editors/joe/files/extra-patch-Makefile.in | 11 +++++++++++ editors/joe/pkg-plist | 4 ---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 936aa940b958..73850a4b474f 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -1,5 +1,6 @@ PORTNAME= joe DISTVERSION= 4.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES?= editors MASTER_SITES= SF/joe-editor/JOE%20sources/joe-${DISTVERSION} @@ -11,7 +12,10 @@ WWW= https://sourceforge.net/projects/joe-editor/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= desktop-file-utils gmake iconv ncurses +FLAVORS= tiny x11 +FLAVOR?= ${FLAVORS:[1]} + +USES= gmake iconv ncurses GNU_CONFIGURE= yes CONFIGURE_ENV= SPELL=aspell @@ -23,6 +27,19 @@ OPTIONS_DEFINE= ASPELL DOCS ASPELL_RUN_DEPENDS= aspell:textproc/aspell +.if ${FLAVOR} == tiny +CONFLICTS_INSTALL= ${PORTNAME}-x11 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Makefile.in +.else +PKGNAMESUFFIX= -x11 +USES+= desktop-file-utils +CONFLICTS_INSTALL= ${PORTNAME} +PLIST_FILES= share/applications/jmacs.desktop \ + share/applications/joe.desktop \ + share/applications/jpico.desktop \ + share/applications/jstar.desktop +.endif + post-patch: ${REINPLACE_CMD} -e 's|docs/README.old docs/man.md ||' ${WRKSRC}/Makefile.in diff --git a/editors/joe/files/extra-patch-Makefile.in b/editors/joe/files/extra-patch-Makefile.in new file mode 100644 index 000000000000..c2d8cc41f877 --- /dev/null +++ b/editors/joe/files/extra-patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2026-05-16 11:52:38 UTC ++++ Makefile.in +@@ -361,7 +361,7 @@ AUTOMAKE_OPTIONS = foreign + am__v_SED_0 = @echo " SED " $@; + am__v_SED_1 = + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = man rc po syntax joe colors desktop ++SUBDIRS = man rc po syntax joe colors + EXTRA_DIST = COPYING docs/hacking.md ChangeLog NEWS.md docs/README.old README.md INSTALL.md INSTALL.AMIGA \ + docs/help-system.html charmaps/klingon.in \ + cygbuild setup.hint autojoe docs/man.md diff --git a/editors/joe/pkg-plist b/editors/joe/pkg-plist index 267b21a89e35..259888dfc475 100644 --- a/editors/joe/pkg-plist +++ b/editors/joe/pkg-plist @@ -15,10 +15,6 @@ bin/rjoe %%ETCDIR%%/shell.sh share/man/man1/joe.1.gz share/man/ru/man1/joe.1.gz -share/applications/jmacs.desktop -share/applications/joe.desktop -share/applications/jpico.desktop -share/applications/jstar.desktop %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.mdhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a08bb42.2736b.344c6f66>