- Update to 2000.16

	Changelog at <http://towo.net/mined/changes.html#2000.16>

- Remove dep on bash

- Add license

PR:		ports/148596
Submitted by:	Bapt <baptiste.daroussin (at) gmail.com>

4 files changed, 31 insertions, 17 deletions

diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index 422b633ff5e7..527b83c56a60 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	mined
-PORTVERSION=	2000.15.4
+PORTVERSION=	2000.16
 CATEGORIES=	editors
-MASTER_SITES=	http://towo.net/mined/
+MASTER_SITES=	http://towo.net/mined/download/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Text mode editor with Unicode support
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/usrshare/package_doc/LICENSE.GNU
 
 .if defined(NOPORTDOCS)
 ALL_TARGET=	mined manual
@@ -23,7 +24,7 @@ PORTDOCS=	*
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile
-MAKE_SHELL=	${LOCALBASE}/bin/bash	# To avoid "shift: can't shift that many"
+#MAKE_SHELL=	${LOCALBASE}/bin/bash	# To avoid "shift: can't shift that many"
 REINPLACE_ARGS=	-i ""
 MAKE_ARGS=	GMAKE=${GMAKE} CC=${CC:T} OPT="${CFLAGS}"
 INSTALL_TARGET=	localinstall
@@ -33,7 +34,7 @@ NO_MANCOMPRESS=	yes
 MAN1=		mined.1 minmacs.1 mpico.1 mstar.1 umined.1 uterm.1 xmined.1
 
 PRFX2FIX=	src/makefile.bsd usrshare/conf_user/xinitrc.mined	\
-		src/makefile.curses src/mined1.c man/mined.1		\
+		src/mined1.c man/mined.1		\
 		usrshare/setup_install/mined.desktop src/makefile.gcc
 
 pre-configure:
diff --git a/editors/mined/distinfo b/editors/mined/distinfo
index 62e6a0d499d3..632a10a5ead8 100644
--- a/editors/mined/distinfo
+++ b/editors/mined/distinfo
@@ -1,3 +1,3 @@
-MD5 (mined-2000.15.4.tar.gz) = 89f516cb9972153d6ee3e9000e886ef8
-SHA256 (mined-2000.15.4.tar.gz) = 3ad8ff9e4e1f86b69667f9c564eda1a431c22e67695e07b9d6838f661fb6d7fe
-SIZE (mined-2000.15.4.tar.gz) = 4250566
+MD5 (mined-2000.16.tar.gz) = 9252cbc72cd99f78b3b48e5ccb6c54ea
+SHA256 (mined-2000.16.tar.gz) = 89dcf40367d742b749b093813e7c7ef62e043d7048a60cf6e1c4bc1d693e9b18
+SIZE (mined-2000.16.tar.gz) = 4343928
diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src::mkinclud.mak
index cd2b0c843eda..4086a8de821d 100644
--- a/editors/mined/files/patch-src::mkinclud.mak
+++ b/editors/mined/files/patch-src::mkinclud.mak
@@ -1,12 +1,13 @@
---- src/mkinclud.mak.orig	Mon Oct  9 18:00:00 2006
-+++ src/mkinclud.mak	Sat Oct 21 13:51:41 2006
-@@ -469,8 +469,7 @@
- 	mkdir -p $(lrundir)
- 	/bin/cp -pr ../usrshare/*/ $(lrundir)
- 	mkdir -p $(lmandir)/man1
--	$(INSTALL) ../man/*.1 $(lmandir)/man1
--	if (ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(lmandir)/man1/mined.1; fi
-+	$(BSD_INSTALL_MAN) ../man/*.1 $(lmandir)/man1
+--- ./src/mkinclud.mak.orig	2010-02-22 00:00:00.000000000 +0100
++++ ./src/mkinclud.mak	2010-07-14 11:58:28.209069303 +0200
+@@ -538,9 +538,8 @@
+ 	mkdir -p $(DESTDIR)$(lrundir)
+ 	/bin/cp -pr ../usrshare/*/ $(DESTDIR)$(lrundir)
+ 	mkdir -p $(DESTDIR)$(lmandir)/man1
+-	$(INSTALL) ../man/*.1 $(DESTDIR)$(lmandir)/man1
++	$(BSD_INSTALL_MAN) ../man/*.1 $(DESTDIR)$(lmandir)/man1
+ 	# zip man if mans are zipped in actual mandir (not DESTDIR)
+-	if (ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(DESTDIR)$(lmandir)/man1/mined.1; fi
  	$(extrainstall)
  
  # /opt installation:
diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist
index b7a64d92c358..d256e4406fa4 100644
--- a/editors/mined/pkg-plist
+++ b/editors/mined/pkg-plist
@@ -17,6 +17,8 @@ share/applications/mined.desktop
 %%DATADIR%%/bin/makeprint
 %%DATADIR%%/bin/mkicon
 %%DATADIR%%/bin/postinstall
+%%DATADIR%%/bin/preremove
+%%DATADIR%%/bin/setupreg.sh
 %%DATADIR%%/cancel.html
 %%DATADIR%%/changes.html
 %%DATADIR%%/combined.png
@@ -35,6 +37,7 @@ share/applications/mined.desktop
 %%DATADIR%%/header.html
 %%DATADIR%%/index-dl.html
 %%DATADIR%%/index.html
+%%DATADIR%%/keyboard.html
 %%DATADIR%%/konsole/xterm-modified.keytab
 %%DATADIR%%/kp5
 %%DATADIR%%/logo.gif
@@ -42,6 +45,7 @@ share/applications/mined.desktop
 %%DATADIR%%/minedfav.ico
 %%DATADIR%%/menu.png
 %%DATADIR%%/mined-html.png
+%%DATADIR%%/mined-mintty.png
 %%DATADIR%%/mined-pw.png
 %%DATADIR%%/mined-sep.png
 %%DATADIR%%/mined-small-10x20.png
@@ -81,6 +85,10 @@ share/applications/mined.desktop
 %%DATADIR%%/script-hiragana.gif
 %%DATADIR%%/script-thai.gif
 %%DATADIR%%/separated.png
+%%DATADIR%%/setupreg.sh
+%%DATADIR%%/setupreg.bat
+%%DATADIR%%/soft82_award_130x130.gif
+%%DATADIR%%/rectangular.png
 %%DATADIR%%/terminator/options
 %%DATADIR%%/thankyou.html
 %%DATADIR%%/umined
@@ -89,10 +97,14 @@ share/applications/mined.desktop
 %%DATADIR%%/uprint
 %%DATADIR%%/uterm
 %%DATADIR%%/uterm.html
+%%DATADIR%%/win/setup.b~
+%%DATADIR%%/win/install.bat
+%%DATADIR%%/win/uninst.b~
 %%DATADIR%%/wined
 %%DATADIR%%/wined.bat
 %%DATADIR%%/xinitrc.mined
 %%DATADIR%%/xmined
+@dirrm %%DATADIR%%/win
 @dirrm %%DATADIR%%/terminator
 @dirrm %%DATADIR%%/mlterm
 @dirrm %%DATADIR%%/konsole