From nobody Tue Nov 29 18:59:19 2022 X-Original-To: dev-commits-ports-all@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 4NMBTN0xHMz4jWQP; Tue, 29 Nov 2022 18:59:20 +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 4NMBTN0Cptz3FCb; Tue, 29 Nov 2022 18:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669748360; 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=LXfHYzMzy4a6Yk5ILKqaB9XLkE48wv0L488v3e/YsI0=; b=hq5Tvxvp8SyMBLaEGhv6SYeHqLEc7vnzV/bY7lf7bLj84bFw2g7rC0SbHZm0kuNiKn6IYM IXJ4C8Tzx8/q5Q4+AfCg7Y2IjHV1Bkp95kbbocCdCL+opMaB8UKTyeOr3Jha2JjBIlQ4HN nbPB9k1OQ/m2FzlvJPceSPDSAr7UyKM/waucOo7IvlFMHjgyUr7P7FaYTuWE+ve8DOsn9J 0JCsQPdRl3RpTtcKcB7CCLT8KSHnQBLZoqILvnTCGEJTWgSlEOOCd8nvVnQnl+lEYTZGuh 7kqPXKI1urTbQOSE0a98EOS4M00WIWK5eS62FAT3s84D7M0YxpnCZ6LJ7jdBRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669748360; 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=LXfHYzMzy4a6Yk5ILKqaB9XLkE48wv0L488v3e/YsI0=; b=brY7/VtzOP/AQT4/5MhaOeyw/mbI9L5DgSENMj7os6AogkWu7ZicJaTmwfus+ZIZ3bOuK3 eepTt8vPVj9T+3ShrguxUv4co6UQYGKG/Uz8tdjYIqDoN7smyTejjDVVCcOP3ztEgYahv9 QYBwXyOLSysVJjTLsnduMqpccvrs/q8wzQFnl09Xd7SMNwls3noikvMGC74vZnKEBqALz4 gJ9PzYHpxnGktE0wzDNvEpYa7KhrW25yLTu0AhwG8p5a18qLNqa83fKrU0Fh9GPhUP+AU6 WErJ8iP/HEaoOum86JhAccFJEgHBd/6yUOinGkaPuX65rYgTc70GVkosgV3hAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669748360; a=rsa-sha256; cv=none; b=cNPaTUli8qLud8roA5VIW33O1/z/zyB9/Ekvw5h8Mcr8OIUoP6/q5WgQXY49N/U6Clvjpj u3eSan7upX8/ZbY2NLvQRRoNd5VJjKleURObO+C4H7+fhRMf/ZQSYtwOpwTOOU3kRate3x ucGXt27rfPSRgb0BMfqcyOFc93Tuv57g+b4XGqQMl3ak6+zFxamyIVEcoDYo2HVqiHOanS mTWPs1MKIKN3DDV5uHX93vLgvK1EBCmqIs+zg9VvpbXubcL8RwIU4wjO8Wf0zzPPPVLO9N /TMtqQ2rptF+9anDyJEtx/oSdBxu9nV2K8RjhmNdGHIa83ef+MEZXcS0OC9Rew== 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 4NMBTM66v0zS9F; Tue, 29 Nov 2022 18:59:19 +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 2ATIxJo5056216; Tue, 29 Nov 2022 18:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATIxJiX056215; Tue, 29 Nov 2022 18:59:19 GMT (envelope-from git) Date: Tue, 29 Nov 2022 18:59:19 GMT Message-Id: <202211291859.2ATIxJiX056215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 2e6e9154138a - main - editors/mined: update to 2022.26 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e6e9154138a18800e156b11fca9d3c789abc005 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e6e9154138a18800e156b11fca9d3c789abc005 commit 2e6e9154138a18800e156b11fca9d3c789abc005 Author: Thierry Thomas AuthorDate: 2022-11-25 15:17:06 +0000 Commit: Thierry Thomas CommitDate: 2022-11-29 18:57:51 +0000 editors/mined: update to 2022.26 Changelog at . --- editors/mined/Makefile | 35 +++++++++++++------------ editors/mined/distinfo | 5 ++-- editors/mined/files/patch-makefile | 11 -------- editors/mined/files/patch-src__mkinclud.mak | 40 +++++++++++++++++++++++++---- editors/mined/pkg-descr | 2 ++ editors/mined/pkg-plist | 8 ------ 6 files changed, 59 insertions(+), 42 deletions(-) diff --git a/editors/mined/Makefile b/editors/mined/Makefile index 507d7794e313..cbca468dcbff 100644 --- a/editors/mined/Makefile +++ b/editors/mined/Makefile @@ -1,5 +1,5 @@ PORTNAME= mined -PORTVERSION= 2015.25 +PORTVERSION= 2022.26 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} @@ -9,42 +9,45 @@ WWW= http://towo.net/mined/ LICENSE= GPLv3 -OPTIONS_DEFINE= DOCS - -PORTDOCS= * +BUILD_DEPENDS= ${NONEXISTENT}:textproc/UCD:fetch USES= desktop-file-utils gmake ncurses +BINARY_ALIAS= make=${GMAKE} +HAS_CONFIGURE= yes MAKEFILE= makefile REINPLACE_ARGS= -i "" MAKE_ARGS= GMAKE="${MAKE_CMD}" CC="${CC}" OPT="${CFLAGS}" INSTALL_TARGET= localinstall MAKE_JOBS_UNSAFE= yes +UCD_VER= 15.0.0 +UCD_DISTDIR= ${DISTDIR}/unicode-UCD/${UCD_VER} + +OPTIONS_DEFINE= DOCS +PORTDOCS= * + PRFX2FIX= src/makefile.bsd usrshare/conf_user/xinitrc.mined \ src/minedaux.c man/mined.1 src/mkinclud.mak \ src/makefile.gcc +post-extract: + ${CP} -p ${UCD_DISTDIR}/UCD.zip ${UCD_DISTDIR}/Unihan.zip ${WRKSRC}/src + pre-configure: .for FILE in ${PRFX2FIX} ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/${FILE} .endfor -pre-build: - ${MV} ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.cc.bak - ${CP} ${WRKSRC}/src/mkinclud.gcc ${WRKSRC}/src/mkinclud.cc - (if [ ! -f ${WRKSRC}/src/mkinclud.${CC:T} ] ; then \ - ${LN} -sf ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.${CC:T} ; \ - fi) - post-install: ${INSTALL_DATA} ${WRKSRC}/usrshare/setup_install/mined.desktop \ ${STAGEDIR}${DESKTOPDIR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mined +.for d in cyg win + ${RM} -r ${STAGEDIR}${DATADIR}/setup_install/${d} +.endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/usrshare/package_doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR} - ${RM} -r ${STAGEDIR}${DATADIR}/setup_install/cyg - @${RM} -r ${STAGEDIR}${DOCSDIR}/CHANGES ${STAGEDIR}${DOCSDIR}/LICENCE.GPL - @${RM} -r ${STAGEDIR}${DATADIR}/doc_user ${STAGEDIR}${DATADIR}/package_doc +.for d in doc_user package_doc + ${MV} ${STAGEDIR}${DATADIR}/${d} ${STAGEDIR}${DOCSDIR} +.endfor .include diff --git a/editors/mined/distinfo b/editors/mined/distinfo index 848c7c46d0e8..d8cebbb5801b 100644 --- a/editors/mined/distinfo +++ b/editors/mined/distinfo @@ -1,2 +1,3 @@ -SHA256 (mined-2015.25.tar.gz) = 51bca986a9fe49bbce1e41e77dd48591dc775ed93f76f97702a3a73b7ffa67e6 -SIZE (mined-2015.25.tar.gz) = 6919430 +TIMESTAMP = 1669388892 +SHA256 (mined-2022.26.tar.gz) = e6632e6432467f256f304bf702a814c46203f006c2df03b5c60503395af35c2a +SIZE (mined-2022.26.tar.gz) = 7356536 diff --git a/editors/mined/files/patch-makefile b/editors/mined/files/patch-makefile deleted file mode 100644 index e3e68d12e8ff..000000000000 --- a/editors/mined/files/patch-makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- makefile.orig 2015-03-23 23:00:00 UTC -+++ makefile -@@ -30,7 +30,7 @@ clean: - sh ./makemined clean - - manual: -- cd man; make -+ cd man && $(MAKE) - - VER=$(shell sed -e 's,^[^0-9]*,,' -e 's,[^0-9][^0-9]*,.,g' -e q VERSION ) - UNIVER=$(shell sed -e '/^\# Blocks-/ b ver' -e d -e ': ver' -e 's,^[^0-9]*\([0-9].*[0-9]\).*,\1,g' -e 's,\.0$$,,' src/Blocks.txt ) diff --git a/editors/mined/files/patch-src__mkinclud.mak b/editors/mined/files/patch-src__mkinclud.mak index 6a0807b028c9..5602f280f723 100644 --- a/editors/mined/files/patch-src__mkinclud.mak +++ b/editors/mined/files/patch-src__mkinclud.mak @@ -1,6 +1,36 @@ ---- ./src/mkinclud.mak.orig 2011-11-15 00:00:00.000000000 +0100 -+++ ./src/mkinclud.mak 2011-11-20 19:28:39.000000000 +0100 -@@ -566,7 +566,7 @@ +--- src/mkinclud.mak.orig 2022-11-13 17:48:52 UTC ++++ src/mkinclud.mak +@@ -63,9 +63,6 @@ DOC=../usrshare/doc_user + # Unicode data tables: + + # With Unicode 7.0, there is no UCD.zip anymore, so downloaded separately +-UCD.zip: +- echo Trying to retrieve Unicode data file via Internet +- $(WGET) http://unicode.org/Public/UNIDATA/UCD.zip + UnicodeData.txt: UCD.zip + unzip -o UCD $@; touch -r UCD.zip $@ + Scripts.txt: UCD.zip +@@ -86,15 +83,15 @@ DerivedBidiClass.txt: UCD.zip + unzip -o -j UCD extracted/$@; touch -r UCD.zip $@ + + %.txt: +- $(WGET) http://unicode.org/Public/UNIDATA/$@ ++ #$(WGET) http://unicode.org/Public/UNIDATA/$@ + +-Unihan.zip: ++Unihan.zip_without_wget: + echo Trying to retrieve Unicode data file via Internet + $(WGET) http://unicode.org/Public/UNIDATA/Unihan.zip + + BIG5.TXT: +- echo Trying to retrieve Unicode data file via Internet +- $(WGET) http://unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT ++ #echo Trying to retrieve Unicode data file via Internet ++ #$(WGET) http://unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT + + check_ccc: + grep "^ccc; *230;.*; *Above$$" PropertyValueAliases.txt +@@ -724,7 +721,7 @@ install: mined help man mkdir -p $(DESTDIR)$(mandir)/man1 $(INSTALL) ../man/*.1 $(DESTDIR)$(mandir)/man1 # zip man if mans are zipped in actual mandir (not DESTDIR) @@ -9,8 +39,8 @@ # ==== install desktop context menu item ("Open With") ( $(rootmenu) && $(rooticon) ) || ( $(usermenu) && $(usericon) ) || echo Could not install desktop menu entry # ==== install system-specific stuff (e.g. wined, README.cygwin) -@@ -587,9 +587,9 @@ - /bin/cp -pr ../usrshare/* $(DESTDIR)$(lrundir) +@@ -746,9 +743,9 @@ localinstall: mined help man + rm -fr $(DESTDIR)$(lrundir)/doc_user/fonts # ==== install manual page mkdir -p $(DESTDIR)$(lmandir)/man1 - $(INSTALL) ../man/*.1 $(DESTDIR)$(lmandir)/man1 diff --git a/editors/mined/pkg-descr b/editors/mined/pkg-descr index 14a02fd7a601..31d25dd25329 100644 --- a/editors/mined/pkg-descr +++ b/editors/mined/pkg-descr @@ -6,3 +6,5 @@ detection features and automatic handling of terminal variations). And basically, it is an editor tailored to efficient editing of plain text documents and programs, with features and interactive behaviour designed for this purpose. + +See also . diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist index 9189ef47bf51..2c8094cd6f82 100644 --- a/editors/mined/pkg-plist +++ b/editors/mined/pkg-plist @@ -39,12 +39,4 @@ share/applications/mined.desktop %%DATADIR%%/setup_install/mined.ico %%DATADIR%%/setup_install/mined.png %%DATADIR%%/setup_install/mined.xpm -%%DATADIR%%/setup_install/win/MinEd Web Manual.url -%%DATADIR%%/setup_install/win/MinEd-AD.lnk -%%DATADIR%%/setup_install/win/MinEd-PF.lnk -%%DATADIR%%/setup_install/win/Uninst-AD.lnk -%%DATADIR%%/setup_install/win/Uninst-PF.lnk -%%DATADIR%%/setup_install/win/deleteall.bat -%%DATADIR%%/setup_install/win/install.sh -%%DATADIR%%/setup_install/win/uninstall.sh share/pixmaps/mined.xpm