Upgrade to 2000.12.

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

4 files changed, 57 insertions, 50 deletions

diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index 5b4a23abedcc..01679927a453 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mined
-PORTVERSION=	2000.11
+PORTVERSION=	2000.12
 CATEGORIES=	editors
 MASTER_SITES=	http://towo.net/mined/
 
@@ -22,15 +22,15 @@ PORTDOCS=	*
 .endif
 
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 MAKE_ARGS=	GMAKE=${GMAKE} CC=${CC:T} OPT="${CFLAGS}"
 INSTALL_TARGET=	localinstall
 
 MAN1=		mined.1
 
-PRFX2FIX=	src/makefile.bsd src/makefile.gcc usrshare/xinitrc.mined	\
-		usrshare/mined.desktop src/mined1.c
+PRFX2FIX=	src/makefile.bsd usrshare/conf_user/xinitrc.mined	\
+		src/makefile.curses src/mined1.c man/mined.1		\
+		usrshare/setup_install/mined.desktop src/makefile.gcc
 
 pre-configure:
 .for FILE in ${PRFX2FIX}
@@ -48,10 +48,15 @@ pre-build:
 	@${ECHO_MSG}
 
 post-install:
-	@${RM} ${DATADIR}/LICENSE.GNU ${DATADIR}/*.bat
+	${INSTALL_DATA} ${WRKSRC}/usrshare/setup_install/mined.desktop	\
+		${DESKTOPDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR}
+	cd ${WRKSRC}/usrshare/package_doc && ${INSTALL_DATA} * ${DOCSDIR}
+	@${RM} ${DOCSDIR}/CHANGES ${DOCSDIR}/LICENSE.GNU
 .endif
+	@${RM} ${DATADIR}/bin/*.bat
+	@${RM} -rf ${DATADIR}/doc_user ${DATADIR}/package_doc
 
 .include <bsd.port.mk>
diff --git a/editors/mined/distinfo b/editors/mined/distinfo
index 9d7f78b85f3a..bac283b0233e 100644
--- a/editors/mined/distinfo
+++ b/editors/mined/distinfo
@@ -1,3 +1,3 @@
-MD5 (mined-2000.11.tar.gz) = 1b257db17852ab189eb08a960b948bad
-SHA256 (mined-2000.11.tar.gz) = 40d99c2591a5efb80a7c6d7aac9b150b342d8c95fcb261717303b7e6cafd612e
-SIZE (mined-2000.11.tar.gz) = 3218977
+MD5 (mined-2000.12.tar.gz) = 2a39f04e7028ed841568df6dfa3d9f23
+SHA256 (mined-2000.12.tar.gz) = 44bb98263cde909b6196c64d89680d8971e81656c37745f1703cad9402b4d265
+SIZE (mined-2000.12.tar.gz) = 3324734
diff --git a/editors/mined/files/patch-src::mkinclud.mak b/editors/mined/files/patch-src::mkinclud.mak
index abb707a017e3..57c4a4592791 100644
--- a/editors/mined/files/patch-src::mkinclud.mak
+++ b/editors/mined/files/patch-src::mkinclud.mak
@@ -1,30 +1,21 @@
---- src/mkinclud.mak.orig	Thu Jun 23 00:00:00 2005
-+++ src/mkinclud.mak	Wed Aug  3 18:25:22 2005
-@@ -226,7 +226,7 @@
- # generate makefile to deal with variable list of targets,
- # invoke it to generate and compile character mapping tables:
- mkcharmaps:
--	CC=$(CC) OPT=$(OPT) ./mkmakchr > charmaps/makefile
-+	CC=$(CC) OPT="$(OPT)" ./mkmakchr > charmaps/makefile
- 	$(MAKE) -f charmaps/makefile
+--- src/mkinclud.mak.orig	Wed Mar 29 00:00:00 2006
++++ src/mkinclud.mak	Fri Mar 31 00:13:36 2006
+@@ -396,7 +396,7 @@
  
  
-@@ -239,7 +239,7 @@
+ # Install aliases; may be suppressed with make ...install makelinks=
+-makelinks=$(MAKE) links
++makelinks=$(MAKE) -f makefile.bsd links
  
- # define generic rule to generate and compile character mapping tables:
- charmaps/%.o: charmaps/%.map mkchrtab charmaps.h
--	CC=$(CC) OPT=$(OPT) ./mkchrtab $<
-+	CC=$(CC) OPT="$(OPT)" ./mkchrtab $<
+ links:	$(linkdir)/xmined $(linkdir)/minmacs $(linkdir)/mpico $(linkdir)/mstar
  
- 
- #############################################################################
-@@ -356,8 +356,7 @@
+@@ -441,8 +441,7 @@
  	mkdir -p $(lrundir)
- 	$(INSTALL) ../usrshare/* $(lrundir)
+ 	/bin/cp -pr ../usrshare/* $(lrundir)
  	mkdir -p $(lmandir)/man1
--	$(INSTALL) --mode=+r,u+w ../man/mined.1 $(lmandir)/man1
+-	$(INSTALL) --mode=+r,u+w ../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/mined.1 $(lmandir)/man1
+ 	$(extrainstall)
  
  # /opt installation:
- optinstall:	mined help man ${INSTALLTARGET}
diff --git a/editors/mined/pkg-plist b/editors/mined/pkg-plist
index ec04f2d272c3..c5aee17ea8cc 100644
--- a/editors/mined/pkg-plist
+++ b/editors/mined/pkg-plist
@@ -1,24 +1,35 @@
 bin/mined
-%%DATADIR%%/CHANGES
-%%DATADIR%%/README
-%%DATADIR%%/Xdefaults.mined
-%%DATADIR%%/bdf18to20
-%%DATADIR%%/bdf18to20.sed
-%%DATADIR%%/configure-xterm
-%%DATADIR%%/installfonts
-%%DATADIR%%/lmined
-%%DATADIR%%/makeprint
-%%DATADIR%%/mined.desktop
-%%DATADIR%%/mined.hlp
-%%DATADIR%%/minedmar
-%%DATADIR%%/mlterm_key
-%%DATADIR%%/mlterm_main
-%%DATADIR%%/mterm
-%%DATADIR%%/profile.mined
-%%DATADIR%%/umined
-%%DATADIR%%/uprint
-%%DATADIR%%/uterm
-%%DATADIR%%/wmined
-%%DATADIR%%/xinitrc.mined
-%%DATADIR%%/xmined
+bin/xmined
+bin/mstar
+bin/mpico
+bin/minmacs
+bin/uterm
+bin/umined
+share/applications/mined.desktop
+%%DATADIR%%/bin/minedmar
+%%DATADIR%%/bin/mterm
+%%DATADIR%%/bin/umined
+%%DATADIR%%/bin/uprint
+%%DATADIR%%/bin/uterm
+%%DATADIR%%/bin/wmined
+%%DATADIR%%/bin/xmined
+%%DATADIR%%/conf_user/Xdefaults.mined
+%%DATADIR%%/conf_user/mlterm/key
+%%DATADIR%%/conf_user/mlterm/main
+%%DATADIR%%/conf_user/profile.mined
+%%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/mined.desktop
+%%DATADIR%%/setup_install/mined.ico
+@dirrm %%DATADIR%%/setup_install/bin
+@dirrm %%DATADIR%%/setup_install
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/conf_user/mlterm
+@dirrm %%DATADIR%%/conf_user
+@dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%