Remove regexp support for libcanna since it can now be built

in ELF format as well.

10 files changed, 20 insertions, 20 deletions

diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index 13ca7115555f..2d041f37bc46 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 October 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.9 1997/09/15 00:04:00 max Exp $
+# $Id: Makefile,v 1.10 1998/09/03 22:49:17 max Exp $
 #
 
 DISTNAME=       elvis-1.8
@@ -17,7 +17,7 @@ PATCHFILES=     jelvis1.8p4-j1.1.tar.Z
 
 MAINTAINER=     sanpei@yy.cs.keio.ac.jp
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 NO_WRKSUBDIR=	yes
 PATCH_DIST_STRIP=       -p1
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index 1a14efeefe66..a28bfa1e24db 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/02 22:34:23 max Exp $
+# $Id: Makefile,v 1.3 1998/09/09 16:07:12 max Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/jvim2.0r
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
 INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 JPLIB+=			-lcanna
 .endif
 .if defined(WNN4)
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 78c31fdabfa5..0930e6774467 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/27 12:49:25 kuriyama Exp $
 #
 
 DISTNAME=	kinput2-v2-fix4
@@ -30,7 +30,7 @@ WNN4=			yes
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
 INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 KINPUT2_DEF+=		-DUseCanna
 .endif
 .if defined(SJ3)
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 78c31fdabfa5..0930e6774467 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/27 12:49:25 kuriyama Exp $
 #
 
 DISTNAME=	kinput2-v2-fix4
@@ -30,7 +30,7 @@ WNN4=			yes
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
 INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 KINPUT2_DEF+=		-DUseCanna
 .endif
 .if defined(SJ3)
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 49278bd47b71..e0eb73085ad9 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.11 1998/03/04 19:35:05 asami Exp $
+# $Id: Makefile,v 1.12 1998/06/26 09:16:27 obrien Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -12,7 +12,7 @@ PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
 PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 PKGNAME=	ja-nvi-eucjp-1.79.19970820
 
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 3f827ca7038e..31e608b29a29 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.11 1998/03/04 19:35:05 asami Exp $
+# $Id: Makefile,v 1.12 1998/06/26 09:16:31 obrien Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -12,7 +12,7 @@ PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
 PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 PKGNAME=	ja-nvi-iso2022jp-1.79.19970820
 
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index ccd5625b36b3..2b660b8e6179 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.11 1998/03/04 19:35:06 asami Exp $
+# $Id: Makefile,v 1.12 1998/06/26 09:16:33 obrien Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -12,7 +12,7 @@ PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
 PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 PKGNAME=	ja-nvi-sjis-1.79.19970820
 
diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile
index 22c053425875..15fd5772f695 100644
--- a/japanese/onew-freewnn/Makefile
+++ b/japanese/onew-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/08 14:29:29 kuriyama Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -31,7 +31,7 @@ WNN4=			yes
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
 INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 JPLIB+=			-lcanna
 .endif
 .if defined(WNN4)
diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile
index 22c053425875..15fd5772f695 100644
--- a/japanese/onew/Makefile
+++ b/japanese/onew/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/08 14:29:29 kuriyama Exp $
 #
 
 DISTNAME=	jvim2.0r+onew2.2.10
@@ -31,7 +31,7 @@ WNN4=			yes
 # LIB_DEPENDS, etc.
 .if defined(CANNA)
 INPUT_METHOD+=		canna
-LIB_INPUT_METHOD+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_INPUT_METHOD+=	canna.1:${PORTSDIR}/japanese/Canna
 JPLIB+=			-lcanna
 .endif
 .if defined(WNN4)
diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile
index 66684e384862..eaf21e5a2a38 100644
--- a/japanese/pine/Makefile
+++ b/japanese/pine/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 May 1996
 # Whom:			masafumi
 #
-# $Id: Makefile,v 1.11 1997/07/17 15:12:46 max Exp $
+# $Id: Makefile,v 1.12 1997/09/14 21:35:40 max Exp $
 #
 
 DISTNAME=	pine3.95
@@ -18,7 +18,7 @@ PATCH_SITES=	ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/pine/pine3.95/
 
 MAINTAINER=	max@FreeBSD.ORG
 
-LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 BUILD_DEPENDS=	${PREFIX}/lib/libcanna.a:${PORTSDIR}/japanese/Canna
 
 EXTRACT_ONLY=	pine3.95.tar.gz