- OPTIONify.

- Fix pkg-plist in NOPORTDOCS case.

5 files changed, 22 insertions, 39 deletions

diff --git a/japanese/typist/Makefile b/japanese/typist/Makefile
index dcc901fdb91d..e11fdd0d125d 100644
--- a/japanese/typist/Makefile
+++ b/japanese/typist/Makefile
@@ -18,13 +18,24 @@ COMMENT=	Typing lessons (Japanese version)
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAN1=		typist.1
 
+PORTDOCS=	INSTALL.txt README.J README.orig
+
+OPTIONS=	KEYMAP106JP	"Japanese 106 Keymap"	on \
+		KEYMAP101	"101 Keymap"		off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_KEYMAP101)
+MAKE_ARGS=	KEYTYPE="e"
+.elif !defined(WITHOUT_KEYMAP106JP)
+MAKE_ARGS=	KEYTYPE="j"
+.endif
+
 post-install:
-	@strip ${PREFIX}/bin/typist
+	${STRIP_CMD} ${PREFIX}/bin/typist
 .if !defined(NOPORTDOCS)
-	${MKDIR} $(PREFIX)/share/doc/typist
-	${INSTALL_DATA} ${WRKSRC}/../doc/INSTALL.txt $(PREFIX)/share/doc/typist
-	${INSTALL_DATA} ${WRKSRC}/../doc/README.J $(PREFIX)/share/doc/typist
-	${INSTALL_DATA} ${WRKSRC}/../doc/README.orig $(PREFIX)/share/doc/typist
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/../doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/typist/files/patch-aa b/japanese/typist/files/patch-aa
index deaaa1c7a4d4..39d2da7f8693 100644
--- a/japanese/typist/files/patch-aa
+++ b/japanese/typist/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue May 20 21:41:33 1997
-+++ Makefile	Sun Oct 19 03:09:37 2003
+--- Makefile.orig	1997-05-21 13:41:33.000000000 +0900
++++ Makefile	2008-11-16 21:34:28.000000000 +0900
 @@ -49,18 +49,19 @@
  
  # following options for SGI IRIX
@@ -22,7 +22,7 @@
  MAB=
  
 -CFLAGS=$(DEBUG) $(MAB) -DTERMIO
-+CFLAGS+=$(DEBUG) $(MAB) -DTERMIO -DLESSONDIR=\"$(LESSONDIR)\" -DKEYTYPE=\"j\"
++CFLAGS+=$(DEBUG) $(MAB) -DTERMIO -DLESSONDIR=\"$(LESSONDIR)\" -DKEYTYPE=\"${KEYTYPE}\"
  # -DKEYTYPE=\"e\"
  # -DLESSONDIR=\"$(LESSONDIR)\"
  # -DVANISHCHAR
diff --git a/japanese/typist/pkg-descr b/japanese/typist/pkg-descr
index bb495fc1984a..ed7d30457920 100644
--- a/japanese/typist/pkg-descr
+++ b/japanese/typist/pkg-descr
@@ -13,4 +13,4 @@ Specifying  a  lesson  on  command line, you can start the
 lesson immediately.  If  Japanese  version  is  installed,
 Kana typing lessons are also available.
 
-Your  history of exercises can be saved when typist exits.
+Your history of exercises can be saved when typist exits.
diff --git a/japanese/typist/pkg-plist b/japanese/typist/pkg-plist
index 56739749219b..3b3535023ae8 100644
--- a/japanese/typist/pkg-plist
+++ b/japanese/typist/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/typist
 lib/typist/click.snd
 lib/typist/e.map
@@ -15,8 +16,4 @@ lib/typist/t.typ
 lib/typist/typist.idx
 lib/typist/u.typ
 lib/typist/v.typ
-share/doc/typist/INSTALL.txt
-share/doc/typist/README.J
-share/doc/typist/README.orig
 @dirrm lib/typist
-@dirrm share/doc/typist
diff --git a/japanese/typist/scripts/configure b/japanese/typist/scripts/configure
deleted file mode 100644
index e3102c5cd073..000000000000
--- a/japanese/typist/scripts/configure
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# typist configuration shell script
-# usage: /bin/sh configure 
-
-if [ X"${BATCH}" != X"yes" ] ; then
-/usr/bin/dialog --title "typist port configuration" --radiolist \
-"Is a type of your keyboard?" -1 -1 2 \
-"106" "Japanese 106 keymap" ON \
-"101" "101 keymap" OFF 2>/tmp/typist.ports.selection
-
-if [ X`cat /tmp/typist.ports.selection` = "X101" ]
-	then
-	 echo '101 keymap'
-	 cp ${WRKSRC}/Makefile	${WRKSRC}/Makefile.tmp
-	  sed -e 's/-DKEYTYPE=\\"j\\"/-DKEYTYPE=\\"e\\"/g' \
-		${WRKSRC}/Makefile.tmp > ${WRKSRC}/Makefile
-else
-	 echo 'Japanese 106 keymap'
-fi
-
-rm -f /tmp/typist.ports.selection
-
-else
- echo 'Japanese 106 keymap (default) is selected'
-fi