git: 2e6e9154138a - main - editors/mined: update to 2022.26

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Tue, 29 Nov 2022 18:59:19 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2e6e9154138a18800e156b11fca9d3c789abc005

commit 2e6e9154138a18800e156b11fca9d3c789abc005
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-11-25 15:17:06 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-11-29 18:57:51 +0000

    editors/mined: update to 2022.26
    
    Changelog at <http://towo.net/mined/changes.html#2022.26>.
---
 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 <bsd.port.mk>
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 <https://github.com/mined/mined>.
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