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.
freebsd · Apr 17, 2023 · 4c0701d · 4c0701d
1 parent ae458da
commit 4c0701d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git 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
diff --git a/lang/lafontaine/files/patch-src_mc.c 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.<br>
diff --git 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,23 +15,23 @@
 
 
  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:
 +	break;
      }
 
  }
-@@ -176,6 +183,7 @@
+@@ -176,6 +183,7 @@ void rc_parse_coresave(GScanner *scanner)
  	  printf("coredump file: %s\n", keyval.value);
  	  break;
  	default:
 +		break;
  	}
      }
 
-@@ -203,6 +211,7 @@
+@@ -203,6 +211,7 @@ void rc_parse_history(GScanner *scanner)
  	  printf("history file: %s\n", keyval.value);
  	  break;
  	default: