On 2020-01-19 14:16:34, Stuart Henderson <s...@spacehopper.org> wrote:
> On 2020/01/09 23:34, Bryan Linton wrote:
> > Hello ports@
> >
> > I was attempting to make some changes to inputmethods/anthy for
> > another purpose when I noticed it was woefully out of date.
> >
> > [...]
> >
> > Questions:
>
> I've not otherwise looked at it, but answering questions:
>
> > * Is setting "DISTFILES = anthy_$V.orig.tar.gz" the best way to cope
> > with the naming of the tarball?
>
> This is better:
>
> V = 0.4
> DISTNAME = anthy_$V.orig
> WRKDIST = ${WRKDIR}/anthy-$V
>
> > * Does the version changing from 9100h to 0.4 require setting EPOCH?
> > It seems to have updated fine on my system, but I don't know the
> > details of when EPOCH is needed.
>
> Yes. EPOCH is needed whenever the version number goes "backwards"
> according to packages-specs(7) format.
>
Thanks for the tips. Updated patch attached.
Changes from previous patch
===========================
* Add EPOCH to cope with version change (9100h -> 0.4)
* Use DISTNAME and WRKDIST instead of DISTFILES.
--
Bryan
Index: Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/anthy/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 12 Jul 2019 20:47:12 -0000 1.25
+++ Makefile 20 Jan 2020 10:24:51 -0000
@@ -3,12 +3,14 @@
COMMENT-main = japanese input method
COMMENT-emacs = emacs files for anthy
-V = 9100h
-DISTNAME = anthy-$V
+V = 0.4
+DISTNAME = anthy_$V.orig
+WRKDIST = ${WRKDIR}/anthy-$V
PKGNAME-main = anthy-$V
PKGNAME-emacs = emacs-anthy-$V
-REVISION-main = 2
-REVISION-emacs = 4
+REVISION-main = 0
+REVISION-emacs = 0
+EPOCH = 0
SHARED_LIBS += anthydic 1.0 # .1.0
SHARED_LIBS += anthy 1.0 # .1.0
@@ -16,14 +18,14 @@
CATEGORIES = inputmethods japanese
-HOMEPAGE = https://anthy.osdn.jp/
+HOMEPAGE = https://wiki.debian.org/Teams/DebianAnthy
-# GPL, part LGPL
+# GPLv3, parts are LGPLv3 and/or LGPLv2+
PERMIT_PACKAGE = Yes
WANTLIB-main = c m
-MASTER_SITES = ${MASTER_SITE_OSDN_JP:=anthy/37536/}
+MASTER_SITES = http://deb.debian.org/debian/pool/main/a/anthy/
FAKE_FLAGS = sysconfdir=$(PREFIX)/share/examples/anthy
Index: distinfo
===================================================================
RCS file: /cvs/ports/inputmethods/anthy/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 18 Jan 2015 03:14:16 -0000 1.5
+++ distinfo 20 Jan 2020 10:24:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (anthy-9100h.tar.gz) = 0lbwdfAYtKPLDRZe1hUf2kun2xYhcn4OtUVptuInVUc=
-SIZE (anthy-9100h.tar.gz) = 4446148
+SHA256 (anthy_0.4.orig.tar.gz) = /fWQvupwk/Myex7udgE+STbkxmWefMAd0f3W5vLpyfc=
+SIZE (anthy_0.4.orig.tar.gz) = 5619024
Index: patches/patch-src-util_anthy_el
===================================================================
RCS file: patches/patch-src-util_anthy_el
diff -N patches/patch-src-util_anthy_el
--- patches/patch-src-util_anthy_el 7 Dec 2013 23:42:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src-util_anthy_el,v 1.1 2013/12/07 23:42:04 yasuoka Exp $
---- src-util/anthy.el.orig Sat Nov 30 10:40:43 2013
-+++ src-util/anthy.el Sat Nov 30 10:40:55 2013
-@@ -892,7 +892,7 @@
- ((event-matches-key-specifier-p event 'backspace) 8)
- (t
- (char-to-int (event-to-character event)))))
-- last-command-char))
-+ last-command-event))
-
- ;;
- ;;
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/inputmethods/anthy/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -r1.5 PLIST-main
--- pkg/PLIST-main 22 May 2015 11:31:16 -0000 1.5
+++ pkg/PLIST-main 20 Jan 2020 10:24:51 -0000
@@ -2,18 +2,17 @@
@pkgpath inputmethods/anthy
@bin bin/anthy-agent
@bin bin/anthy-dic-tool
-@bin bin/anthy-morphological-analyzer
include/anthy/
include/anthy/anthy.h
include/anthy/dicutil.h
include/anthy/input.h
-lib/libanthy.a
+@static-lib lib/libanthy.a
lib/libanthy.la
@lib lib/libanthy.so.${LIBanthy_VERSION}
-lib/libanthydic.a
+@static-lib lib/libanthydic.a
lib/libanthydic.la
@lib lib/libanthydic.so.${LIBanthydic_VERSION}
-lib/libanthyinput.a
+@static-lib lib/libanthyinput.a
lib/libanthyinput.la
@lib lib/libanthyinput.so.${LIBanthyinput_VERSION}
lib/pkgconfig/anthy.pc
