- Upgrade to 2011.19.2;

- Change license to GPLv3.

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

Feature safe:	yes
This commit is contained in:
Thierry Thomas 2011-11-20 22:06:59 +00:00
parent 6919bef6ca
commit 96aa2a8ca4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=286134
6 changed files with 82 additions and 137 deletions

View file

@ -6,15 +6,15 @@
# #
PORTNAME= mined PORTNAME= mined
PORTVERSION= 2011.17 PORTVERSION= 2011.19.2
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= http://towo.net/mined/download/ MASTER_SITES= http://towo.net/mined/download/
MAINTAINER= thierry@FreeBSD.org MAINTAINER= thierry@FreeBSD.org
COMMENT= Text mode editor with Unicode support COMMENT= Text mode editor with Unicode support
LICENSE= GPLv2 LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/usrshare/package_doc/LICENSE.GNU LICENSE_FILE= ${WRKSRC}/LICENCE.GPL
.if defined(NOPORTDOCS) .if defined(NOPORTDOCS)
ALL_TARGET= mined manual ALL_TARGET= mined manual
@ -29,7 +29,6 @@ MAKE_ARGS= GMAKE=${GMAKE} CC=${CC:T} OPT="${CFLAGS}"
INSTALL_TARGET= localinstall INSTALL_TARGET= localinstall
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes
NO_MANCOMPRESS= yes
MAN1= mined.1 minmacs.1 mpico.1 mstar.1 umined.1 uterm.1 xmined.1 MAN1= mined.1 minmacs.1 mpico.1 mstar.1 umined.1 uterm.1 xmined.1
PRFX2FIX= src/makefile.bsd usrshare/conf_user/xinitrc.mined \ PRFX2FIX= src/makefile.bsd usrshare/conf_user/xinitrc.mined \
@ -56,7 +55,7 @@ post-install:
${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR}
cd ${WRKSRC}/usrshare/package_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 .endif
# @${RM} ${DATADIR}/bin/*.bat # @${RM} ${DATADIR}/bin/*.bat
@${RM} -rf ${DATADIR}/doc_user ${DATADIR}/package_doc @${RM} -rf ${DATADIR}/doc_user ${DATADIR}/package_doc

View file

@ -1,2 +1,2 @@
SHA256 (mined-2011.17.tar.gz) = 34a1d21666e31cbefb9c59e884081adc4e777f8abc169012c662ec4ea2dc74c9 SHA256 (mined-2011.19.2.tar.gz) = 623a8f990e7543ee623892b7ac4fff26771098eb0149e29623a9121f16932664
SIZE (mined-2011.17.tar.gz) = 4797229 SIZE (mined-2011.19.2.tar.gz) = 5917678

View file

@ -1,5 +1,5 @@
--- src/makefile.bsd.orig Thu Apr 28 00:00:00 2005 --- src/makefile.bsd.orig 2011-10-20 00:00:00.000000000 +0200
+++ src/makefile.bsd Wed Aug 3 18:50:24 2005 +++ src/makefile.bsd 2011-11-20 18:42:22.000000000 +0100
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
rundir = $(prefix)/share/mined rundir = $(prefix)/share/mined
@ -16,14 +16,14 @@
-#ldocdir = $(lprefix)/share/doc/mined -#ldocdir = $(lprefix)/share/doc/mined
+ldocdir = $(lprefix)/share/doc/mined +ldocdir = $(lprefix)/share/doc/mined
INSTALL = install #INSTALL = install --mode=+r,u+w
#INSTALL = /bin/cp -p INSTALL = install -m 644
@@ -108,7 +108,7 @@ @@ -112,7 +112,7 @@
# compiler selection and compiler-specific options # compiler selection and compiler-specific options
# (source warnings, optimisation and debug) # (source warnings, optimisation and debug)
-CC=gcc -CC=gcc
+#CC=gcc +#CC=gcc
include mkinclud.$(CC) # avoid problems with non-GNU make
include mkinclud.cc

View file

@ -1,11 +1,11 @@
--- src/mkinclud.gcc.orig Wed Jan 5 13:34:24 2005 --- src/mkinclud.gcc.orig 2011-07-20 00:00:00.000000000 +0200
+++ src/mkinclud.gcc Sat Feb 5 22:14:23 2005 +++ src/mkinclud.gcc 2011-11-20 18:44:14.000000000 +0100
@@ -40,7 +40,7 @@ @@ -48,7 +48,7 @@
# compilation mode options (optimisation and debug) # compilation mode options (optimisation and debug)
# Optimization flag/level: # Optimization flag/level:
-OPT = -O2 -OPT= -O2
+#OPT = -O2 +#OPT= -O2
# Debugging option # Debugging option
DEBUG = # -ggdb -gstabs DEBUG= # -ggdb -gstabs

View file

