ports/118633: [patch] games/adgali unbreak fix build with GCC 4.2 + adopt maintainship

[Pietro Cerutti]

>Number:         118633
>Category:       ports
>Synopsis:       [patch] games/adgali unbreak fix build with GCC 4.2 + adopt maintainship
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 12 23:30:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #16: Mon Dec 10 15:59:52 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


The following patch:

- fixes a "cast used as lvalue" error
- fixes a few "static declaration follows non-static declaration" errors
- adds dependency on devel/libexecinfo
- sets maintainship to me

Tested on:

- 8.0-CURRENT i388
- 7.0-BETA3 sparc64


>How-To-Repeat:





>Fix:


--- _adgali.diff begins here ---
--- Makefile.orig	2007-12-12 23:37:55.000000000 +0100
+++ Makefile	2007-12-13 00:06:49.000000000 +0100
@@ -12,13 +12,14 @@
 CATEGORIES=	games devel
 MASTER_SITES=	http://adgali.apiou.org/download/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	gahr at gahr.ch
 COMMENT=	An open source game library useful for 2D game development
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
@@ -28,18 +29,14 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
 CONFIGURE_ARGS=	--enable-compile-optim=no
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		"Does not build with gcc 4.2"
-.endif
-
 .if ${ARCH} == "alpha" && ${OSVERSION} >= 502102
-BROKEN=		"Configure fails"
+BROKEN=		Configure fails
 .endif
 
 post-install:
--- /dev/null	2007-12-13 00:06:52.000000000 +0100
+++ files/patch-src-input-fontio_agl_bfontio.c	2007-12-12 23:47:56.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/input/fontio/agl_bfontio.c	2007-12-12 23:43:53.000000000 +0100
++++ src/input/fontio/agl_bfontio.c.orig	2007-12-12 23:43:41.000000000 +0100
+@@ -387,7 +387,7 @@
+ 	return 0;
+ }
+ 
+-static agl_fontio agl_bfnt_fontio = {
++agl_fontio agl_bfnt_fontio = {
+ 	agl_bfntis,
+ 	agl_bfntopen,
+ 	agl_bfntloadglyph,
--- /dev/null	2007-12-13 00:06:52.000000000 +0100
+++ files/patch-src-input-fontio_agl_ttfio.c	2007-12-12 23:43:26.000000000 +0100
@@ -0,0 +1,11 @@
+--- src/input/fontio/agl_ttfio.c.orig	2007-12-12 23:42:15.000000000 +0100
++++ src/input/fontio/agl_ttfio.c	2007-12-12 23:43:00.000000000 +0100
+@@ -481,7 +481,7 @@
+ 	return 1;
+ }
+ 
+-static agl_fontio agl_ttf_fontio = {
++agl_fontio agl_ttf_fontio = {
+ 	agl_ttfis,
+ 	agl_ttfopen,
+ 	agl_ttfloadglyph,
--- /dev/null	2007-12-13 00:06:52.000000000 +0100
+++ files/patch-src_agl_main.c	2007-12-12 23:47:13.000000000 +0100
@@ -0,0 +1,12 @@
+--- src/agl_main.c.orig	2007-12-12 23:45:13.000000000 +0100
++++ src/agl_main.c	2007-12-12 23:47:00.000000000 +0100
+@@ -65,7 +65,8 @@
+ 	if (agl_initparachute() < 0)
+ 		return -1;
+ 
+-	*phandle = (agl_handle) handle = (agl_container *) agl_malloc(sizeof(agl_container));
++	handle = agl_malloc(sizeof(agl_container));
++	*phandle = (agl_container *)handle;
+ 	if (*phandle == NULL)
+ 	{
+ 		agl_memerr();
--- _adgali.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: