From 3ba7474585209e6b82a0fc94bec4b9e30125a975 Mon Sep 17 00:00:00 2001
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Fri, 26 Oct 2007 05:50:01 +0000
Subject: Fix a memory corruption/core dump that is reproduceable in my
 FreeBSD/amd64 6-stable environment [1].  Unbreak the port.

Submitted by:	Matthew Flatt <mflatt at cs dot utah dot edu> [1]
---
 lang/drscheme/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lang/drscheme')

diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index cb6509d84b58..6f2a08c67d01 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -28,18 +28,17 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft	\
 		jpeg.9:${PORTSDIR}/graphics/jpeg	\
 		png.5:${PORTSDIR}/graphics/png
 
-BROKEN=		Segfault during build
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-shared --enable-xft --enable-gl \
 		--enable-xrender --enable-cairo --with-x --enable-pthread \
 		--enable-lt=${LIBTOOL} \
 		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+		CPPFLAGS="${CPPFLAGS}"
 
 # Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
 LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/plt-${PORTVERSION}/src
 USE_ICONV=	yes
@@ -68,4 +67,8 @@ PLIST_SUB+=		CGC=""
 PLIST_SUB+=		CGC="@comment "
 .endif
 
+.if ${ARCH} == "amd64"
+CPPFLAGS+=	-DLONG64
+.endif
+
 .include <bsd.port.post.mk>
-- 
cgit v1.2.3