@ -1,13 +1,23 @@
--- ./src/mkinclud.mak.orig 2010-02-22 00:00:00.000000000 +0100 --- ./src/mkinclud.mak.orig 2011-11-15 00:00:00.000000000 +0100
+++ ./src/mkinclud.mak 2010-07-14 11:58:28.209069303 +0200 +++ ./src/mkinclud.mak 2011-11-20 19:28:39.000000000 +0100
@@ -538,9 +538,8 @@ @@ -566,7 +566,7 @@
mkdir -p $(DESTDIR)$(lrundir) mkdir -p $(DESTDIR)$(mandir)/man1
/bin/cp -pr ../usrshare/*/ $(DESTDIR)$(lrundir) $(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 mkdir -p $(DESTDIR)$(lmandir)/man1
- $(INSTALL) ../man/*.1 $(DESTDIR)$(lmandir)/man1 - $(INSTALL) ../man/*.1 $(DESTDIR)$(lmandir)/man1
+ $(BSD_INSTALL_MAN) ../man/*.1 $(DESTDIR)$(lmandir)/man1 + $(BSD_INSTALL_MAN) ../man/*.1 $(DESTDIR)$(lmandir)/man1
# zip man if mans are zipped in actual mandir (not DESTDIR) # 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 - if (ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1; then gzip -f $(DESTDIR)$(lmandir)/man1/mined.1; fi
$(extrainstall) + #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")
# /opt installation: ( $(localmenu) && $(localicon) ) || ( $(usermenu) && $(usericon) ) || echo Could not install desktop menu entry
# ==== install system-specific stuff (e.g. wined, README.cygwin)

View file

@ -6,115 +6,51 @@ bin/umined
bin/uterm bin/uterm
bin/xmined bin/xmined
share/applications/mined.desktop share/applications/mined.desktop
%%DATADIR%%/CHANGES %%DATADIR%%/bin/mterm
%%DATADIR%%/LICENSE.GNU %%DATADIR%%/bin/umined
%%DATADIR%%/README %%DATADIR%%/bin/uprint
%%DATADIR%%/VERSION %%DATADIR%%/bin/uterm
%%DATADIR%%/Xdefaults.mined %%DATADIR%%/bin/wined
%%DATADIR%%/bin/bdf18to20 %%DATADIR%%/bin/wined.bat
%%DATADIR%%/bin/configure-xterm %%DATADIR%%/bin/xmined
%%DATADIR%%/bin/installfonts %%DATADIR%%/conf_user/Xdefaults.mined
%%DATADIR%%/bin/makeprint %%DATADIR%%/conf_user/konsole/xterm-modified.keytab
%%DATADIR%%/bin/mkicon %%DATADIR%%/conf_user/kp5
%%DATADIR%%/bin/postinstall %%DATADIR%%/conf_user/mlterm/key
%%DATADIR%%/bin/preremove %%DATADIR%%/conf_user/mlterm/main
%%DATADIR%%/bin/setupreg.sh %%DATADIR%%/conf_user/profile.mined
%%DATADIR%%/cancel.html %%DATADIR%%/conf_user/terminator/options
%%DATADIR%%/changes.html %%DATADIR%%/conf_user/xinitrc.mined
%%DATADIR%%/combined.png %%DATADIR%%/help/mined.hlp
%%DATADIR%%/combining.png %%DATADIR%%/setup_install/bin/bdf18to20
%%DATADIR%%/contact.html %%DATADIR%%/setup_install/bin/configure-xterm
%%DATADIR%%/design.html %%DATADIR%%/setup_install/bin/installfonts
%%DATADIR%%/dollar.gif %%DATADIR%%/setup_install/bin/makeprint
%%DATADIR%%/donate.html %%DATADIR%%/setup_install/bin/mkicon
%%DATADIR%%/download.html %%DATADIR%%/setup_install/bin/postinstall
%%DATADIR%%/euro1.gif %%DATADIR%%/setup_install/bin/preremove
%%DATADIR%%/features.html %%DATADIR%%/setup_install/bin/setupreg.sh
%%DATADIR%%/handr.gif %%DATADIR%%/setup_install/mined.desktop
%%DATADIR%%/haninfo-big5.png %%DATADIR%%/setup_install/mined.ico
%%DATADIR%%/haninfo-menu.png %%DATADIR%%/setup_install/mined.png
%%DATADIR%%/haninfo-utf8.png %%DATADIR%%/setup_install/mined.xpm
%%DATADIR%%/header.html %%DATADIR%%/setup_install/win/MinEd Web Manual.url
%%DATADIR%%/index-dl.html %%DATADIR%%/setup_install/win/MinEd-AD.lnk
%%DATADIR%%/index.html %%DATADIR%%/setup_install/win/MinEd-PF.lnk
%%DATADIR%%/keyboard.html %%DATADIR%%/setup_install/win/Uninst-AD.lnk
%%DATADIR%%/konsole/xterm-modified.keytab %%DATADIR%%/setup_install/win/Uninst-PF.lnk
%%DATADIR%%/kp5 %%DATADIR%%/setup_install/win/deleteall.bat
%%DATADIR%%/logo.gif %%DATADIR%%/setup_install/win/install.sh
%%DATADIR%%/m.ico %%DATADIR%%/setup_install/win/uninstall.sh
%%DATADIR%%/minedfav.ico share/pixmaps/mined.xpm
%%DATADIR%%/menu.png @dirrm %%DATADIR%%/setup_install/win
%%DATADIR%%/mined-html.png @dirrm %%DATADIR%%/setup_install/bin
%%DATADIR%%/mined-mintty.png @dirrm %%DATADIR%%/setup_install
%%DATADIR%%/mined-pw.png @dirrm %%DATADIR%%/help
%%DATADIR%%/mined-sep.png @dirrm %%DATADIR%%/conf_user/terminator
%%DATADIR%%/mined-small-10x20.png @dirrm %%DATADIR%%/conf_user/mlterm
%%DATADIR%%/mined-small-haninfo.png @dirrm %%DATADIR%%/conf_user/konsole
%%DATADIR%%/mined-small-html.png @dirrm %%DATADIR%%/conf_user
%%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
@dirrm %%DATADIR%%/bin @dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%% @dirrm %%DATADIR%%
@dirrmtry share/applications @dirrmtry share/applications