Update to 2.0 and unBROKEN

Take MAINTAINER
Add SHA256

PR:		89029
Submitted by:	"Boris B. Samorodov" <bsam@ipt.ru>

6 files changed, 40 insertions, 38 deletions

diff --git a/sysutils/mapchan/Makefile b/sysutils/mapchan/Makefile
index 75c9d243085..dee078a7d8e 100644
--- a/sysutils/mapchan/Makefile
+++ b/sysutils/mapchan/Makefile
@@ -6,42 +6,39 @@
 #
 
 PORTNAME=	mapchan
-PORTVERSION=	1.4
+PORTVERSION=	2.0
 CATEGORIES=	sysutils converters
 MASTER_SITES=	http://www.iceb.vinnitsa.com/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsam@ipt.ru
 COMMENT=	Implementation of the utility "mapchan" from SCO Unix
 
-BROKEN=		"1.4 is unfetchable but 2.0 is available from the site"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=	2005-12-09
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+MAKE_ENV=	MAPDIR=${PREFIX}/etc/${PORTNAME}
+
 ETCDAT=		*.map default.sample
 
 MAN8=		mapchan.8
 
 PORTDOCS=	README
 
-pre-patch:
+post-extract:
 	@${CP} ${WRKSRC}/doc/mapchan.F ${WRKSRC}/doc/mapchan.8
-	@${CP} ${WRKSRC}/examples/default ${WRKSRC}/examples/default.sample
 
-pre-build:
+post-patch:
+	@${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM}
+	@${CP} ${WRKSRC}/examples/default ${WRKSRC}/examples/default.sample
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/mapchan.c
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${ETCDAT:S|^|${WRKSRC}/examples/|} ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/mapchan/distinfo b/sysutils/mapchan/distinfo
index 30931df469a..2c5a078f5f8 100644
--- a/sysutils/mapchan/distinfo
+++ b/sysutils/mapchan/distinfo
@@ -1 +1,3 @@
-MD5 (mapchan-1.4.tar.bz2) = 3dc874899b0e00e298f0f1b1a5622993
+MD5 (mapchan-2.0.tar.bz2) = b0a889deafc4b2fdd9658a038bb13e13
+SHA256 (mapchan-2.0.tar.bz2) = 348b202db14bf200b02d4b18c20b6e059db457e47b5b567eaa7af161045f50d6
+SIZE (mapchan-2.0.tar.bz2) = 22547
diff --git a/sysutils/mapchan/files/patch-Makefile b/sysutils/mapchan/files/patch-Makefile
index 2da209fcd9d..e0dd1d3367f 100644
--- a/sysutils/mapchan/files/patch-Makefile
+++ b/sysutils/mapchan/files/patch-Makefile
@@ -1,11 +1,23 @@
---- Makefile.orig Sat Dec 23 09:47:25 2000
-+++ Makefile Thu Aug  7 00:43:27 2003
-@@ -11,7 +11,7 @@
- # (2) If your system has not basename() function - uncomment next string
- #DEFS+=-DNOBASENAME
-
--BINDIR=/bin
-+BINDIR=$(PREFIX)/bin
- LDFLAGS=-lutil
+--- Makefile.orig	Wed Jul  6 00:16:36 2005
++++ Makefile	Mon Nov 14 22:52:35 2005
+@@ -1,6 +1,6 @@
+ #
+ #
+-CFLAGS=-O2
++CFLAGS?=$(CFLAGS)
+ # 
+ # Defines:
+ #DEFS=
+@@ -14,9 +14,9 @@
+ # (3) If need call /bin/sh for parsing argument of option -s
+ DEFS+=-DEXEC_SHELL
+ 
+-BINDIR ?= /bin
+-MAPDIR ?= /etc/mapchan
+-LDFLAGS=-s
++BINDIR?=$(PREFIX)/bin
++MAPDIR?=$(PREFIX)/mapchan
++LDFLAGS=-s -lutil
+ LOADLIBES=-lutil
  #--------------------------------------------------------------
  CFLAGS += $(DEFS)
diff --git a/sysutils/mapchan/files/patch-examples::default b/sysutils/mapchan/files/patch-examples::default
index 7dfe8d589a1..32e3ff0aaf8 100644
--- a/sysutils/mapchan/files/patch-examples::default
+++ b/sysutils/mapchan/files/patch-examples::default
@@ -1,5 +1,5 @@
---- examples/default.sample.orig Sat Dec 23 09:47:26 2000
-+++ examples/default.sample Sun Aug 31 13:51:08 2003
+--- examples/default.orig Sat Dec 23 09:47:26 2000
++++ examples/default Sun Aug 31 13:51:08 2003
 @@ -1,4 +1,4 @@
 -tty5  altkoi.map
 +ttyv5  altkoi.map
diff --git a/sysutils/mapchan/files/patch-mapchan.c b/sysutils/mapchan/files/patch-mapchan.c
index 9e6278c0bca..c373b6ae623 100644
--- a/sysutils/mapchan/files/patch-mapchan.c
+++ b/sysutils/mapchan/files/patch-mapchan.c
@@ -9,17 +9,3 @@
  #endif
  
  #define BUFSIZE 4096
-@@ -51,10 +51,10 @@
- 
- char usage[] = { "\nUsage:\n\nmapchan [-q] [-s shell] [-f file]\
-  [-h]\n\nwhere:\n\
--\tshell     - shell, if not /bin/sh
-+\tshell     - shell, if not /bin/sh\n\
- \tfile      - input file\n\
--\t-q	    - force and quiet
--\t-h    - print this screen and exit.\n" };
-+\t-q        - force and quiet\n\
-+\t-h        - print this screen and exit.\n" };
- 
- int pty_fd;     /* дескриптор master */
- int tty_fd;     /* дескриптор slave */
diff --git a/sysutils/mapchan/pkg-plist b/sysutils/mapchan/pkg-plist
index 34af0ba2d0e..eff61dc4cac 100644
--- a/sysutils/mapchan/pkg-plist
+++ b/sysutils/mapchan/pkg-plist
@@ -1,10 +1,15 @@
 bin/mapchan
 etc/mapchan/altkoi.map
+@unexec if cmp -s %D/etc/mapchan/default %D/etc/mapchan/default.sample; then rm -f %D/etc/mapchan/default; fi
 etc/mapchan/default.sample
 etc/mapchan/dos2koi.map
+etc/mapchan/dos2koi-kbd.map
 etc/mapchan/k180.map
+etc/mapchan/koi2win.map
 etc/mapchan/koiualt.map
 etc/mapchan/koiumain.map
+etc/mapchan/msm.map
+etc/mapchan/trivial.map
 etc/mapchan/sm7238.map
 etc/mapchan/win2koi.map
 @unexec rmdir %D/etc/mapchan 2>/dev/null || true