From nobody  Fri Jan 15 17:31:14 1999
Received: (from nobody@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id RAA14800;
          Fri, 15 Jan 1999 17:31:14 -0800 (PST)
          (envelope-from nobody)
Message-Id: <199901160131.RAA14800@hub.freebsd.org>
Date: Fri, 15 Jan 1999 17:31:14 -0800 (PST)
From: taoka@infonets.hiroshima-u.ac.jp
To: freebsd-gnats-submit@freebsd.org
Subject: Update: japanese/Wnn6
X-Send-Pr-Version: www-1.0

>Number:         9519
>Category:       ports
>Synopsis:       Update: japanese/Wnn6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 15 17:40:01 PST 1999
>Closed-Date:    Sun Jan 17 18:40:11 PST 1999
>Last-Modified:  Sun Jan 17 18:41:22 PST 1999
>Originator:     Satoshi TAOKA
>Release:        
>Organization:
Hiroshima University in Japan
>Environment:
>Description:
Now a port of Wnn6 has a little mistake
which is that Makefile has two pre-extract targets.
So please apply the next patch.

# The patch includs a change of
# japanese/Wnn6/pkg/DESCR, too.

Thanks.

>How-To-Repeat:

>Fix:
diff -ru /usr/ports.current/japanese/Wnn6/Makefile japanese/Wnn6/Makefile
--- /usr/ports.current/japanese/Wnn6/Makefile	Sat Jan  2 08:32:36 1999
+++ japanese/Wnn6/Makefile	Wed Jan  6 13:37:10 1999
@@ -32,8 +32,9 @@
 # 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 @@
 	@/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 -ru /usr/ports.current/japanese/Wnn6/pkg/DESCR japanese/Wnn6/pkg/DESCR
--- /usr/ports.current/japanese/Wnn6/pkg/DESCR	Fri Sep 19 18:30:08 1997
+++ japanese/Wnn6/pkg/DESCR	Wed Jan  6 13:38:07 1999
@@ -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 @@
 | 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

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Jan 17 18:40:11 PST 1999 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
