From nobody Sun Aug 06 18:30:49 2023 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 4RJp1556Qgz4mD9r; Sun, 6 Aug 2023 18:30:49 +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 4RJp154cD9z4N0W; Sun, 6 Aug 2023 18:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691346649; 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=dhmX6N+GP7AYI6Fuz33sGlh+9OUbt7NL2GoSFvYOlog=; b=Za0HA2sXdxifJ1ZqdT0bFsH5tROj9VZHtko0I2pmCwYa4S1/g+BPq3xSPrBataYz5xdq+u a6Puj1MqEuYEjsI5BWWeOCZqoy8VBwdpQBqAQFWOJ5eQPn35kKInAQaTZuTGlwEz+0aT/0 YL6zWifKS0qV0s4hUg6U2vOdTcHmJyIFA9fU5puY/n469f8qdey/VfvXN+PmvsseKjBw9l 5J9NdnsjxAT5kZM8q4dYrywcZDJ88lLVw8uLulLYrtlwE7c9laDIS9bygkbZ07YNpOcYzC 5jLF4bzNxkQpPZV7A7BYt6Q6wT9KESO4vQTVh7xoHfO7YffAIny3JtAUNjRE8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691346649; 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=dhmX6N+GP7AYI6Fuz33sGlh+9OUbt7NL2GoSFvYOlog=; b=FlnskoEqSoYIVkcfDrujklHJOpfLOc3ZCKgQyQd6zIi9q5V2PpgmNHzzGRySr5Vltcnm5b 3B7x0IdZqoOKDOI9gj2+HBUxXvLjulV/lweE906+zEXUFIm+asIImGRkdvmpD544bZamSO tGdf7yLPfONYWeQhKTe4qudyqpbAumB5h/XLcmY72+IJ5fj7adZt3wO0PAgPzp8yu1sxlz lknw5nHfC0pduFvg6kRElMRUKwXPHpJ2GqRxXQ6kodghUeE+bvxSqd5ggxOHtVAF27OSFO y5Z1RiO9Xcnu3FUT5G6XjW8WOr8UhgU3M8byNM+/J3xaVgg0rcNl+EIo+kCe8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691346649; a=rsa-sha256; cv=none; b=XAYkpc2lA/nRALnuS5yM7Ygv/BObOyfbtcc9zY8BVjeOcUG2cFlrDJWEYH3UyfKK0PzbNb TQ6S0ZaisG983WJ7hLwth1Dycxh5CxSxel0LSAx0uXhjkIYnyWQXkAQDqcl+xS7trQsyG8 l0xH+WsKV8k4dUO6qiODjWBBHE7VKbwGeTH0CGjmpVZDvrPMd3DMxBKz683P4WUw5cOIND lkaVLHT8aGf6/FP9/G+ocv2Y/EEoWSuqmoczrVr6W+BY8Of21vehJmZJwD8vrQY/deaQhw abAePhEf3wTbfPFC45KYSoWKGYwCskvUGeOe0HfMiMhCQxdHj8WGJ8yTqvTYAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RJp153jRYz5Sl; Sun, 6 Aug 2023 18:30:49 +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 376IUnEL034222; Sun, 6 Aug 2023 18:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376IUnQg034221; Sun, 6 Aug 2023 18:30:49 GMT (envelope-from git) Date: Sun, 6 Aug 2023 18:30:49 GMT Message-Id: <202308061830.376IUnQg034221@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: a48a24ba4189 - main - japanese/nethack34: Fix build with llvm16 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a48a24ba4189a7992211bc945e0ac728077c6087 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=a48a24ba4189a7992211bc945e0ac728077c6087 commit a48a24ba4189a7992211bc945e0ac728077c6087 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-06 18:11:48 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-06 18:30:38 +0000 japanese/nethack34: Fix build with llvm16 - Utilize OPTIONSNG where possible - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- japanese/nethack34/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index 68fa37aed15d..66d361672f41 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -35,12 +35,14 @@ OPTIONS_DEFAULT=SHELL X11 SHELL_DESC= Shell support +X11_USES= xorg +X11_USE= XORG=xaw,xpm +X11_VARS= GRAPHICS=X11_GRAPHICS + .include -.if ${PORT_OPTIONS:MX11} -USES+= xorg -USE_XORG= xaw xpm -GRAPHICS= X11_GRAPHICS +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-patch: @@ -51,14 +53,14 @@ post-patch: ${WRKSRC}/sys/unix/Makefile.doc @${REINPLACE_CMD} -e 's|||g' \ ${WRKSRC}/win/Qt/qt_win.cpp -.if ! ${PORT_OPTIONS:MSHELL} + +post-patch-SHELL-off: @${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' \ ${WRKSRC}/include/unixconf.h -.endif -.if ! ${PORT_OPTIONS:MX11} + +post-patch-X11-off: @${REINPLACE_CMD} -e 's|# define XI18N|/* # define XI18N|' \ ${WRKSRC}/include/config.h -.endif do-configure: (cd ${WRKSRC}/sys/unix && ${SH} setup.sh) @@ -68,10 +70,10 @@ post-install: ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages) ${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad \ ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/JNetHack -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} README.j ChangeLog.j INSTALL.j \ doc/Guidebook.txt doc/jGuidebook.txt ${STAGEDIR}${DOCSDIR}) -.endif .include