aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2024-03-17 13:53:47 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2024-03-17 13:57:11 +0000
commit616778b1bce30aec7b83dadfc8a42cd3a3202224 (patch)
tree679b6a7e10cc6ec56f12fd6b8adde9c16ee2ebae
parent6a680c7c7ed4b303db3edfc453b56aedd26eebf8 (diff)
downloadports-616778b1bce30aec7b83dadfc8a42cd3a3202224.tar.gz
ports-616778b1bce30aec7b83dadfc8a42cd3a3202224.zip
japanese/ddskk: Update to 17.1.20230702
Change MASTER_SITES to GitHub PR: 277733 Reported by: mew14930xvi <mew14930xvi@inbox.lv>
-rw-r--r--japanese/ddskk/Makefile27
-rw-r--r--japanese/ddskk/distinfo6
-rw-r--r--japanese/ddskk/files/patch-Makefile10
-rw-r--r--japanese/ddskk/files/patch-SKK-MK16
-rw-r--r--japanese/ddskk/pkg-plist6
5 files changed, 36 insertions, 29 deletions
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 23040873243c..04b600191709 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,10 +1,6 @@
PORTNAME= ddskk
-DISTVERSION= 16.2
-PORTREVISION= 16
+DISTVERSION= 17.1.20230702
CATEGORIES= japanese elisp
-MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
- http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \
- http://openlab.ring.gr.jp/skk/maintrunk/
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
MAINTAINER= ports@FreeBSD.org
@@ -12,10 +8,14 @@ COMMENT= Simple Kana to Kanji conversion program on Emacsen
WWW= http://openlab.ring.gr.jp/skk/
LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/READMEs/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE
USES= emacs
+USE_GITHUB= yes
+GH_ACCOUNT= skk-dev
+GH_TAGNAME= 8c47f46
+
MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" \
SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
@@ -35,26 +35,15 @@ post-patch:
'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
${WRKSRC}/skk-setup.el.in
-pre-build:
-.for i in skk-lookup.el skk-jisx0213.el
- @${MV} ${WRKSRC}/${i} ${WRKDIR}
-.endfor
-
-post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
-.for i in skk-lookup.el skk-jisx0213.el
- ${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
-.endfor
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja
+.for i in AUTHORS.ja CODENAME.ja Contributors Development.ja.org FAQ.ja NEWS.ja history.md
${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR}
.endfor
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for i in Emacs.ad dot.emacs dot.skk
+.for i in dot.emacs dot.skk
${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR}
.endfor
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index c0da3724edff..4f3a4cbbfb76 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505714160
-SHA256 (ddskk-16.2.tar.gz) = 76d13486d7615a75d71107782684e7100cae32f21cec6a44731c192010a7a108
-SIZE (ddskk-16.2.tar.gz) = 886618
+TIMESTAMP = 1710476925
+SHA256 (skk-dev-ddskk-17.1.20230702-8c47f46_GH0.tar.gz) = 842ab3e2d820624d70b17c7b08f2ceaf9d5b70c0dce2ff03b0ba6b0c854bbbff
+SIZE (skk-dev-ddskk-17.1.20230702-8c47f46_GH0.tar.gz) = 956889
diff --git a/japanese/ddskk/files/patch-Makefile b/japanese/ddskk/files/patch-Makefile
index 85d00984a259..d3c6588146d9 100644
--- a/japanese/ddskk/files/patch-Makefile
+++ b/japanese/ddskk/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig 2017-03-04 05:21:04 UTC
+--- Makefile.orig 2024-03-17 07:41:26 UTC
+++ Makefile
-@@ -9,7 +9,7 @@ BZIP2 = bzip2 -9
- DATE = date
+@@ -13,7 +13,7 @@ FIND = find . -maxdepth 1 -name
EMACS = emacs
ETAGS = etags
--FLAGS = -batch -q -no-site-file -l SKK-MK
-+FLAGS = -batch -q -no-site-file --eval '(setq PREFIX "${PREFIX}")' --eval '(setq SKK_LISPDIR "${SKK_LISPDIR}")' --eval '(setq skk-server-host nil)' -l SKK-MK
+ FIND = find . -maxdepth 1 -name
+-FLAGS = --batch --no-init-file --quick --load SKK-MK
++FLAGS = --batch --no-init-file --quick --eval '(setq PREFIX "${PREFIX}")' --eval '(setq SKK_LISPDIR "${SKK_LISPDIR}")' --eval '(setq skk-server-host nil)' --load SKK-MK
GIT = git
GZIP = gzip -9
MD5 = md5
diff --git a/japanese/ddskk/files/patch-SKK-MK b/japanese/ddskk/files/patch-SKK-MK
new file mode 100644
index 000000000000..4d95174babdc
--- /dev/null
+++ b/japanese/ddskk/files/patch-SKK-MK
@@ -0,0 +1,16 @@
+--- SKK-MK.orig 2024-03-17 07:41:31 UTC
++++ SKK-MK
+@@ -229,11 +229,13 @@ This version of SKK requires MULE features"))
+ skk-inline
+ skk-isearch
+ skk-jisx0201
++ skk-jisx0213
+ skk-jisyo-edit-mode
+ skk-kakasi
+ skk-kcode
+ skk-leim
+ skk-look
++ skk-lookup
+ skk-macs
+ skk-num
+ skk-search-web
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 53ce8e07fa74..0400ed75838f 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -27,6 +27,8 @@
%%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-decor.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-decor.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-emacs.el
@@ -42,7 +44,7 @@
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
%%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
@@ -54,7 +56,7 @@
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
-@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el