From nobody Tue Jul 02 22:27:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WDHbM1Wjmz5PnkV; Tue, 02 Jul 2024 22:27:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WDHbL6hTzz46yg; Tue, 2 Jul 2024 22:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719959246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcThV05wxDDFOyfSGAFFtZSi+EjFNbGb+GqsZHHzjEg=; b=rGGvI3Q0xOMoCl1W5lv1FDIqtQwQQ/NF/kUrdPqF5NQqMNTkKLBL4XjugJL0LL7S7KD2U2 u5nA5mFpVPFdH2R/3jpRiKhgoxZOMF6KBDlihWNA6Fr2nosZlLNxbhA9wWMtvY0485fZY4 6iZ4V1Xg8E5FpvKgV0glWHnBXZ32UVnVK+1nmwVZ3G4BixRfu4M9zfcaxi2wYpVAl8Fuxa cphqokD01lTm1v3QIW7Pxd4fO4LgjdOe2RsioeQlFIbWIp6VP3PUpzM6N23/t16qSJf2gs Ov8MtcrBRa+2h9BNwuFvnl07nOmVOyVNmU+IFlVvA9hx1h7dTPEy7u6HsOUJ0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719959246; a=rsa-sha256; cv=none; b=HZ+anZY5SZPLTNBAaQHJ7ufdp99tglPVhnTPJIO6Do0fdhtMo9CkMP/SgiBwW5jzdB+Eek xlI1bL2lBSMDcKCfrVVUiKhEhHNykYZjNNwh6zp3Z1FNTcFUz2r4iLRQpKS57XJypbz3s8 mZun6jxA9Sn3b9z2xo5bHAh9W2eiLffKGtZEAcuGu0P78MfBVPb1d7CP/vaHuVb17q04qK tOWxuQwPQbpMgPrIpm6ratNdtf2ZCBWYdN/W1R+kdfbUcKiZ6LhCsAkCQaaK+DoyHJ7DQS wWxnzywwD4UcCxmJ/XYA7hr8axjydWwVnLXV3zBoclNDe87CSWNyCLc1YcJ5sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719959246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcThV05wxDDFOyfSGAFFtZSi+EjFNbGb+GqsZHHzjEg=; b=q3rE03kz5PMXyH0lFGRi44U57Y3X+LZfHgVx04SuQK3WJLkj/mKn9eCZlX2Ea2FOTGRhDy vc0D5C+Q+QdEafWKA9B9wpEBAtDP9XN/HE9s7TbeMo3OeK4I/r+jDr0Lu32PoQCSRhv8vl 1wuIhgQLISr3kRTKbA7bgb1a3RpiJAz5rMWlJFm8zKpcdz0bY1C6+cWpcXWNG4lSArpCCf mi8dsP/dxPbWghqr3AsU9uhA7KpKNQIudz+ED9r4fJjMSpImVAFm5qYrbHL/gwj0x6qVBV ZlH7+9RjZmcDU9p3rdP18t4gHGghlhrW5Ez9lLJj6nirF+kBE4gVCmhLA+npfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WDHbL6HyNz15d1; Tue, 2 Jul 2024 22:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 462MRQYB034849; Tue, 2 Jul 2024 22:27:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 462MRQIt034846; Tue, 2 Jul 2024 22:27:26 GMT (envelope-from git) Date: Tue, 2 Jul 2024 22:27:26 GMT Message-Id: <202407022227.462MRQIt034846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 246e3def0051 - main - japanese/skkinput3: Remove invalid option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 246e3def00512d3a051bfba77b2725f96a070b86 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=246e3def00512d3a051bfba77b2725f96a070b86 commit 246e3def00512d3a051bfba77b2725f96a070b86 Author: mew14930xvi AuthorDate: 2024-07-02 22:23:17 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-02 22:26:17 +0000 japanese/skkinput3: Remove invalid option Remove RSKKSERV option (Depends on japanese/rskkserv expired in 2014-09) Add LICENSE Add japanese/skkserv option If not selected in the options, do not install dictionary server Switch post-install to post-install-DOCS-on Sort options (pet portclippy) Regenerate patches (pet portlint) Add OPTIONS_SUB=yes and remove SKK10=* PR: 279386 Approved by: koma2@lovepeers.org (maintainer, timeout > 1 month) --- japanese/skkinput3/Makefile | 44 ++++++++++++++-------------- japanese/skkinput3/distinfo | 1 + japanese/skkinput3/files/patch-Imakefile | 6 ++-- japanese/skkinput3/files/patch-Skkinput.conf | 6 ++-- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile index 8329e0b9318a..dab07e23266d 100644 --- a/japanese/skkinput3/Makefile +++ b/japanese/skkinput3/Makefile @@ -1,45 +1,45 @@ -PORTNAME= skkinput3 +PORTNAME= skkinput PORTVERSION= 3.0.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese x11 MASTER_SITES= OSDN/${PORTNAME} -DISTNAME= skkinput-${PORTVERSION} +PKGNAMESUFFIX= 3 MAINTAINER= koma2@lovepeers.org COMMENT= SKK-like Japanese input method for X11 WWW= https://sourceforge.jp/projects/skkinput3/ +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/GPL + USES= imake xorg -USE_GCC= yes USE_CSTD= gnu89 +USE_GCC= yes USE_XORG= ice sm x11 xext xmu xt MAKE_JOBS_UNSAFE= yes PORTDOCS= *.jis dot.skkinput ChangeLog -OPTIONS_DEFINE= SKK10 DOCS -OPTIONS_RADIO= SKKSERVER -OPTIONS_RADIO_SKKSERVER= DBSKKD RSKKSERV +OPTIONS_DEFINE= DOCS SKK10 +OPTIONS_DEFAULT= SKK9 +OPTIONS_RADIO= SKKSERVER +OPTIONS_RADIO_SKKSERVER= DBSKKD SKK9 +OPTIONS_SUB= yes + +DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver +SKK10_DESC= Install SKK10 elisp files +SKK9_DESC= Use ja-skkserv as skkserver +SKKSERVER_DESC= Skkserver selection -SKKSERVER_DESC= Skkserver selection -DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver -RSKKSERV_DESC= Use ja-rskkserv as skkserver -SKK10_DESC= Install SKK10 elisp files +DBSKKD_RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb +SKK9_RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:japanese/skkserv .include .if ${PORT_OPTIONS:MSKK10} -PLIST_SUB+= SKK8="@comment " SKK10="" -.else -PLIST_SUB+= SKK8="" SKK10="@comment " -.endif - -.if ${PORT_OPTIONS:MDBSKKD} -RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:japanese/dbskkd-cdb -.elif ${PORT_OPTIONS:MRSKKSERV} -RUN_DEPENDS= ${LOCALBASE}/libexec/rskkserv:japanese/rskkserv +PLIST_SUB+= SKK8="@comment " .else -RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:japanese/skkserv +PLIST_SUB+= SKK8="" .endif post-patch: @@ -49,7 +49,7 @@ post-patch: ${WRKSRC}/Skkinput.conf .endif -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/skkinput3/distinfo b/japanese/skkinput3/distinfo index 3d0ecb9bbcfb..42886075322b 100644 --- a/japanese/skkinput3/distinfo +++ b/japanese/skkinput3/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1719957097 SHA256 (skkinput-3.0.6.tar.gz) = 619b2725846bb8d31ed376c6643e22115a44acf8829e582591df04af7d868837 SIZE (skkinput-3.0.6.tar.gz) = 644769 diff --git a/japanese/skkinput3/files/patch-Imakefile b/japanese/skkinput3/files/patch-Imakefile index 311153b2e29a..02e5235f483a 100644 --- a/japanese/skkinput3/files/patch-Imakefile +++ b/japanese/skkinput3/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Sun Jul 21 02:47:26 2002 -+++ Imakefile Wed Aug 14 15:48:59 2002 -@@ -23,8 +23,8 @@ +--- Imakefile.orig 2002-12-06 16:48:21 UTC ++++ Imakefile +@@ -37,8 +37,8 @@ OBJS = main.o SRCS = main.c OBJS = main.o diff --git a/japanese/skkinput3/files/patch-Skkinput.conf b/japanese/skkinput3/files/patch-Skkinput.conf index 92dfc41f3f06..5634f584f569 100644 --- a/japanese/skkinput3/files/patch-Skkinput.conf +++ b/japanese/skkinput3/files/patch-Skkinput.conf @@ -1,5 +1,5 @@ ---- Skkinput.conf.orig Fri Jan 10 23:57:00 2003 -+++ Skkinput.conf Tue Jan 21 21:06:51 2003 +--- Skkinput.conf.orig 2003-01-30 16:38:00 UTC ++++ Skkinput.conf @@ -1,6 +1,6 @@ /* skk.el, init.el install directory */ @@ -8,7 +8,7 @@ /* If you want skk10.62a compatible mode, * uncomment UseSkk10 and comment UseSkk8. -@@ -10,7 +10,7 @@ +@@ -10,7 +10,7 @@ XCOMM #define UseSkk10 YES /* Skkinput3 Window uses these fonts. */