Update to 0.3.6.

Catching up to emacs-20.4.

5 files changed, 22 insertions, 19 deletions

diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index b484b0854413..3426caf84089 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	emacs20-dl-wnn6
-# Version required:	0.2.2
+# Version required:	0.3.6
 # Date created:		10 October 1998
 # Whom:			shige
 #
-# $Id: Makefile,v 1.4 1999/06/15 00:31:22 shige Exp $
+# $Id: Makefile,v 1.5 1999/07/25 12:17:51 asami Exp $
 #
 
-DISTNAME=	dl-wnn-0.2.2
-PKGNAME=	ja-emacs20-dl-wnn6-0.2.2
+DISTNAME=	dl-wnn-0.3.6
+PKGNAME=	ja-emacs20-dl-wnn6-0.3.6
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://tt-www.cs.titech.ac.jp/~katsuya/emacs/
 
@@ -20,14 +20,16 @@ RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wnn-includes=${PREFIX}/include/wnn --with-wnn6 \
+CONFIGURE_ARGS=	--with-wnn6 \
+		--with-wnn-includes=${PREFIX}/include/wnn \
+		--with-wnn-libraries=${PREFIX}/lib \
 		--with-emacs-src=${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
-CONFIGURE_ENV=	EMACS=emacs-dl-${EMACS_VER}
+CONFIGURE_ENV=	EMACS=${PREFIX}/bin/emacs-dl-${EMACS_VER}
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
 		DOCDIR=${DOCDIR}
 
 DOCDIR=		share/doc/emacs20-dl-wnn6
-EMACS_VER=	20.3
+EMACS_VER=	20.4
 EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
 
 post-install:
@@ -35,7 +37,7 @@ post-install:
 		${PREFIX}/share/emacs/site-lisp/egg/.eggrc
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOCDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/${DOCDIR}
 .endif
 
diff --git a/japanese/emacs20-dl-wnn6/distinfo b/japanese/emacs20-dl-wnn6/distinfo
index d355f8d8ff04..e7416fc6a6da 100644
--- a/japanese/emacs20-dl-wnn6/distinfo
+++ b/japanese/emacs20-dl-wnn6/distinfo
@@ -1 +1 @@
-MD5 (dl-wnn-0.2.2.tar.gz) = 5fe5da0d4489a4c797650a0a5b518fd7
+MD5 (dl-wnn-0.3.6.tar.gz) = 2536c86f845fad4b40af4bbe37332ffc
diff --git a/japanese/emacs20-dl-wnn6/files/patch-aa b/japanese/emacs20-dl-wnn6/files/patch-aa
index 938264512bdd..5484277d57e9 100644
--- a/japanese/emacs20-dl-wnn6/files/patch-aa
+++ b/japanese/emacs20-dl-wnn6/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Sun Oct 11 11:04:13 1998
-+++ src/Makefile.in	Sun Oct 11 13:50:36 1998
-@@ -14,7 +14,7 @@
+--- src/Makefile.in.orig	Wed Mar 10 08:35:29 1999
++++ src/Makefile.in	Mon Aug  9 21:54:03 1999
+@@ -15,7 +15,7 @@
  CFLAGS = -g -O2
  ALL_CFLAGS = $(CFLAGS) -nostdlib -shared -fPIC -pipe -I$(emacssrc)/src
  WNN_CFLAGS = -I$(wnn_includes) -DWNN_EMACS -DWNN_EMACS_DL $(wnn_define)
--WNN_LDFLAGS = -lwnn
-+WNN_LDFLAGS = -L/usr/local/lib -lwnn6
+-WNN_LDFLAGS = -L$(wnn_libraries) -lwnn
++WNN_LDFLAGS = -L$(wnn_libraries) -lwnn6
  
  all: wnn.so
  
diff --git a/japanese/emacs20-dl-wnn6/pkg-descr b/japanese/emacs20-dl-wnn6/pkg-descr
index f8654c0bfd2b..141f352dcc54 100644
--- a/japanese/emacs20-dl-wnn6/pkg-descr
+++ b/japanese/emacs20-dl-wnn6/pkg-descr
@@ -26,11 +26,12 @@ To use Wnn, put in your $HOME/.emacs as follows:
 
 	(autoload 'egg "egg" "Initialize EGG." t)
 
-and M-x egg on emacs-dl-20.3 (not emacs-20.3!).
+and M-x egg on emacs-dl-20.4 (not emacs-20.4!).
 
-This dynamic loading module sources and emacs20 dynamic loading patch
+This dynamic loading module sources and emacs20 dynamic loading module patch
 is placed on the following URL:
 
+	http://tt-www.cs.titech.ac.jp/~katsuya/emacs/
 	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/japanese/emacs20-dl-wnn6/pkg-plist b/japanese/emacs20-dl-wnn6/pkg-plist
index 85660cf8a99d..fa960740dfb2 100644
--- a/japanese/emacs20-dl-wnn6/pkg-plist
+++ b/japanese/emacs20-dl-wnn6/pkg-plist
@@ -25,10 +25,10 @@ share/emacs/site-lisp/egg/its/hankaku.el
 share/emacs/site-lisp/egg/its/hankaku.elc
 share/emacs/site-lisp/egg/its/hira.el
 share/emacs/site-lisp/egg/its/hira.elc
+share/emacs/site-lisp/egg/its/kanainput.el
+share/emacs/site-lisp/egg/its/kanainput.elc
 share/emacs/site-lisp/egg/its/kata.el
 share/emacs/site-lisp/egg/its/kata.elc
-share/emacs/site-lisp/egg/its/katainput.el
-share/emacs/site-lisp/egg/its/katainput.elc
 share/emacs/site-lisp/egg/its/pinyin.el
 share/emacs/site-lisp/egg/its/pinyin.elc
 share/emacs/site-lisp/egg/its/zenkaku.el
@@ -37,6 +37,6 @@ share/emacs/site-lisp/egg/its/zhuyin.el
 share/emacs/site-lisp/egg/its/zhuyin.elc
 @dirrm share/emacs/site-lisp/egg/its
 @dirrm share/emacs/site-lisp/egg
-%%DOCDIR%%/README.jp
+%%DOCDIR%%/README.ja
 %%DOCDIR%%/ChangeLog
 @dirrm %%DOCDIR%%