From nobody Mon Apr 17 09:30:34 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 4Q0MGz0p8Qz45dkp; Mon, 17 Apr 2023 09:30:35 +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 4Q0MGy4N7nz43cJ; Mon, 17 Apr 2023 09:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723834; 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=HguwPaDhInhxfHlQxQ00eLYN5/UlrUVVy3VJ0b3xb/E=; b=AXZnGtiP8q615SlqJJPYWHN2wkuYZ5aOx6dFDTPJiXjQAirmdzhDEVaRxIkFMJOth6xiir 9ZBhBqynifGdLH2kaQWgl9oUyFTLYmX24PngVrC0WBXyO+qaARwx4KSN1j3L9AescLsaH4 A95mLpqMg/LNeBYPA3l+rvflaur0meb+tPNyAX978yn+Cassl71FHDcYw4e2QvR8ILQAOl pkbKCX3BbA3Q/aIufBbofyDdosK+jhZUPSJY0+RG6L+uYuH7Noe9p+pflM6k0m454WgteD +2/lWzyXMpXWKqMSkYzXwhm/WOa/hbJEOLk/0VaplNQCtt2o4hS7UQoH6aKgfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723834; 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=HguwPaDhInhxfHlQxQ00eLYN5/UlrUVVy3VJ0b3xb/E=; b=ETPiROsQ56bxmLrN2h/f8o2ljfdZjhhZXA4I7iSg4pK/Q8IRZNnCAAJ0Bl+ppSTlKwH/+o +/ouPIte2s3BTyonlsS9RuH7mlcUotDvCZgvH10yBSE63GHlWh1RI5ScMjWJ3pfF9q+DER 1gqf9y5BTOuhOJ+xxLOntv2fnHVevIgwMhcQEu4lm6ns1EcTQ6cc6JxtAbQ5W4KOvFMoDo B2cUF4d8s70Kj3d7xXcHtfnlGerIhHsZfmU6A68Git0EQaOZWs4qZMi1VGFKubTWtJEsyj HuYJZEQuufgzCZKua1s9fQLYI/OI0wWGlUcMd03tLe83gbIXsMQS6mGbarMKkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681723834; a=rsa-sha256; cv=none; b=h+tfkl5is2/+XEu3ZmcYj/lzFaBWWL1TSal/ty0lWiZWwxHsYiJiI+gzU98Yd3er1xwSf9 uLPGrhYDR1zYEOlamU8jiPs6fzFbEZhJmi5HlLUkf2x2jn2HY84xxWREi9HOtqV2QJEnDZ 8crXTLnfQ6GUYa5ZxHNEga/7mI9madoKATEw9QTS7Av2atWw8US10Ghpwg02NzlSgWv8l9 P/+z3G7NPGkofsnwXfpYjraPDRbl9yAA/Idohr2frWPDd+vcCqM6ZdRpL4pvE6FfVFsZlu OpnfZCmaDWUPJd3JqcmL8ZqrVNZQvDZBa2N2TQ75uYwSA79Q2eqtfuZz/NKWkA== 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 4Q0MGy2Bc2zPFF; Mon, 17 Apr 2023 09:30:34 +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 33H9UYuL051595; Mon, 17 Apr 2023 09:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H9UY5n051594; Mon, 17 Apr 2023 09:30:34 GMT (envelope-from git) Date: Mon, 17 Apr 2023 09:30:34 GMT Message-Id: <202304170930.33H9UY5n051594@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: 4c0701da9093 - main - lang/lafontaine: fix build with -fcommon 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: 4c0701da9093218a5e39f64a4441803d3bbd2238 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c0701da9093218a5e39f64a4441803d3bbd2238 commit 4c0701da9093218a5e39f64a4441803d3bbd2238 Author: Robert Clausecker AuthorDate: 2023-04-16 14:03:55 +0000 Commit: Robert Clausecker CommitDate: 2023-04-17 09:27:26 +0000 lang/lafontaine: fix build with -fcommon Turn two duplicate definitions into declarations. This fixes the build with FreeBSD 13+. Add missing LIB_DEPENDS and USE_GNOME entries. Define LICENSE. --- lang/lafontaine/Makefile | 19 +++++++++++-------- lang/lafontaine/files/patch-mc.c | 10 ---------- lang/lafontaine/files/patch-src_mc.c | 13 +++++++++++++ lang/lafontaine/files/patch-src_rc.c | 16 +++++++++------- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile index f21f2856cb73..bfa3557dab05 100644 --- a/lang/lafontaine/Makefile +++ b/lang/lafontaine/Makefile @@ -1,24 +1,27 @@ PORTNAME= lafontaine -PORTVERSION= 0.4.1 -PORTREVISION= 10 +DISTVERSION= 0.4-1 +PORTREVISION= 11 CATEGORIES= lang MASTER_SITES= http://www.nongnu.org/lafontaine/archives/ -DISTNAME= ${PORTNAME}_0.4-1 +DISTNAME= lafontaine_${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Graphical logo interpreter WWW= https://www.nongnu.org/lafontaine/en/eubaout.html -BROKEN_FreeBSD_13= ld: error: duplicate symbol: my_turtle -BROKEN_FreeBSD_14= ld: error: duplicate symbol: my_turtle +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -WRKSRC= ${WRKDIR}/${PORTNAME}-0.4 +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gmake gnome pathfix pkgconfig -USE_GNOME= gtk20 -GNU_CONFIGURE= yes USE_CSTD= gnu89 +USE_GNOME= cairo gdkpixbuf2 gtk20 +GNU_CONFIGURE= yes LDFLAGS+= -lm +WRKSRC= ${WRKDIR}/${PORTNAME}-0.4 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/lang/lafontaine/files/patch-mc.c b/lang/lafontaine/files/patch-mc.c deleted file mode 100644 index 89863a045ea7..000000000000 --- a/lang/lafontaine/files/patch-mc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/mc.c.orig Sun Aug 15 20:00:39 2004 -+++ src/mc.c Sun Aug 15 20:01:11 2004 -@@ -36,6 +36,7 @@ - /*>>> here is the declaration of the turtle */ - struct s_turtle my_turtle; - -+void mc_free(void); - - /** - Freeing and reinitializing all middle-code informations.
diff --git a/lang/lafontaine/files/patch-src_mc.c b/lang/lafontaine/files/patch-src_mc.c new file mode 100644 index 000000000000..96e02f8f5086 --- /dev/null +++ b/lang/lafontaine/files/patch-src_mc.c @@ -0,0 +1,13 @@ +--- src/mc.c.orig 2002-05-18 22:11:05 UTC ++++ src/mc.c +@@ -34,8 +34,9 @@ + #include "debug.h" + + /*>>> here is the declaration of the turtle */ +-struct s_turtle my_turtle; ++extern struct s_turtle my_turtle; + ++void mc_free(void); + + /** + Freeing and reinitializing all middle-code informations.
diff --git a/lang/lafontaine/files/patch-src_rc.c b/lang/lafontaine/files/patch-src_rc.c index 1c05514eb02b..f1556a97c7d9 100644 --- a/lang/lafontaine/files/patch-src_rc.c +++ b/lang/lafontaine/files/patch-src_rc.c @@ -1,9 +1,11 @@ ---- src/rc.c.orig Thu Jul 27 22:40:17 2006 -+++ src/rc.c Thu Jul 27 22:43:36 2006 -@@ -39,6 +39,12 @@ +--- src/rc.c.orig 2002-09-17 20:06:21 UTC ++++ src/rc.c +@@ -38,7 +38,13 @@ + #include "turtle.h" #include "rc.h" - struct s_turtle my_turtle; +-struct s_turtle my_turtle; ++extern struct s_turtle my_turtle; +void rc_parse_group(GScanner *scanner); +void rc_parse_coresave(GScanner *scanner); +void rc_parse_history(GScanner *scanner); @@ -13,7 +15,7 @@ static const GScannerConfig gtk_rc_scanner_config = -@@ -152,6 +158,7 @@ +@@ -152,6 +158,7 @@ void rc_parse_group(GScanner *scanner) rc_parse_coresave(scanner); break; default: @@ -21,7 +23,7 @@ } } -@@ -176,6 +183,7 @@ +@@ -176,6 +183,7 @@ void rc_parse_coresave(GScanner *scanner) printf("coredump file: %s\n", keyval.value); break; default: @@ -29,7 +31,7 @@ } } -@@ -203,6 +211,7 @@ +@@ -203,6 +211,7 @@ void rc_parse_history(GScanner *scanner) printf("history file: %s\n", keyval.value); break; default: