From nobody Sun Jan 07 17:58:42 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 4T7Q0z0qhMz55Y0R; Sun, 7 Jan 2024 17:58:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T7Q0z0KwGz4WY8; Sun, 7 Jan 2024 17:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704650323; 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=vo/biLq9/pZ3C2//VoSQ70J8mBAx737wcgBC00a+dMQ=; b=aR0xltOGEF5lXa1o5zRHlnSvYAkNufSrp3hoFcoGAqc/x8BGTAPH1Jon5ZZKPC/vzHq0Uz 2fDHOyjR+OSiCn6+gxLhK5ZbAgNxY3jf2HCxmFdT81U1KhhT7YoXnfUR0bcUQUBdrNVji9 wnjSCz+qUIieaizt4F5cpB+X/LUt3uv2ji9UDidRKwNvCa8mVcmJ1cJkSXgch3XbC4mPE/ UNxc/vngF8McG8FqDxcVISldviU3WtAD2viVgiM1dDqvNuEBUOJd0KKmXGvmkG9GCnDiVs H/LlhPffmtgu3ovH7ui2E+f6rTerXa1cd9DozvLCcsfqzwCm1eBSMRyYD9E9Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704650323; 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=vo/biLq9/pZ3C2//VoSQ70J8mBAx737wcgBC00a+dMQ=; b=Q6T1ztxFqhA+ZnTHctBbKTpSFf50EIMKFGDMwqjVKM0N/xcU+muhBUhAl8rCvKHICh1rmR KlN5Jpm8d+kKvCkUZqqQM1sRVC3b2t9jyIht+MeBjELMLli/PSOPqjq5f1WQZNMUZ8b1p+ r2bT0MMxwq/1BaIrczrBE18uE3nH0m0oNLa91KuvH70lLDElqLAOd2If+0VYDzsNcSV1sd hfaU1jtKOSRi3C9U0a8HSgzgriPz4pKC7lNQ5d+pDsTyhPORhtg8p/r25YCCNIihzBmN47 UWwUA0jZPnvZ7L1RYTIRjR7Uj5P00n7nfJljoNXnCNBKDIP+tu5+nie0rk5rDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704650323; a=rsa-sha256; cv=none; b=QCmBaVVqvxbB5a0GDJ01n5e+PxiF4FbjLW1Tyv1NucSgmP4o2xlPWKJdNYo5wRpKp97l6c ANx+Z+27yiAspNh0PrDjxhRggIto4Y83qUHMkr/YyUvDE4cBKOGrn3xR3CqPt89VOD8ZJo DPuM3miW/g1Lsxg4+KH876cN7qV4qO42g+RA9zNfDtm+Pr/S8LCaSgNQmW+BrdQJCOqnxg 8rskf48mcYLWum2xy/+7VAZfJNSHyVIJmoE5WaH+mubtp4a0tFW9qiNHMfx6L1H9wjKM+8 d/4xyvP/HsRdT1MbFJNxy2AQkLBsSRfap4E3iKg+5eJB8YJMqQ5W8fgimbeKFA== 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 4T7Q0y6VxkzYww; Sun, 7 Jan 2024 17:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 407HwgpO031514; Sun, 7 Jan 2024 17:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407Hwgv9031511; Sun, 7 Jan 2024 17:58:42 GMT (envelope-from git) Date: Sun, 7 Jan 2024 17:58:42 GMT Message-Id: <202401071758.407Hwgv9031511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: 4db42899e7c3 - main - japanese/nkf: Update to 2.1.5 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4db42899e7c311b8a09ec033e4d2ac4da6d73c78 Auto-Submitted: auto-generated The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=4db42899e7c311b8a09ec033e4d2ac4da6d73c78 commit 4db42899e7c311b8a09ec033e4d2ac4da6d73c78 Author: Hiroki Sato AuthorDate: 2024-01-07 17:56:50 +0000 Commit: Hiroki Sato CommitDate: 2024-01-07 17:58:29 +0000 japanese/nkf: Update to 2.1.5 --- japanese/nkf/Makefile | 14 +++++++++----- japanese/nkf/distinfo | 6 +++--- japanese/nkf/files/patch-Makefile | 31 ++++++++++++++++++------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile index 6a372564a8d2..252f40542353 100644 --- a/japanese/nkf/Makefile +++ b/japanese/nkf/Makefile @@ -1,17 +1,21 @@ PORTNAME= nkf -PORTVERSION= 2.1.4 +PORTVERSION= 2.1.5 PORTEPOCH= 1 CATEGORIES?= japanese -MASTER_SITES= OSDN/${PORTNAME} MAINTAINER= hrs@FreeBSD.org COMMENT= Network Kanji code conversion Filter -WWW= https://sourceforge.jp/projects/nkf/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/nkf.c -MAKE_ENV= MKDIR="${MKDIR}" -PLIST_FILES= bin/nkf man/man1/nkf.1.gz man/ja/man1/nkf.1.gz +USES= iconv +USE_GITHUB= yes +GH_ACCOUNT= nurse +GH_TAGNAME= v${PORTVERSION:C/\./_/g} + +MAKE_ENV= MKDIR="${MKDIR}" \ + ICONV_CMD="${ICONV_CMD}" +PLIST_FILES= bin/nkf man/man1/nkf.1.gz man/ja.UTF-8/man1/nkf.1.gz .include diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo index 7b358dd83a6b..bf72f93062bf 100644 --- a/japanese/nkf/distinfo +++ b/japanese/nkf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519798662 -SHA256 (nkf-2.1.4.tar.gz) = b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb -SIZE (nkf-2.1.4.tar.gz) = 232479 +TIMESTAMP = 1704649242 +SHA256 (nurse-nkf-2.1.5-v2_1_5_GH0.tar.gz) = 10cf6eb3d4d095919185ac224d5a634e9926d731e656d04bacb270e5cae0e28c +SIZE (nurse-nkf-2.1.5-v2_1_5_GH0.tar.gz) = 250895 diff --git a/japanese/nkf/files/patch-Makefile b/japanese/nkf/files/patch-Makefile index 679fe3bfe5cc..dc419584d000 100644 --- a/japanese/nkf/files/patch-Makefile +++ b/japanese/nkf/files/patch-Makefile @@ -1,25 +1,26 @@ ---- Makefile.orig 2015-12-12 13:51:41 UTC +--- Makefile.orig 2018-12-15 09:19:02 UTC +++ Makefile -@@ -1,18 +1,23 @@ +@@ -1,18 +1,24 @@ -CC = cc -CFLAGS = -g -O2 -Wall -pedantic -+CC? = cc -+CFLAGS? = -g -O2 -Wall -pedantic ++CC ?= cc ++CFLAGS ?= -g -O2 -Wall -pedantic # CFLAGS = -O3 SHAR = shar # SHAR = shar -T PERL = perl RM = rm -rf - VERSION = 2.1.4 + VERSION = 2.1.5 -MKDIR = mkdir -prefix = /usr/local -+MKDIR? = mkdir ++MKDIR ?= mkdir +prefix = $(DESTDIR)$(PREFIX) +manprefix = $(DESTDIR)$(MANPREFIX) PYTHON2 = python PYTHON3 = python -+BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555 -+BSD_INSTALL_MAN?= ${INSTALL} -o root -g wheel -m 444 ++BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555 ++BSD_INSTALL_MAN?= ${INSTALL} -o root -g wheel -m 444 ++ICONV_CMD?= iconv .PHONY: clean install test tar shar @@ -28,7 +29,7 @@ nkf : nkf.o utf8tbl.o $(CC) $(CFLAGS) $(LDFLAGS) -o nkf nkf.o utf8tbl.o -@@ -47,17 +52,17 @@ install: install-main install-man instal +@@ -47,17 +53,20 @@ install-main: install-main: -$(MKDIR) $(prefix)/bin @@ -43,13 +44,17 @@ + -$(MKDIR) $(manprefix)/man/man1 + ${BSD_INSTALL_MAN} nkf.1 $(manprefix)/man/man1/ - install-man-ja: +-install-man-ja: - -$(MKDIR) $(prefix)/man/ja - -$(MKDIR) $(prefix)/man/ja/man1 - cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1 -+ -$(MKDIR) $(manprefix)/man/ja -+ -$(MKDIR) $(manprefix)/man/ja/man1 -+ ${BSD_INSTALL_MAN} nkf.1j $(manprefix)/man/ja/man1/nkf.1 ++nkf.1u: nkf.1j ++ ${ICONV_CMD} -f iso-2022-jp -t utf-8 < $? > $@ ++ ++install-man-ja: nkf.1u ++ -$(MKDIR) $(manprefix)/man/ja.UTF-8 ++ -$(MKDIR) $(manprefix)/man/ja.UTF-8/man1 ++ ${BSD_INSTALL_MAN} nkf.1u $(manprefix)/man/ja.UTF-8/man1/nkf.1 shar: -mkdir nkf-$(VERSION)