- Upgrade to 2011.19.2;

- Change license to GPLv3.

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

Feature safe:	yes

6 files changed, 82 insertions, 137 deletions

diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index 24b416c17bc9..cae1aa7c8cb4 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	mined
-PORTVERSION=	2011.17
+PORTVERSION=	2011.19.2
 CATEGORIES=	editors
 MASTER_SITES=	http://towo.net/mined/download/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Text mode editor with Unicode support
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/usrshare/package_doc/LICENSE.GNU
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENCE.GPL
 
 .if defined(NOPORTDOCS)
 ALL_TARGET=	mined manual
@@ -29,7 +29,6 @@ MAKE_ARGS=	GMAKE=${GMAKE} CC=${CC:T} OPT="${CFLAGS}"
 INSTALL_TARGET=	localinstall
 MAKE_JOBS_UNSAFE=	yes
 
-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	\
@@ -56,7 +55,7 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR}
 	cd ${WRKSRC}/usrshare/package_doc && ${INSTALL_DATA} * ${DOCSDIR}
-	@${RM} ${DOCSDIR}/CHANGES ${DOCSDIR}/LICENSE.GNU
+	@${RM} ${DOCSDIR}/CHANGES ${DOCSDIR}/LICENCE.GPL
 .endif
 #	@${RM} ${DATADIR}/bin/*.bat
 	@${RM} -rf ${DATADIR}/doc_user ${DATADIR}/package_doc
diff --git a/editors/mined/distinfo b/editors/mined/distinfo
index 8cf99a6b976a..32b75083e973 100644
--- a/editors/mined/distinfo
+++ b/editors/mined/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mined-2011.17.tar.gz) = 34a1d21666e31cbefb9c59e884081adc4e777f8abc169012c662ec4ea2dc74c9
-SIZE (mined-2011.17.tar.gz) = 4797229
+SHA256 (mined-2011.19.2.tar.gz) = 623a8f990e7543ee623892b7ac4fff26771098eb0149e29623a9121f16932664
+SIZE (mined-2011.19.2.tar.gz) = 5917678
diff --git a/editors/mined/files/patch-src::makefile.bsd b/editors/mined/files/patch-src::makefile.bsd
index b8abf4797c1b..898b249a38db 100644
--- a/editors/mined/files/patch-src::makefile.bsd
+++ b/editors/mined/files/patch-src::makefile.bsd
@@ -1,5 +1,5 @@
---- src/makefile.bsd.orig	Thu Apr 28 00:00:00 2005
-+++ src/makefile.bsd	Wed Aug  3 18:50:24 2005
+--- src/makefile.bsd.orig	2011-10-20 00:00:00.000000000 +0200
++++ src/makefile.bsd	2011-11-20 18:42:22.000000000 +0100
 @@ -20,7 +20,7 @@
  mandir	= $(prefix)/share/man
  rundir	= $(prefix)/share/mined
@@ -16,14 +16,14 @@
 -#ldocdir	= $(lprefix)/share/doc/mined
 +ldocdir	= $(lprefix)/share/doc/mined
  
- INSTALL = install
- #INSTALL = /bin/cp -p
-@@ -108,7 +108,7 @@
+ #INSTALL = install --mode=+r,u+w
+ INSTALL = install -m 644
+@@ -112,7 +112,7 @@
  # compiler selection and compiler-specific options
  # (source warnings, optimisation and debug)
  
 -CC=gcc
 +#CC=gcc
- include mkinclud.$(CC)
- 
+ # avoid problems with non-GNU make
+ include mkinclud.cc
  
diff --git a/editors/mined/files/patch-src::mkinclud.gcc b/editors/mined/files/patch-src::mkinclud.gcc
index 6c92c9d7225e..412568a5e104 100644
--- a/editors/mined/files/patch-src::mkinclud.gcc
+++ b/editors/mined/files/patch-src::mkinclud.gcc
@@ -1,11 +1,11 @@
---- src/mkinclud.gcc.orig	Wed Jan  5 13:34:24 2005
-+++ src/mkinclud.gcc	Sat Feb  5 22:14:23 2005
-@@ -40,7 +40,7 @@
+--- src/mkinclud.gcc.orig	2011-07-20 00:00:00.000000000 +0200
++++ src/mkinclud.gcc	2011-11-20 18:44:14.000000000 +0100
+@@ -48,7 +48,7 @@
  # compilation mode options (optimisation and debug)
  
  # Optimization flag/level:
