Upgrade to 2000.10.

8 files changed, 83 insertions, 53 deletions

diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index 3ddd14474f5f..136a2549a12e 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mined
-PORTVERSION=	2000.9
+PORTVERSION=	2000.10
 CATEGORIES=	editors
 MASTER_SITES=	http://towo.net/mined/
 
@@ -18,35 +18,37 @@ MAKEFILE=	makefile
 .if defined(NOPORTDOCS)
 ALL_TARGET=	mined manual
 .else
-PORTDOCS=	cancel.html changes.html contact.html dollar.gif donate.html	\
-		download.html euro1.gif features.html handr.gif header.html	\
-		index-dl.html index.html logo.gif mined-small.gif mined.gif	\
-		mined.html mined.lsm mined.uni.gif mnemodoc.html navigate.html	\
-		new-rot.gif new.gif overview.html paypal_donate.gif		\
-		paypal_logo.gif paypal_payments.gif script-arabic.gif		\
-		script-cyrillic.gif script-greek.gif script-han.gif		\
-		script-hebrew.gif script-hiragana.gif script-thai.gif		\
-		thankyou.html unicode.html
-EXAMPLES=	configure-xterm mterm uterm
+PORTDOCS=	cancel.html changes.html combined.png combining.png contact.html	\
+		design.html dollar.gif donate.html download.html euro1.gif features.html\
+		handr.gif haninfo-big5.png haninfo-menu.png haninfo-utf8.png header.html\
+		index-dl.html index.html logo.gif menu.png mined-html.png mined-uni.png	\
+		mined.html mnemodoc.html navigate.html new-rot.gif new.gif overview.html\
+		paypal_donate.gif paypal_logo.gif paypal_payments.gif picklist.png	\
+		script-arabic.gif script-cyrillic.gif script-greek.gif script-han.gif	\
+		script-hebrew.gif script-highlighting.png script-hiragana.gif		\
+		script-thai.gif	separated.png thankyou.html unicode.html
 .endif
 
 USE_GMAKE=	YES
-MAKE_ARGS=	GMAKE=${GMAKE} CC=${CC:T}
+MAKE_ARGS=	GMAKE=${GMAKE} CC=${CC:T} OPT="${CFLAGS}"
+INSTALL_TARGET=	localinstall
 
 MAN1=		mined.1
 
 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)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Warning: conversion of all keyboard mapping tables may take a long time!"
+	@${ECHO_MSG}
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/mined
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${EXAMPLES:S|^|${WRKSRC}/doc/|} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/mined/distinfo b/editors/mined/distinfo
index 18e1281799b6..29c88fe41cd3 100644
--- a/editors/mined/distinfo
+++ b/editors/mined/distinfo
@@ -1,2 +1,2 @@
-MD5 (mined-2000.9.tar.gz) = 5b0e682a9ff2c10c19197bad921e23f0
-SIZE (mined-2000.9.tar.gz) = 1922021
+MD5 (mined-2000.10.tar.gz) = 6506ada0624f040e92796a256fc746fc
+SIZE (mined-2000.10.tar.gz) = 3116348
diff --git a/editors/mined/files/patch-makemined b/editors/mined/files/patch-makemined
index 0aba18fa8f32..da41bbe6c11c 100644
--- a/editors/mined/files/patch-makemined
+++ b/editors/mined/files/patch-makemined
@@ -1,11 +1,11 @@
---- makemined.orig	Wed Apr 23 17:16:42 2003
-+++ makemined	Sat Dec 25 10:55:07 2004
-@@ -5,7 +5,7 @@
- Linux*)	make -f makefile.linux $1;;
- Sun*)	make -f makefile.sun $1;;
+--- makemined.orig	Wed Dec  8 11:19:18 2004
++++ makemined	Sat Feb  5 17:59:45 2005
+@@ -34,7 +34,7 @@
+ 	else	make -f makefile.gcc $1
+ 	fi;;
  HP*)	make -f makefile.hp $1;;
--*BSD*)	make -f makefile.bsd $1;;
+-*BSD*)	gmake -f makefile.bsd $1;;
 +*BSD*)	${GMAKE} -f makefile.bsd $1;;
- CYG*)	make -f makefile.cygwin $1;;
- Darwin*) make -f makefile.osx $1;;
- esac
+ CYG*)	INSTALLTARGET=installcygwin make -f makefile.cygwin $1;;
+ Darwin*)
+ 	if type gcc > /dev/null 2> /dev/null
diff --git a/editors/mined/files/patch-src::makefile.bsd b/editors/mined/files/patch-src::makefile.bsd
index 39b004fda12f..5fb52d7b746b 100644
--- a/editors/mined/files/patch-src::makefile.bsd
+++ b/editors/mined/files/patch-src::makefile.bsd
@@ -1,15 +1,15 @@
---- ./src/makefile.bsd.orig	Fri Mar 14 12:25:01 2003
-+++ ./src/makefile.bsd	Sat Dec 25 12:33:55 2004
-@@ -6,7 +6,7 @@
- # Where and how to install
- prefix	= $(PREFIX)
- bindir	= $(prefix)/bin
--helpdir	= $(prefix)/share/help
-+helpdir	= $(prefix)/share/doc/mined/help
- mandir	= $(prefix)/man
+--- ./src/makefile.bsd.orig	Sun Oct 31 07:34:57 2004
++++ ./src/makefile.bsd	Sat Feb  5 18:04:40 2005
+@@ -16,7 +16,7 @@
+ # directories for target "make localinstall"
+ lprefix	= $(root)/usr/local
+ lbindir	= $(lprefix)/bin
+-lhlpdir	= $(lprefix)/share/mined
++lhlpdir	= $(lprefix)/share/doc/mined/help
+ lmandir	= $(lprefix)/man
+ 
  INSTALL = install
