- Fix WWW: line

- Utilize QTCPPFLAGS/QTCFGLIBS

PR:		56003
Submitted by:	Ports Fury

3 files changed, 14 insertions, 26 deletions

diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index fc2091ada270..6bc2ce794a58 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -16,8 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	One of the better implementations of blackjack, based on QT
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_QT_VER=	3
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
+		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"
 
 MAN1=		blackjack.1
 
diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa
index a3bee52beff9..c9c0d511bf4f 100644
--- a/games/blackjack/files/patch-aa
+++ b/games/blackjack/files/patch-aa
@@ -9,8 +9,8 @@
 -LDFLAGS=-L$(QTDIR)/lib -lqt
 +CC?=gcc
 +CXX?=g++
-+INCLUDES=-I$(X11BASE)/include/ ${PTHREAD_CFLAGS}
-+LDFLAGS=-L$(X11BASE)/lib -lqt-mt ${PTHREAD_LIBS}
++INCLUDES=${QTCPPFLAGS}
++LDFLAGS=${QTCFGLIBS} -lqt-mt
  VERSION=1.2
  
  # For systems that don't have install, use this
diff --git a/games/blackjack/pkg-descr b/games/blackjack/pkg-descr
index c19aca12f580..bf5122a37f8c 100644
--- a/games/blackjack/pkg-descr
+++ b/games/blackjack/pkg-descr
@@ -1,23 +1,9 @@
-
-   This is an X windows based game of the casino game blackjack.
-The program is currently written to use the Qt toolkit from Troll Tech.
-For more information on Qt see "http://www.trolltech.com/".
-
-   I have always enjoyed the game of blackjack.  When I first played in
-a casino I lost all the money I had brought.  After reading some books 
-on blackjack and the FAQ for rec.gambling.blackjack, I now know that there
-is a basic strategy to follow.  The strategy is based on the odds of each
-hand and the dealers up card.  I wrote this program so I could practice
-the basic strategy of blackjack.  The basic strategy is in the program
-and a help level can be set to help the user learn to play by these rules.
-My blackjack game has improved greatly.
-
-   I first wrote this program in tcl/tk.  It was OK, but I have trouble 
-remembering all the syntax and parsing rules.  The tcl/tk version was also
-noticably slow on my 386 running Linux.  Qt has been very good as a C++ 
-GUI library and is not slow at all on my 386. 
-
-Tom Daley
-tdaley@vsys.com
-
-WWW: http://members.surfbest.net/daley/blackjack/blackjack.html
+Blackjack is an X-windows based version of the casino game. The
+program is used to help learn the basic strategy of the game of
+blackjack. The help level can be set from a mode that tells you
+each correct move to make, to one that only warns you by a pop up
+window if you make a "bad" play. Betting limits, number of decks,
+number of splits, and shuffle point can be set. This program uses
+the Qt toolkit.
+
+WWW: http://members.peakinet.net/tdaley/blackjack/blackjack.html