--OPT	= -O2
-+#OPT	= -O2
+-OPT= -O2
++#OPT= -O2
  
  # Debugging option
- DEBUG	= # -ggdb -gstabs
+ DEBUG= # -ggdb -gstabs
diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src::mkinclud.mak
index 4086a8de821d..6a0807b028c9 100644
--- a/editors/mined/files/patch-src::mkinclud.mak
+++ b/editors/mined/files/patch-src::mkinclud.mak
@@ -1,13 +1,23 @@
---- ./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)
+--- ./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 @@
+ 	mkdir -p $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) ../man/*.1 $(DESTDIR)$(mandir)/man1
+ 	# zip man if mans are zipped in actual mandir (not DESTDIR)
+-	if (ls $(mandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(DESTDIR)$(mandir)/man1/mined.1; fi
++	#if (ls $(mandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(DESTDIR)$(mandir)/man1/mined.1; fi
+ 	# ==== 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)
+ 	# ==== install manual page
  	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:
++	#if (ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(DESTDIR)$(lmandir)/man1/mined.1; fi
+ 	# ==== install desktop context menu item ("Open With")
+ 	( $(localmenu) && $(localicon) ) || ( $(usermenu) && $(usericon) ) || echo Could not install desktop menu entry
+ 	# ==== install system-specific stuff (e.g. wined, README.cygwin)
diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist
index e0d5bd2ca8f2..3180cd67bb01 100644
--- a/editors/mined/pkg-plist
+++ b/editors/mined/pkg-plist
@@ -6,115 +6,51 @@ bin/umined
 bin/uterm
 bin/xmined
 share/applications/mined.desktop
-%%DATADIR%%/CHANGES
-%%DATADIR%%/LICENSE.GNU
-%%DATADIR%%/README
-%%DATADIR%%/VERSION
-%%DATADIR%%/Xdefaults.mined
-%%DATADIR%%/bin/bdf18to20
-%%DATADIR%%/bin/configure-xterm
-%%DATADIR%%/bin/installfonts
-%%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
-%%DATADIR%%/combining.png
-%%DATADIR%%/contact.html
-%%DATADIR%%/design.html
-%%DATADIR%%/dollar.gif
-%%DATADIR%%/donate.html
-%%DATADIR%%/download.html
-%%DATADIR%%/euro1.gif
-%%DATADIR%%/features.html
-%%DATADIR%%/handr.gif
-%%DATADIR%%/haninfo-big5.png
-%%DATADIR%%/haninfo-menu.png
-%%DATADIR%%/haninfo-utf8.png
-%%DATADIR%%/header.html
-%%DATADIR%%/index-dl.html
-%%DATADIR%%/index.html
-%%DATADIR%%/keyboard.html
-%%DATADIR%%/konsole/xterm-modified.keytab
-%%DATADIR%%/kp5
-%%DATADIR%%/logo.gif
-%%DATADIR%%/m.ico
-%%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
-%%DATADIR%%/mined-small-haninfo.png
-%%DATADIR%%/mined-small-html.png
-%%DATADIR%%/mined-small-picklist.png
-%%DATADIR%%/mined-small-pw.png
-%%DATADIR%%/mined-small-sep.png
-%%DATADIR%%/mined-small-uni.png
-%%DATADIR%%/mined-uni.png
-%%DATADIR%%/mined.desktop
-%%DATADIR%%/mined.hlp
-%%DATADIR%%/mined.html
-%%DATADIR%%/mined.ico
-%%DATADIR%%/minedmar
-%%DATADIR%%/minedmar.bat
-%%DATADIR%%/mlterm/key
-%%DATADIR%%/mlterm/main
-%%DATADIR%%/mnemodoc.html
-%%DATADIR%%/mterm
-%%DATADIR%%/navigate.html
-%%DATADIR%%/new-rot.gif
-%%DATADIR%%/new.gif
-%%DATADIR%%/overview.html
-%%DATADIR%%/paypal_donate.gif
-%%DATADIR%%/paypal_logo.gif
-%%DATADIR%%/paypal_payments.gif
-%%DATADIR%%/picklist.png
-%%DATADIR%%/profile.mined
-%%DATADIR%%/screenshots.html
-%%DATADIR%%/script-arabic.gif
-%%DATADIR%%/script-cyrillic.gif
-%%DATADIR%%/script-greek.gif
-%%DATADIR%%/script-han.gif
-%%DATADIR%%/script-hebrew.gif
-%%DATADIR%%/script-highlighting.png
-%%DATADIR%%/script-hiragana.gif
-%%DATADIR%%/script-thai.gif
-%%DATADIR%%/separated.png
-%%DATADIR%%/rectangular.png
-%%DATADIR%%/soft82_award_130x130.gif
-%%DATADIR%%/term-big5-cxterm.png
-%%DATADIR%%/term-cygwin.png
-%%DATADIR%%/term-dos.png
-%%DATADIR%%/term-mintty.png
-%%DATADIR%%/terminator/options
-%%DATADIR%%/thankyou.html
-%%DATADIR%%/umined
-%%DATADIR%%/unicode.html
-%%DATADIR%%/unicode.org.png
-%%DATADIR%%/uprint
-%%DATADIR%%/uterm
-%%DATADIR%%/uterm.html
-%%DATADIR%%/win/deleteMinEd.b
-%%DATADIR%%/win/install.bat
-%%DATADIR%%/win/sed.exe
-%%DATADIR%%/win/setupmenu.b
-%%DATADIR%%/win/setuppath.b
-%%DATADIR%%/win/uninstall.b
-%%DATADIR%%/win/unregmenu.b
-%%DATADIR%%/win/unregpath.b
-%%DATADIR%%/wined
-%%DATADIR%%/wined.bat
-%%DATADIR%%/xinitrc.mined
-%%DATADIR%%/xmined
-@dirrm %%DATADIR%%/win
-@dirrm %%DATADIR%%/terminator
-@dirrm %%DATADIR%%/mlterm
-@dirrm %%DATADIR%%/konsole
+%%DATADIR%%/bin/mterm
+%%DATADIR%%/bin/umined
+%%DATADIR%%/bin/uprint
+%%DATADIR%%/bin/uterm
+%%DATADIR%%/bin/wined
+%%DATADIR%%/bin/wined.bat
+%%DATADIR%%/bin/xmined
+%%DATADIR%%/conf_user/Xdefaults.mined
+%%DATADIR%%/conf_user/konsole/xterm-modified.keytab
+%%DATADIR%%/conf_user/kp5
+%%DATADIR%%/conf_user/mlterm/key
+%%DATADIR%%/conf_user/mlterm/main
+%%DATADIR%%/conf_user/profile.mined
+%%DATADIR%%/conf_user/terminator/options
+%%DATADIR%%/conf_user/xinitrc.mined
+%%DATADIR%%/help/mined.hlp
+%%DATADIR%%/setup_install/bin/bdf18to20
+%%DATADIR%%/setup_install/bin/configure-xterm
+%%DATADIR%%/setup_install/bin/installfonts
+%%DATADIR%%/setup_install/bin/makeprint
+%%DATADIR%%/setup_install/bin/mkicon
+%%DATADIR%%/setup_install/bin/postinstall
+%%DATADIR%%/setup_install/bin/preremove
+%%DATADIR%%/setup_install/bin/setupreg.sh
+%%DATADIR%%/setup_install/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
+@dirrm %%DATADIR%%/setup_install/win
+@dirrm %%DATADIR%%/setup_install/bin
+@dirrm %%DATADIR%%/setup_install
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/conf_user/terminator
+@dirrm %%DATADIR%%/conf_user/mlterm
+@dirrm %%DATADIR%%/conf_user/konsole
+@dirrm %%DATADIR%%/conf_user
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrmtry share/applications