- Update to version 4.0.1

PR:		59540
Submitted by:	maintainer

4 files changed, 53 insertions, 13 deletions

diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 01c4f011c273..55cd5ec0f28c 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -6,28 +6,21 @@
 #
 
 PORTNAME=	yc.el
-PORTVERSION=	3.5.8
+PORTVERSION=	4.0.1
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
-EXTRACT_SUFX=	.gz
+DISTNAME=	yc-${PORTVERSION}
 
 MAINTAINER=	t@nakao.org
 COMMENT=	Yet another Canna client for Emacs/XEmacs
 
-EXTRACT_AFTER_ARGS=	> yc.el
-NO_WRKSUBDIR=	yes
-
 EMACS_PORT_NAME?=	emacs21
 YC_LISPDIR=		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
 
-do-build:
-	${EMACS_CMD} -batch -f batch-byte-compile ${WRKSRC}/yc.el
-
-do-install:
-	${MKDIR} ${YC_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/yc.el ${YC_LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/yc.elc ${YC_LISPDIR}
+MAKE_ARGS+=	LISPDIR=${YC_LISPDIR}
+MAKE_ARGS+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
 	@${CAT} ${MASTERDIR}/pkg-message
diff --git a/japanese/yc.el/distinfo b/japanese/yc.el/distinfo
index 1a31df03e2e8..e464cfd95184 100644
--- a/japanese/yc.el/distinfo
+++ b/japanese/yc.el/distinfo
@@ -1 +1 @@
-MD5 (yc.el-3.5.8.gz) = 94c4484b2a1e13d3e3a2d57dbdc7c19f
+MD5 (yc-4.0.1.tar.gz) = e63c37a2692d77d132f9f8765f9a53a2
diff --git a/japanese/yc.el/files/patch-aa b/japanese/yc.el/files/patch-aa
new file mode 100644
index 000000000000..941da210b3b3
--- /dev/null
+++ b/japanese/yc.el/files/patch-aa
@@ -0,0 +1,46 @@
+--- Makefile.orig	Sun Nov  9 16:18:10 2003
++++ Makefile	Fri Nov 21 12:59:50 2003
+@@ -1,10 +1,10 @@
+-prefix = /usr/local
++prefix = $(PREFIX)
+ #exesuffix = .exe # for Windows
+ 
+-EMACS = emacs
++#EMACS = emacs
+ #EMACS = xemacs
+ 
+-elispdir = $(prefix)/share/emacs/site-lisp
++elispdir = $(LISPDIR)
+ #elispdir = $(prefix)/lib/$(EMACS)/site-lisp
+ #elispdir = $(prefix)/lib/emacs
+ 
+@@ -12,8 +12,10 @@
+ elc = yc.elc
+ PROGRAM = icanna$(exesuffix)
+ OBJS = icanna.o
+-CC = gcc
+-INSTALL = install
++#CC = gcc
++#INSTALL = install
++
++.SUFFIXES: .el .elc
+ 
+ all: $(PROGRAM) $(elc)
+ 
+@@ -29,11 +31,13 @@
+ install: install-bin install-el
+ 
+ install-bin: $(PROGRAM)
+-	$(INSTALL) -m 755 -s $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
++	test -f $(INSTALL_PATH) || mkdir -p $(INSTALL_PATH)
++	$(INSTALL_PROGRAM) $(PROGRAM) $(INSTALL_PATH)/$(PROGRAM)
+ 
+ install-el: $(ELCS) $(SRCS)
+-	$(INSTALL) -m 755 $(elc) $(elispdir)/$(elc)
+-	$(INSTALL) -m 755 $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
++	test -f $(elispdir) || mkdir -p $(elispdir)
++	$(INSTALL_SCRIPT) $(elc) $(elispdir)/$(elc)
++	$(INSTALL_SCRIPT) $(elc:.elc=.el) $(elispdir)/$(elc:.elc=.el)
+ 
+ uninstall: uninstall-bin uninstall-el
+ 
diff --git a/japanese/yc.el/pkg-plist b/japanese/yc.el/pkg-plist
index 08904df8f094..fcf793e15b0e 100644
--- a/japanese/yc.el/pkg-plist
+++ b/japanese/yc.el/pkg-plist
@@ -1,3 +1,4 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
+bin/icanna
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/yc