From nobody Sun May 14 17:39:53 2023 X-Original-To: dev-commits-ports-all@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 4QK8s56yg3z4Bwmx; Sun, 14 May 2023 17:39:53 +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 4QK8s56R1bz3HFL; Sun, 14 May 2023 17:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684085993; 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=tsB6I9zUDVZxB+P03QRE1B24HtmBxyoAOfqUteQLsHs=; b=jKpXWxqS0w2X8DbSuBeWZODuDIyFWAOSMC3VCuzbBYvy0g7oY6wSwfVqEB/oyfeCDZEUpv jEbAIPk5SbXVhaTlOPR5c/m/6A2LwudS/KHtNPc99txqGFPEERtJfNSZ+VwcZkI16ihRWf kib5dalEHqVFOwZit6jVLmARAqRynTFvYLWUFSOkOAaMfKazxKWCdXaaFOTUACb4I/TTrH f6wiQjwavhfiCbinIprIxic4wmowHrcM8ttF6NnRWv8gFFp+yeoSEL4jY4RT+e+jU9p4W+ 4OVoIgSqniCXQ4jyRk8kSp+a1QFBwMAFWSaTj8sjTsS7O7ZitONpNIqmyVQ0pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684085993; 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=tsB6I9zUDVZxB+P03QRE1B24HtmBxyoAOfqUteQLsHs=; b=K4pggazLAyonAE+be2tcgNwvuhmgmWiBExUVbIsWazZELg9Oiq/Ra845Y4o1cndallLAEE oyBtzu24+rRskbgyR6IcfDT79nZomWnereNadXljSLJ0NweXVAO3ovvhaUn2K8oAW16cUl K8Ms846dZeaguQYVHY1EJ20lxlf4zgP+MG2xQGWForfgVNGpn5wyCHkvoibqjx6Yu2ghks 6WwRQvwoEeRKpu9I0PuMN0nW4o/TaZ/P41Q6eSa2ufZerY1bVyjbl4zdso0LVynPkOzG6m vXM9M8mDqFkSMd6sPOQg48oEpiJMMjG3WCgdB2/JCtTDu9G2lKVnu7sww5xK4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684085993; a=rsa-sha256; cv=none; b=piwcuJAzUTNEYRO7hBQBSp7YUomoHizTLsY77KltmnvsmSN7r9szNsVZT8ykSzx1hWDoej +nLBTLCcuUjrBAsn5r98SaQFytcUl85yHdMaS6zgMBYvLornRoQ5sTznPKRPxJBgbPjbDi 0Nkj7BZrfDAadvqUdK6Shb2w9S2Fn7s/X7dPWQiPAsC5jLnMMLwQUC8DtXIJIqe6Af3WG4 kOBqcp2bIauNOvVssflhzzCgG3qatxSBQ9yn7t0jqsIh9L6jwzRsS9e5Jufu+BdHY5pniA Ql9+4IOkOzPzYYMwwHJz6lUAB69hTRP3xrtwVFMV4wzziMhQgXusceXxiQX87g== 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 4QK8s557jPz16P5; Sun, 14 May 2023 17:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34EHdrIf085335; Sun, 14 May 2023 17:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34EHdrnH085334; Sun, 14 May 2023 17:39:53 GMT (envelope-from git) Date: Sun, 14 May 2023 17:39:53 GMT Message-Id: <202305141739.34EHdrnH085334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6a5421dc0fed - main - japanese/kinput2: Unbreak on HEAD List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a5421dc0fed68b97c03799291c7abc8cf78394d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a5421dc0fed68b97c03799291c7abc8cf78394d commit 6a5421dc0fed68b97c03799291c7abc8cf78394d Author: Muhammad Moinur Rahman AuthorDate: 2023-05-14 17:06:20 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-14 17:39:23 +0000 japanese/kinput2: Unbreak on HEAD - Add LICENSE MIT - Pet portclippy Approved by: portmgr (blanket) --- japanese/kinput2/Makefile | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 24a2f770b4d8..39d90aca2309 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -8,24 +8,31 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= Japanese text input server for X11 applications -MAKE_JOBS_UNSAFE= yes +LICENSE= MIT USES= imake xorg USE_XORG= ice sm x11 xaw xext xmu xpm xt + +MAKE_JOBS_UNSAFE= yes + SUB_FILES= Kinput2.conf PLIST_FILES= bin/kinput2 lib/X11/app-defaults/Kinput2 man/man1/kinput2.1.gz OPTIONS_DEFINE= CANNA FREEWNN WNN6 WNN7 SJ3 TCP OPTIONS_DEFAULT=CANNA FREEWNN SJ3 -TCP_DESC= TCP transport support (not needed for most cases) CANNA_DESC= Canna support +FREEWNN_DESC= FreeWnn support +SJ3_DESC= SJ3 support +TCP_DESC= TCP transport support (not needed for most cases) +WNN6_DESC= Wnn6 support +WNN7_DESC= Wnn7 support + CANNA_LIB_DEPENDS= libcanna16.so:japanese/canna-lib CANNA_CONF= '\#define UseCanna' \ CANNASRC=${LOCALBASE}/include \ CANNALIB="-L${LOCALBASE}/lib -lcanna16" -WNN6_DESC= Wnn6 support WNN6_LIB_DEPENDS= libwnn6.so:japanese/Wnn6-lib WNN6_CONF= '\#define UseWnn' \ '\#define UseWnn6' \ @@ -33,7 +40,6 @@ WNN6_CONF= '\#define UseWnn' \ WNNLIB="-L${LOCALBASE}/lib -lwnn6 -lcrypt" WNN6_PLIST_FILES= ${WNN_PLIST_FILES} -WNN7_DESC= Wnn7 support WNN7_LIB_DEPENDS= libwnn7.so:japanese/Wnn7-lib WNN7_CONF= '\#define UseWnn' \ '\#define UseWnn6' \ @@ -41,14 +47,12 @@ WNN7_CONF= '\#define UseWnn' \ WNNLIB="-L${LOCALBASE}/lib -lwnn7 -lcrypt" WNN7_PLIST_FILES= ${WNN_PLIST_FILES} -FREEWNN_DESC= FreeWnn support FREEWNN_LIB_DEPENDS= libwnn.so:japanese/FreeWnn-lib FREEWNN_CONF= '\#define UseWnn' \ WNNINCDIR=${LOCALBASE}/include/wnn \ WNNLIB="-L${LOCALBASE}/lib -lwnn -lcrypt" FREEWNN_PLIST_FILES= ${WNN_PLIST_FILES} -SJ3_DESC= SJ3 support SJ3_LIB_DEPENDS= libsj3lib.so:japanese/sj3-lib SJ3_CONF= '\#define UseSj3' \ SJ3SRC=${LOCALBASE}/include \ @@ -85,8 +89,14 @@ CONF+= ${${I}_CONF} CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" .endif +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CFLAGS+= -Wno-error=int-conversion +.endif + pre-configure: ${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf ${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf -.include +.include