4 files changed, 25 insertions, 14 deletions

diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 55860f55cbda..8f11ad897d6b 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -9,11 +9,13 @@ PORTNAME=	skk-elisp
 PORTVERSION=	${SKK10_VER}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
-MASTER_SITES=	http://openlab.ring.gr.jp/skk/
+MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
 DISTNAME=	skk${SKK10_VER}
 
 MAINTAINER?=	shige@FreeBSD.org
 
+USE_BZIP2=	YES
+
 SKK10_VER=	10.62a
 
 # This port is a master port.
@@ -45,7 +47,6 @@ PLIST_SUB=	EMACS=${EMACS_CMD} EMACS_LIBDIR=${EMACS_LIBDIR} \
 		SKK_STARTUPEL=${SKK_STARTUPEL}
 
 # information of skk-jisyo
-WITH_SKKJISYO?=	YES
 SKKJISYODIR=	share/skk
 SKK_DOCDIR=	share/doc/skk10
 SKKJISYO_SIZE?=	L
@@ -53,29 +54,20 @@ SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
 SKK_STARTUPEL=	skk-startup.el
 
-.if (${WITH_SKKJISYO} == "YES")
 # dependency: skk-jisyo
 RUN_DEPENDS+=	${LOCALBASE}/${SKKJISYODIR}/${SKKJISYO}:${SKK_MASTERDIR}
-.endif
 
+OPTIONAL_LISPS=		skk-lookup.el
 EXPERIMENTAL_LISPS=	experimental/skk-abbrev.el \
 			experimental/dbm/skk-dbm.el \
 			experimental/skk-dcomp.el \
 			experimental/skk-hankaku-mode.el \
 			experimental/skk-jisx0201.el \
+			experimental/skk-study.el \
 			experimental/tut-code/skk-def.el \
 			experimental/tut-code/skk-tutcdef.el \
 			experimental/tut-code/skk-tutcode.el
 
-pre-fetch:
-.if (${WITH_SKKJISYO} == "YES")
-	@${ECHO_MSG} "NOTE: You can avoid installing SKK-JISYO by adding"
-	@${ECHO_MSG} "    WITH_SKKJISYO=NO"
-	@${ECHO_MSG} "to argument of make."
-	@${ECHO_MSG} "When you want to use skkserv, this option is useful."
-	@${ECHO_MSG} "Without it, SKK-JISYO is installed defaultly."
-.endif
-
 # install experimantal lisps [handy optional]
 #pre-build:
 #	@(cd ${WRKSRC} ; \
@@ -91,6 +83,12 @@ post-install:
 	@${MAKE} startup-install
 	@${MKDIR} ${LOCALBASE}/${SKK_DOCDIR}
 	@(cd ${WRKSRC} ;\
+		for i in ${OPTIONAL_LISPS} ; do \
+			${INSTALL_DATA} $${i} \
+				${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/skk ;\
+		done ;\
+	)
+	@(cd ${WRKSRC} ;\
 		for i in ${EXPERIMENTAL_LISPS} ; do \
 			${INSTALL_DATA} $${i} ${LOCALBASE}/${SKK_DOCDIR} ;\
 		done ;\
diff --git a/japanese/skk10-elisp-emacs20/distinfo b/japanese/skk10-elisp-emacs20/distinfo
index aa6d0f082513..140927715c63 100644
--- a/japanese/skk10-elisp-emacs20/distinfo
+++ b/japanese/skk10-elisp-emacs20/distinfo
@@ -1 +1,2 @@
 MD5 (skk10.62a.tar.gz) = 93d8bb7ef0a246e160b76a33bb274849
+MD5 (skk10.62a.tar.bz2) = ae372c2d021f70e1ec99606d6a5af4df
diff --git a/japanese/skk10-elisp-emacs20/files/patch-aa b/japanese/skk10-elisp-emacs20/files/patch-aa
new file mode 100644
index 000000000000..c9ed40dbda94
--- /dev/null
+++ b/japanese/skk10-elisp-emacs20/files/patch-aa
@@ -0,0 +1,11 @@
+--- SKK-MK.orig	Mon Oct 30 06:40:42 2000
++++ SKK-MK	Tue Oct 31 14:23:12 2000
+@@ -326,7 +326,7 @@
+       (setq x (expand-file-name (car targets) DOCDIR))
+       (find-file x)
+       (setq obuf (current-buffer))
+-      (texinfo-format-buffer)
++      (texinfo-format-buffer t)
+       (save-buffer)
+       (kill-buffer (current-buffer))	; info
+       (kill-buffer obuf)		; texi
diff --git a/japanese/skk10-elisp-emacs20/pkg-plist b/japanese/skk10-elisp-emacs20/pkg-plist
index f5a2520ecc1c..f50d7300c1e2 100644
--- a/japanese/skk10-elisp-emacs20/pkg-plist
+++ b/japanese/skk10-elisp-emacs20/pkg-plist
@@ -25,7 +25,7 @@
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-look.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-look.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.elc
+@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-num.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-num.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-obsolete.el
@@ -65,6 +65,7 @@ info/skk.info
 %%SKK_DOCDIR%%/skk-def.el
 %%SKK_DOCDIR%%/skk-hankaku-mode.el
 %%SKK_DOCDIR%%/skk-jisx0201.el
+%%SKK_DOCDIR%%/skk-study.el
 %%SKK_DOCDIR%%/skk-tutcdef.el
 %%SKK_DOCDIR%%/skk-tutcode.el
 @dirrm %%SKK_DOCDIR%%