From 9357df90dfae45310fbd24c57a3b62603e0688cf Mon Sep 17 00:00:00 2001
From: Masafumi Max NAKANE <max@FreeBSD.org>
Date: Mon, 2 Dec 2002 03:30:48 +0000
Subject: Upgrade to 3.6p1, which contains security fixes. Approved by:	kris
 Submitted by:	KANOU Hiroki <kanou@mil.allnet.ne.jp> Review and mod by:
 max

---
 japanese/Canna/Makefile       |  7 +++----
 japanese/Canna/distinfo       |  2 +-
 japanese/Canna/files/patch-ag | 32 ++++++++++++++++----------------
 3 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'japanese/Canna')

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 53097d29c0dd..0f9c7b9bc916 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	Canna
-PORTVERSION=	3.6
-PORTREVISION=	1
+PORTVERSION=	3.6.p1
 CATEGORIES=	japanese
-MASTER_SITES=	http://downloads.sourceforge.jp/canna/1425/
+MASTER_SITES=	http://downloads.sourceforge.jp/canna/1722/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	max@FreeBSD.org
@@ -30,7 +29,7 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 RkGetLex.3 \
 	RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 RkIntro.3 RkLeft.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
-	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
+	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkBgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
 MANCOMPRESSED=	no
 XFREE86_HTML_MAN=	no
diff --git a/japanese/Canna/distinfo b/japanese/Canna/distinfo
index 02c6cd02d1a8..869d8c26eaeb 100644
--- a/japanese/Canna/distinfo
+++ b/japanese/Canna/distinfo
@@ -1 +1 @@
-MD5 (Canna36.tar.gz) = 6c6698f1b6202d92d62b85aed599c519
+MD5 (Canna36p1.tar.gz) = 303f236f40f923c9c3f3cdde90561ddc
diff --git a/japanese/Canna/files/patch-ag b/japanese/Canna/files/patch-ag
index 307d095222d5..98f85358433f 100644
--- a/japanese/Canna/files/patch-ag
+++ b/japanese/Canna/files/patch-ag
@@ -1,18 +1,18 @@
---- cmd/catdic/Imakefile.orig	Mon Oct 29 01:41:09 2001
-+++ cmd/catdic/Imakefile	Mon Oct 29 01:42:13 2001
+--- cmd/catdic/Imakefile.orig	Thu Nov  7 23:46:02 2002
++++ cmd/catdic/Imakefile	Mon Dec  2 12:09:42 2002
 @@ -84,7 +84,7 @@
- 	$(RM) $(cannaBinDir)/chmoddic
- 	$(RM) $(cannaBinDir)/addwords
- 	$(RM) $(cannaBinDir)/delwords
--	$(RM) $(cannaBinDir)/cannakill
-+	$(RM) $(cannaSrvDir)/cannakill
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic
-@@ -93,5 +93,5 @@
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords
- 	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords
--	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill
-+	$(LN) $(cannaBinDir)/catdic $(cannaSrvDir)/cannakill
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
+ 	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
+-	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
++	$(RM) $(DESTDIR)$(cannaSrvDir)/cannakill
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
+@@ -94,5 +94,5 @@
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/chmoddic
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
+ 	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
+-	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
++	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaSrvDir)/cannakill
  #endif
-- 
cgit v1.2.3