diff options
| -rw-r--r-- | japanese/ddskk/Makefile | 22 | ||||
| -rw-r--r-- | japanese/ddskk/distinfo | 6 | ||||
| -rw-r--r-- | japanese/ddskk/files/patch-SKK-MK | 17 | ||||
| -rw-r--r-- | japanese/ddskk/pkg-plist | 14 | ||||
| -rw-r--r-- | japanese/ddskk/pkg-plist.emacs20 | 90 |
5 files changed, 30 insertions, 119 deletions
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index f33cc2ac6f2b..7e17bafcb0f9 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ddskk -PORTVERSION= 12.2.0 -PORTREVISION= 2 +PORTVERSION= 13.1 CATEGORIES= japanese elisp MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/ \ ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \ @@ -17,16 +16,23 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= yoichi@FreeBSD.org COMMENT= Simple Kana to Kanji conversion program on Emacsen -BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} -RUN_DEPENDS= ${BUILD_DEPENDS} +USE_EMACS= yes -USE_EMACS= yes .include <bsd.port.pre.mk> -.if (${EMACS_PORT_NAME} == emacs20) + +.if defined(EMACS_PORT_NAME) +.if (${EMACS_PORT_NAME} == "emacs22") +DEPPORT_SUFFIX= +.else DEPPORT_SUFFIX= -${EMACS_PORT_NAME} -PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} +.endif +BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} +RUN_DEPENDS= ${BUILD_DEPENDS} .else -DEPPORT_SUFFIX= +.BEGIN: + @${ECHO} "Error: Bad port." + @${ECHO} "You must define EMACS_PORT_NAME." + @${FALSE} .endif INFO= skk diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo index fd8fbba4ac72..814e065adb54 100644 --- a/japanese/ddskk/distinfo +++ b/japanese/ddskk/distinfo @@ -1,3 +1,3 @@ -MD5 (ddskk-12.2.0.tar.gz) = c5fc8a98fe680e0cb50315e87c12c960 -SHA256 (ddskk-12.2.0.tar.gz) = c66ca0365172ca9a2d32761cd695cc24b07703a4475436ce4341e967ae949c5f -SIZE (ddskk-12.2.0.tar.gz) = 669744 +MD5 (ddskk-13.1.tar.gz) = 5ae2c04de4a21564b0e9695afa006167 +SHA256 (ddskk-13.1.tar.gz) = d2b1bcf7f4e6b41afb126bbde4e119a16cd4f5507ae984154250dd8a19801582 +SIZE (ddskk-13.1.tar.gz) = 720490 diff --git a/japanese/ddskk/files/patch-SKK-MK b/japanese/ddskk/files/patch-SKK-MK deleted file mode 100644 index 792936051889..000000000000 --- a/japanese/ddskk/files/patch-SKK-MK +++ /dev/null @@ -1,17 +0,0 @@ -Index: SKK-MK -=================================================================== -RCS file: /circus/cvsroot/skk/main/SKK-MK,v -retrieving revision 1.125 -retrieving revision 1.126 -diff -u -r1.125 -r1.126 ---- SKK-MK 29 Feb 2004 01:05:10 -0000 1.125 -+++ SKK-MK 15 Apr 2004 01:27:10 -0000 1.126 -@@ -326,7 +326,7 @@ - ;; FSFmacs - (when (featurep 'faces) - (add-to-list 'list 'ccc)) -- (when (= emacs-major-version 21) -+ (when (string< "5.0" mule-version) - (add-to-list 'list 'skk-e21)))) - ;; skk-jisx0213.el - (when (condition-case nil diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist index 0980c6056912..b93fc12e4190 100644 --- a/japanese/ddskk/pkg-plist +++ b/japanese/ddskk/pkg-plist @@ -1,16 +1,22 @@ %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-act.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-act.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el @@ -27,6 +33,8 @@ %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el @@ -51,11 +59,15 @@ %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.elc +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tankan.el +%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tankan.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el @@ -71,7 +83,7 @@ share/skk/NICOLA-SKK.tut share/skk/SKK.tut share/skk/SKK.tut.E share/skk/skk.xpm -@dirrm share/skk +@dirrmtry share/skk share/examples/ddskk/Emacs.ad share/examples/ddskk/dot.emacs share/examples/ddskk/dot.skk diff --git a/japanese/ddskk/pkg-plist.emacs20 b/japanese/ddskk/pkg-plist.emacs20 deleted file mode 100644 index 66467b1783c3..000000000000 --- a/japanese/ddskk/pkg-plist.emacs20 +++ /dev/null @@ -1,90 +0,0 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el -@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc || true -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el -@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc || true -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el -%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc -@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk -@unexec install-info --delete %D/info/skk.info %D/info/dir -info/skk.info -info/skk.info-1 -info/skk.info-2 -info/skk.info-3 -info/skk.info-4 -@exec install-info %D/info/skk.info %D/info/dir -share/skk/NICOLA-SKK.tut -share/skk/SKK.tut -share/skk/SKK.tut.E -share/skk/skk.xpm -@dirrm share/skk -share/examples/ddskk/Emacs.ad -share/examples/ddskk/dot.emacs -share/examples/ddskk/dot.skk -@dirrm share/examples/ddskk -%%PORTDOCS%%share/doc/ddskk/AUTHORS.ja -%%PORTDOCS%%share/doc/ddskk/CODENAME.ja -%%PORTDOCS%%share/doc/ddskk/Contributors -%%PORTDOCS%%share/doc/ddskk/FAQ.ja -%%PORTDOCS%%share/doc/ddskk/NEWS.ja -%%PORTDOCS%%share/doc/ddskk/README -%%PORTDOCS%%@dirrm share/doc/ddskk |