From nobody Mon Apr 17 09:30:31 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 4Q0MGw6DC9z45dnb; Mon, 17 Apr 2023 09:30:32 +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 4Q0MGw39Dkz43Wb; Mon, 17 Apr 2023 09:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723832; 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=p7t0JH0LknSt3Ok1XWW8o719b5sQU/XDvvDko5ZagFQ=; b=Tno+QwMBgVfLJeRsCGInydmhWJ74i42XeEm+2yErB1Z7SSZJ+ShL+lcEM/SyyHK2rooJmn Wn9wBCfZtCthybcaBBJankjslQtYaKuRt2nZt5V1u5jN/NVKkSS/awQoVBrrhI8a0ewwof C9e3kt0rQl0CqywT9ddPU1O017d0yInD9Vn9+p2lLhqH0HwOo6VGLjOfRgwJ2JzzIKmGQJ aCKAt+ODZtWhFd+4GlW4SGKpd+AW1KdPyiULCVN71OA1rgDfkCZKtwlbX9vJ7kWekjgD4L ww+mEXoBucR5t/9i+ZCwknnezCf2bz6vVcBvnTJePy/4nyV6NFTiKO/66LsM5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723832; 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=p7t0JH0LknSt3Ok1XWW8o719b5sQU/XDvvDko5ZagFQ=; b=I7QVlWs7X9WjZrvissTJN43kLxzR/A1ydIf/xJTaPeu9iJ952LhXzRkeXpmFcX7O0Ud+T4 0byiAWhgxOroVNwjKBin2OwPlRZthJZihlNpisyxvJO3+F/d3falYVhodIanFbT74E1KHe rY4e8lliGyuNJtost8Q+1CFwQE4r/KFOmQcrjpaVEBKIEYDvSg105Z0SCbfgixjYKOBdAl QFysUCKOcU9Ke7UYoomFI9Z/8FsG/F1SrqJZesyUXvTo2012+bKpTvSwtXiQIXPmX7uQNE 6DiswISq1vQ/ddn6g4djjimHTYL7m/h1WqOg7l1myc9nWM3YYJbb415OVyUkVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681723832; a=rsa-sha256; cv=none; b=izqE2qUXESdMAH9Op9oZXv2MKeN2eSeM1DtoONAfAWXL0kQQTQ2E4N66VR3kGvbljFsXVX QtE5QinhmnDnzrgmmFHhX/KPBVaxu09tcMLUKfvruJ/KO6gKqf1Z1pnqQtcWkMqVoD3YMo 7IJwAkSCh6JBqxCNBn90+kjjTD1bp4UYqFMtNnc4owmuKCExek7ZACxY4x7vZuVHECINa0 F8RLgvgKfUULxY8dhnbfYg+VeGNpLLKLxlMIQipZeahIB+GSahSauv1bBhuE+ntDJJRFWj 01BvALiQUg5b0QRs/B+icNlD31BO9Sg1ZBrssMbC8zhpJBBH/BXyw+9PuWa6Kg== 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 4Q0MGw0814zNdL; Mon, 17 Apr 2023 09:30:32 +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 33H9UVYZ051550; Mon, 17 Apr 2023 09:30:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H9UViJ051549; Mon, 17 Apr 2023 09:30:31 GMT (envelope-from git) Date: Mon, 17 Apr 2023 09:30:31 GMT Message-Id: <202304170930.33H9UViJ051549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 81fea4f465ec - main - japanese/jishyo: work around duplicate symbol issue 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81fea4f465ecf09a31f99688d691c9fdd5430be3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=81fea4f465ecf09a31f99688d691c9fdd5430be3 commit 81fea4f465ecf09a31f99688d691c9fdd5430be3 Author: Robert Clausecker AuthorDate: 2023-04-16 13:38:53 +0000 Commit: Robert Clausecker CommitDate: 2023-04-17 09:27:26 +0000 japanese/jishyo: work around duplicate symbol issue - add -fcommon to CPPFLAGS to enable a build with recent clang/gcc - this fixes the build on FreeBSD 13+ - add missing GNUstep dependencies --- japanese/jishyo/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile index 46d771fbb40d..6dea4597a5a4 100644 --- a/japanese/jishyo/Makefile +++ b/japanese/jishyo/Makefile @@ -1,6 +1,6 @@ PORTNAME= jishyo PORTVERSION= 0.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= japanese gnustep MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/ DISTNAME= Jishyo-${PORTVERSION} @@ -11,13 +11,12 @@ WWW= https://www.eskimo.com/~pburns/Dictionaries/ LICENSE= GPLv2+ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: DicDir -BROKEN_FreeBSD_14= ld: error: duplicate symbol: DicDir - PORTSCOUT= skipv:0.2 USES= gnustep -USE_GNUSTEP= back build +USE_GNUSTEP= back base build gui + +CPPFLAGS+= -fcommon post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Jishyo.app/Jishyo