From eca2e7c1f2a55c69edd5fc8971b2856c51697860 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Mon, 18 Jan 1999 02:41:10 +0000
Subject: Use '::' for the extract target since we have two of them now.

PR:		9519
Submitted by:	maintainer
---
 japanese/Wnn6/Makefile  | 13 ++++++++-----
 japanese/Wnn6/pkg-descr | 15 +++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'japanese/Wnn6')

diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index c36ede3f40c5..93d9e358947a 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.20 1998/06/27 05:19:00 asami Exp $
+# $Id: Makefile,v 1.21 1998/12/31 22:23:13 obrien Exp $
 #
 
 DISTNAME=	OMRONWnn6
@@ -32,8 +32,9 @@ do-fetch:
 # If ${.CURDIR}/work/.build_done (which will be ${BUILD_COOKIE}) exists,
 # we do nothing in a 'do-fetch' stage.
 .if !exists(${.CURDIR}/work/.build_done)
-pre-extract:
-	@${ECHO} -n "Please set the CD-ROM of 'Wnn6' into your cdrom-drive. (Press Return)"; \
+pre-extract::
+	@${ECHO} "Please set the CD-ROM 'Wnn6 for Linux/FreeBSD' (which is an old version !!)";
+	@${ECHO} -n "into your cdrom-drive. (Press Return)"; \
 	read dummy; \
 	${ECHO} "By default, a mount point and a device file"; \
 	${ECHO} "    are '${MOUNT_PT}' and '${MOUNT_DEV}' respectively."; \
@@ -64,10 +65,12 @@ pre-extract:
 	@/sbin/mount_cd9660 ${MOUNT_DEV} ${MOUNT_PT}
 .endif
 
-pre-extract:
+pre-extract::
 	@if [ ! -e ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
+		${ECHO} ""; \
 		${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}: No such file"; \
-		${ECHO} "Perhaps the CD-ROM is not one of Wnn6"; \
+		${ECHO} "Perhaps the CD-ROM is not 'Wnn6 for Linux/FreeBSD'"; \
+		${ECHO} "!! Note that 'Wnn6 for Linux/FreeBSD' is an old version !!"; \
 		/sbin/umount ${MOUNT_PT}; \
 		${ECHO} "Umounting is done ..."; \
 		/usr/bin/false; \
diff --git a/japanese/Wnn6/pkg-descr b/japanese/Wnn6/pkg-descr
index 3da0e09e45a7..6e7e5d8d9804 100644
--- a/japanese/Wnn6/pkg-descr
+++ b/japanese/Wnn6/pkg-descr
@@ -1,5 +1,10 @@
-This is Wnn6, a Japanese input method. This software 'Wnn6' is not
-free, and you can buy it from Omron Software Co., Ltd.
+This is a port of 'Wnn6 for Linux/FreeBSD', a Japanese input
+method. 'Wnn6' is not free.
+
+Note that 'Wnn6 for Linux/FreeBSD' is is an old version, and you can
+buy a newer version from Omron Software Co., Ltd. The newer Wnn6 is a
+package-style for FreeBSD, so you can pkg_add it directly. That is, it
+is not necessary to use this port if yours is the newer version.
 
 +------------------------------------------+
 | URL:	   http://www.omronsoft.co.jp      |
@@ -8,13 +13,11 @@ free, and you can buy it from Omron Software Co., Ltd.
 | FAX:     +81-44-246-6011                 |
 +------------------------------------------+
 
-Remark 1. If a value of ${PKG_PREFIX} is not '/usr/local', the
-following symbolic links are made:
+Remark: If a value of ${PKG_PREFIX} is not '/usr/local', the following
+symbolic links are made:
 
 "/usr/local/bin/Wnn6" to "${PKG_PREFIX}/OMRONWnn6/Wnn6fbsd" and,
 "/usr/local/lib/wnn6" to "${PKG_PREFIX}/OMRONWnn6/wnn6fbsd".
 
-Remark 2. We do not fetch by FTP but get from CD-ROM.
-
 - S. Taoka
 taoka@infonets.hiroshima-u.ac.jp
-- 
cgit v1.2.3