From nobody Thu May 18 08:20:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMNFp1vFnz3bMl9; Thu, 18 May 2023 08:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMNFp1STYz3KVQ; Thu, 18 May 2023 08:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wn83Y/372cPLAyyjZoagyLyVvS57+I13IYEXL36VZKY=; b=fePUtqLvDdBgdKctstylW0VfYBe9Uddm+Q8V5ALq6qQc6FIaWt5mKdZjePGWunJ8P4MQOu Vv3tBpvGVDjLGVIpFDjGds5Y4MUmmOrbatZDwjvLhhbkDag0BVkH5X4p6HQwxRAOTbUgNQ cZlvmj2XNYcwqnn+L5dMVA3vBI1XhYBlopJAre7KP2KZ/kYm+BSIZfidmHu8Ju6hcL0To4 bBd67i55i7FNuigZYoYVblZR0Gf2r2cfXlqS4Nmvb0qPsyo5Gx5HcqhFlpGGHDgGLzSuyl GaPhQ5tKKRvsDcy6jo1IR84NfnfDPBJXlLuXln3Ko9VYoZrMA2hOZpTVQh5GeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wn83Y/372cPLAyyjZoagyLyVvS57+I13IYEXL36VZKY=; b=YB7lvm2nVFeKYiytNYe8hIyr92daHY8618mkgGGh4C+zS7jYl6QmY0GoIKDc0yZueWcIhB 0kQKISP4iM5FICqLKCH5PvTDPeYGye9NxrxdcEbaFlotdcxGBgX4CwGM4iiX+M89cumymY zlwg0u7KS6jPLoKgbqg8In4p+12sjrC6LGnH6kGu1NyfSUgviJU3TErbRBgY73SE56PI33 bE/lHxx9cvPiCBB2lXgqOVXAiPjpPfZtxGm+jjZkAjS+feLbpNFeXONTPNg3nVLI4rCoyq +k22Sjpq/PWRUf+9UuyA2tAL74snE+dL/U7C5tRyFth6Vfi5sNqDimgD7BOLqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684398030; a=rsa-sha256; cv=none; b=krIc7uPEWHxckdOQ1sfxdOiVc8tMKiHyJuREDVVjnj4O8c+AMSFU9V2lG5VqOu+axTiqZx wnyyao/b0MY0BleV8R9dICZfcHX4uqY+W1YnlR2J4Cgxmnp7Ozb5XXr0woSVwsTV1glGMZ pxp8Iz9wYmx4NSKex2zIZQxZ8xQEY+OQtuxeSuPBfq4p36tL+Ntz1jJgbUUprzH1U7NOVi bP9geTDAFrfEIvOks848bnLeFkLGu2MRcdWwP1zBceSf6Rdzf/pclxTefXCrlxtTZRGMno zBecYJy8wdKcl5/SrCVqa2brdGmWR4U91+GuUPUZVvg2sa4qAtSwpXraJQqcHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMNFp0WCczf1H; Thu, 18 May 2023 08:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34I8KTZp056427; Thu, 18 May 2023 08:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34I8KTQl056425; Thu, 18 May 2023 08:20:29 GMT (envelope-from git) Date: Thu, 18 May 2023 08:20:29 GMT Message-Id: <202305180820.34I8KTQl056425@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 0536eac2d999 - main - editors/mg: update to 20230501 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0536eac2d99942245768cfbfe5fb94f31ebcc683 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0536eac2d99942245768cfbfe5fb94f31ebcc683 commit 0536eac2d99942245768cfbfe5fb94f31ebcc683 Author: Mark Willson AuthorDate: 2023-05-14 13:30:25 +0000 Commit: Robert Clausecker 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