From f8357b5cbaa160ccdf9943cac099f5e092c591da Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Tue, 26 Aug 2014 14:06:08 +0000
Subject: - Fix missing library problems when the linker enforces explicit
 linking

PR:		192062
Exp-run by:	antoine
Approved by:	portmgr (antoine)
---
 finance/grisbi/Makefile                    | 6 +++---
 finance/xtrader/Makefile                   | 1 -
 finance/xtrader/files/patch-Makefile.linux | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'finance')

diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index a4ffd85c23a5..5f9f4c9894f1 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -19,10 +19,10 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 glib20 libxml2
 USE_OPENSSL=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
+CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
 
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index ef4bbcd8cb75..01d2b2c46eeb 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Technical analysis program for financial instruments
 LIB_DEPENDS=	libptypes.so:${PORTSDIR}/devel/ptypes \
 		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
 
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	Makefile.linux
 USE_XORG=	x11 xpm
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
diff --git a/finance/xtrader/files/patch-Makefile.linux b/finance/xtrader/files/patch-Makefile.linux
index 25fcad4a1e59..387ee358495e 100644
--- a/finance/xtrader/files/patch-Makefile.linux
+++ b/finance/xtrader/files/patch-Makefile.linux
@@ -6,11 +6,11 @@
 -CFLAGS=			-march=i586 -O3 -Wall -Wno-format-y2k
 -LFLAGS=			-L/usr/local/lib -lz -lfltk -lptypes  -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft
 -LFLAGS2=		-L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread
-+COMP=			$(CC)
++COMP=			$(CXX)
 +IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes
 +CFLAGS:=			$(CFLAGS) -Wno-format-y2k
-+LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes  -lexpat -lm -lXpm -lX11  $(PTHREAD_LIBS) -lXft -lcompat
-+LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11  $(PTHREAD_LIBS)
++LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 -pthread -lXft -lcompat
++LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 -pthread
  XTRADER=		xtrader
  XTRADER2=		xtrader.static
  
-- 
cgit