- #INSTALL = /bin/cp -p
-@@ -54,7 +54,7 @@
+@@ -87,7 +87,7 @@
  # link options
  
  # link dynamically
@@ -18,7 +18,7 @@
  GLDOPTS=	# -static links statically
  
  
-@@ -62,7 +62,7 @@
+@@ -95,7 +95,7 @@
  # compiler selection and compiler-specific options
  # (source warnings, optimisation and debug)
  
diff --git a/editors/mined/files/patch-src::mkinclud.cc b/editors/mined/files/patch-src::mkinclud.cc
deleted file mode 100644
index 26088f9ea120..000000000000
--- a/editors/mined/files/patch-src::mkinclud.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mkinclud.cc.orig	Mon Apr  9 19:43:04 2001
-+++ src/mkinclud.cc	Sat Dec 25 12:25:56 2004
-@@ -25,7 +25,7 @@
- # compilation setup
- 
- # Collection of compilation parameters:
--CFLAGS	= $(SYSFLAGS) $(OPT) $(DEBUG)
-+CFLAGS+= $(SYSFLAGS) $(DEBUG)
- 
- 
- #############################################################################
diff --git a/editors/mined/files/patch-src::mkinclud.gcc b/editors/mined/files/patch-src::mkinclud.gcc
new file mode 100644
index 000000000000..6c92c9d7225e
--- /dev/null
+++ b/editors/mined/files/patch-src::mkinclud.gcc
@@ -0,0 +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 @@
+ # compilation mode options (optimisation and debug)
+ 
+ # Optimization flag/level:
+-OPT	= -O2
++#OPT	= -O2
+ 
+ # Debugging option
+ DEBUG	= # -ggdb -gstabs
diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src::mkinclud.mak
new file mode 100644
index 000000000000..266633424b4a
--- /dev/null
+++ b/editors/mined/files/patch-src::mkinclud.mak
@@ -0,0 +1,12 @@
+--- ./src/mkinclud.mak.orig	Thu Jan 27 15:08:56 2005
++++ ./src/mkinclud.mak	Sat Feb  5 22:41:41 2005
+@@ -307,8 +307,7 @@
+ 	mkdir -p $(lhlpdir)
+ 	$(INSTALL) ../usrshare/* $(lhlpdir)
+ 	mkdir -p $(lmandir)/man1
+-	$(INSTALL) --mode=+r,u+w ../man/mined.1 $(lmandir)/man1
+-	(ls $(lmandir)/man1/*.gz && type gzip) > /dev/null 2>&1 && gzip -f $(lmandir)/man1/mined.1
++	$(BSD_INSTALL_MAN) ../man/mined.1 $(lmandir)/man1
+ 
+ # /opt installation:
+ optinstall:	mined help man ${INSTALLTARGET}
diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist
index cc6205c2cecb..442592294b1d 100644
--- a/editors/mined/pkg-plist
+++ b/editors/mined/pkg-plist
@@ -1,7 +1,23 @@
 bin/mined
+%%PORTDOCS%%%%DOCSDIR%%/help/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/help/README
+%%PORTDOCS%%%%DOCSDIR%%/help/Xdefaults.mined
+%%PORTDOCS%%%%DOCSDIR%%/help/bdf18to20
+%%PORTDOCS%%%%DOCSDIR%%/help/bdf18to20.sed
+%%PORTDOCS%%%%DOCSDIR%%/help/configure-xterm
+%%PORTDOCS%%%%DOCSDIR%%/help/lmined
+%%PORTDOCS%%%%DOCSDIR%%/help/makeprint
+%%PORTDOCS%%%%DOCSDIR%%/help/mined.desktop
 %%PORTDOCS%%%%DOCSDIR%%/help/mined.hlp
-%%PORTDOCS%%%%EXAMPLESDIR%%/configure-xterm
-%%PORTDOCS%%%%EXAMPLESDIR%%/mterm
-%%PORTDOCS%%%%EXAMPLESDIR%%/uterm
+%%PORTDOCS%%%%DOCSDIR%%/help/minedmar
+%%PORTDOCS%%%%DOCSDIR%%/help/minedmar.bat
+%%PORTDOCS%%%%DOCSDIR%%/help/mterm
+%%PORTDOCS%%%%DOCSDIR%%/help/profile.mined
+%%PORTDOCS%%%%DOCSDIR%%/help/umined
+%%PORTDOCS%%%%DOCSDIR%%/help/uprint
+%%PORTDOCS%%%%DOCSDIR%%/help/uterm
+%%PORTDOCS%%%%DOCSDIR%%/help/wmined
+%%PORTDOCS%%%%DOCSDIR%%/help/wmined.bat
+%%PORTDOCS%%%%DOCSDIR%%/help/xinitrc.mined
+%%PORTDOCS%%%%DOCSDIR%%/help/xmined
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/help
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%