Date: Thu, 18 May 2023 08:20:29 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0536eac2d999 - main - editors/mg: update to 20230501 Message-ID: <202305180820.34I8KTQl056425@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0536eac2d99942245768cfbfe5fb94f31ebcc683 commit 0536eac2d99942245768cfbfe5fb94f31ebcc683 Author: Mark Willson <cdr.nil@gmail.com> AuthorDate: 2023-05-14 13:30:25 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-05-18 08:19:41 +0000 editors/mg: update to 20230501 Chase to a maintained upstream. Fix typo in maintainer address. PR: 271349 --- editors/mg/Makefile | 29 +++++++++++++++-------------- editors/mg/distinfo | 6 +++--- editors/mg/files/patch-Makefile | 31 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/editors/mg/Makefile b/editors/mg/Makefile index 0d296792a4c1..4af7f55602e2 100644 --- a/editors/mg/Makefile +++ b/editors/mg/Makefile @@ -1,33 +1,34 @@ PORTNAME= mg -PORTVERSION= 7.0 +DISTVERSION= 20230501 PORTEPOCH= 1 CATEGORIES= editors -MASTER_SITES= https://github.com/ibara/mg/releases/download/mg-${PORTVERSION}/ -MAINTAINER= cgr.nil@gmail.com +MAINTAINER= cdr.nil@gmail.com COMMENT= Small, fast Emacs-like editor -WWW= https://github.com/ibara/mg +WWW= https://github.com/hboetes/mg LICENSE= PD +USES= ncurses +USE_GITHUB= yes +GH_ACCOUNT= hboetes +STAGEOWN= ${USER} +STAGEGRP!= id -gn +MAKE_ARGS+= BINOWN=${STAGEOWN} BINGRP=${STAGEGRP} MANOWN=${STAGEOWN} \ + MANGRP=${STAGEGRP} BINDIR=${PREFIX}/bin \ + MANDIR=${PREFIX}/man/man NCURSESLIB=${NCURSESLIB} \ + NCURSESINC=${NCURSESINC} FLAVORS= dynamic static FLAVOR?= ${FLAVORS:[1]} - static_PKGNAMESUFFIX= -static .if ${FLAVOR} == static -COMMENT+= (rescue(8) version) -.endif - -USES= ncurses -HAS_CONFIGURE= yes -.if ${FLAVOR} == static -CONFIGURE_ARGS= --enable-static +COMMENT+= (rescue(8) version) +MAKE_ARGS+= NO_SHARED=yes PLIST_FILES= /rescue/mg .else PLIST_FILES= bin/mg \ man/man1/mg.1.gz -PORTDOCS= README-Mg README.md tutorial - +PORTDOCS= README README.md tutorial OPTIONS_DEFINE= DOCS .endif diff --git a/editors/mg/distinfo b/editors/mg/distinfo index ff4f57b9de42..fdf6bb07b3f1 100644 --- a/editors/mg/distinfo +++ b/editors/mg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640344272 -SHA256 (mg-7.0.tar.gz) = 650dbdf9c9a72ec1922486ce07112d6181fc88a30770913d71d5c99c57fb2ac5 -SIZE (mg-7.0.tar.gz) = 248893 +TIMESTAMP = 1683455356 +SHA256 (hboetes-mg-20230501_GH0.tar.gz) = e2878feca64067a0c524e456ffba68d8cb69bcdce0943d2f2b69cad06174462e +SIZE (hboetes-mg-20230501_GH0.tar.gz) = 158315 diff --git a/editors/mg/files/patch-Makefile b/editors/mg/files/patch-Makefile new file mode 100644 index 000000000000..72f4d7baf3e4 --- /dev/null +++ b/editors/mg/files/patch-Makefile @@ -0,0 +1,31 @@ +--- Makefile.orig 2023-05-01 15:27:50 UTC ++++ Makefile +@@ -2,7 +2,7 @@ + + PROG= mg + +-LDADD+= `pkg-config --libs ncurses` -lutil ++LDADD+= -L${NCURSESLIB} -lncurses -lutil + DPADD+= ${LIBUTIL} + + # (Common) compile-time options: +@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL} + # STARTUPFILE -- look for and handle initialization file. + # MGLOG -- debug mg internals to a log file. + # +-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses` ++CFLAGS+=-Wall -DREGEX -L${NCURSESINC} + + SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ + echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ +@@ -28,10 +28,5 @@ SRCS+= cmode.c cscope.c dired.c grep.c interpreter.c t + # -DMGLOG source file. + # + #SRCS+= log.c +- +-afterinstall: +- ${INSTALL} -d -o root -g wheel ${DESTDIR}${DOCDIR}/mg +- ${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \ +- ${.CURDIR}/tutorial ${DESTDIR}${DOCDIR}/mg + + .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305180820.34I8KTQl056425>