From 9343e5b1f8d3e95a8ed6bece2b2fb8622669d70c Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Wed, 13 Oct 2004 12:33:21 +0000
Subject: - Fix gcc regression in STABLE

---
 net-im/licq-console/Makefile             | 11 ++++++++++-
 net-im/licq-console/files/patch-window.h | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 net-im/licq-console/files/patch-window.h

(limited to 'net-im')

diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index cba731a9a398..26571163efd0 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -14,10 +14,19 @@ LIB_DEPENDS=	cdk.4:${PORTSDIR}/devel/cdk
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ncurses-based console plugin for Licq
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
 LICQ_PORT?=	net/licq
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+USE_GCC=	3.3
+.endif
+
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net-im/licq-console/files/patch-window.h b/net-im/licq-console/files/patch-window.h
new file mode 100644
index 000000000000..f598519eb3fb
--- /dev/null
+++ b/net-im/licq-console/files/patch-window.h
@@ -0,0 +1,11 @@
+--- src/window.h.orig	Thu Sep 30 03:51:03 2004
++++ src/window.h	Wed Oct 13 14:19:58 2004
+@@ -3,7 +3,7 @@
+ 
+ #include <iostream>
+ extern "C" {
+-#include <cdk.h>
++#include <cdk/cdk.h>
+ }
+ 
+ #define COLOR_YELLOW_BLUE COLOR_YELLOW + 8
-- 
cgit v1.2.3