5 files changed, 115 insertions, 19 deletions

diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index 2e202eac98b3..56dbc39bd396 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	acm
+# New ports collection makefile for:	blackjack
 # Date created:		23 February 1998
 # Whom:			Peter Mutsaers
 #
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	blackjack
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
+EXTRACT_SUFX=	.tgz
 
+MAINTAINER=	ports@FreeBSD.org
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_QT=		yes
-WRKSRC=		${WRKDIR}/blackjack
 
 MAN1=		blackjack.1
 
diff --git a/games/blackjack/distinfo b/games/blackjack/distinfo
index 73232f34e247..b5eafa9b2c03 100644
--- a/games/blackjack/distinfo
+++ b/games/blackjack/distinfo
@@ -1 +1 @@
-MD5 (blackjack-1.1.tar.gz) = 2e6d2747e368f4f70eb598b437a9dc76
+MD5 (blackjack-1.2.tgz) = 3b7751ee38c06ce758ab06015d57cb11
diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa
index 64252af6cd78..17e62f4d87ee 100644
--- a/games/blackjack/files/patch-aa
+++ b/games/blackjack/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed Feb 11 19:42:00 1998
-+++ Makefile	Sat Jan  8 23:59:30 2000
-@@ -1,9 +1,11 @@
+--- Makefile.orig	Thu Jun  3 11:28:44 1999
++++ Makefile	Sat Jun  3 01:28:49 2000
+@@ -1,9 +1,8 @@
  
 -CC=gcc
 -CXX=g++
@@ -11,22 +11,19 @@
 +CXX?=g++
 +INCLUDES=-I$(X11BASE)/include/X11/qt
 +LDFLAGS=-L$(X11BASE)/lib -lqt
-+.if $(PORTOBJFORMAT) == "elf"
-+LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib
-+.endif
- VERSION=1.1
+ VERSION=1.2
  
  # For systems that don't have install, use this
-@@ -25,7 +27,7 @@
- 	blackjack/*.cpp			\
- 	blackjack/*.bm
- 
--INSTALL=install
-+INSTALL=install -c
+@@ -28,7 +27,7 @@
+ INSTALL=install
  INSTALL_BIN_FLAGS=-s
  
- INSTALL_ROOT=/usr/local
-@@ -39,12 +41,14 @@
+-INSTALL_ROOT=/usr/local
++INSTALL_ROOT=${PREFIX}
+ INSTALL_BIN=$(INSTALL_ROOT)/bin
+ INSTALL_MAN=$(INSTALL_ROOT)/man
+ 
+@@ -39,19 +38,21 @@
       user_input.o dollar_scroll_bar.o bet_option.o table_option.o \
       insurance_window.o $(METAOBJS)
  
@@ -43,3 +40,12 @@
  
  blackjack: main.o $(OBJS) 
  	$(CXX) -o $@ $(LDFLAGS) main.o $(OBJS) 
+ 
+ install:
+-	$(INSTALL) $(INSTALL_BIN_FLAGS) blackjack $(INSTALL_BIN)
+-	$(INSTALL) blackjack.1 $(INSTALL_MAN)/man1
++	${BSD_INSTALL_PROGRAM} blackjack $(INSTALL_BIN)
++	${BSD_INSTALL_MAN} blackjack.1 $(INSTALL_MAN)/man1
+ 
+ mblackjack.cpp: blackjack.h
+ 	$(MOC) -o mblackjack.cpp blackjack.h
diff --git a/games/blackjack/files/patch-ad b/games/blackjack/files/patch-ad
new file mode 100644
index 000000000000..924c19d9df1d
--- /dev/null
+++ b/games/blackjack/files/patch-ad
@@ -0,0 +1,85 @@
+--- card.cpp.orig	Mon Dec  6 00:45:34 1999
++++ card.cpp	Sat Jun  3 02:47:49 2000
+@@ -201,8 +201,8 @@
+    QBitmap *bitmap_p = new QBitmap(CARD_W, CARD_H, TRUE);
+    QBitmap *back_bitmap_p = new QBitmap(logo_width, logo_height, logo_bits, 
+                                         TRUE);
+-   QBrush fill(Qt::white);
+-   QBrush pattern(Qt::CustomPattern);
++   QBrush fill(white);
++   QBrush pattern(CustomPattern);
+    QPainter painter;
+    
+    if ((painter.begin(bitmap_p)) == FALSE) {
+@@ -210,7 +210,7 @@
+       delete (bitmap_p);
+       bitmap_p = NULL;
+    } else {
+-      QBrush fill_ones(Qt::color1);// make a mask so we don't paint the corners
++      QBrush fill_ones(color1);	// make a mask so we don't paint the corners
+       painter.setBrush(fill_ones);	// make pixmap mask for card
+       painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
+       painter.end();
+@@ -221,7 +221,7 @@
+       delete (pixmap_p);
+       pixmap_p = NULL;
+    } else {
+-      painter.setPen(Qt::black);
++      painter.setPen(black);
+ 
+    if (bitmap_p) 			// if we made a mask bitmap
+       pixmap_p->setMask(*bitmap_p);	// set the mask for the pixmap
+@@ -229,7 +229,7 @@
+       painter.setBrush(fill);
+       painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
+       pattern.setPixmap(*back_bitmap_p);
+-      pattern.setColor(Qt::red);
++      pattern.setColor(red);
+       painter.setBrush(pattern);	// set up some painter options
+       painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round);
+       painter.end();
+@@ -255,21 +255,21 @@
+    QColor color;
+    QPixmap *pixmap_p = new QPixmap(CARD_W, CARD_H);
+    QBitmap *bitmap_p = new QBitmap(CARD_W, CARD_H, TRUE);
+-   QBrush fill(Qt::white);		// make two brushes, fill and no_fill 
+-   QBrush no_fill(Qt::NoBrush);
++   QBrush fill(white);		// make two brushes, fill and no_fill 
++   QBrush no_fill(NoBrush);
+    QPainter painter;
+ 
+    if (_suit == HEART || _suit == DIAMOND)
+-      color = Qt::red;
++      color = red;
+    else
+-      color = Qt::black;
++      color = black;
+ 
+    if ((painter.begin(bitmap_p)) == FALSE) {
+       cerr << "card::makePixmap(): Can't open bitmap paint device\n";
+       delete (bitmap_p);
+       bitmap_p = NULL;
+    } else {
+-      QBrush fill_ones(Qt::color1);// make a mask so we don't paint the corners
++      QBrush fill_ones(color1);	// make a mask so we don't paint the corners
+       painter.setBrush(fill_ones);	// make pixmap mask for card 
+       painter.drawRoundRect(0, 0, CARD_W, CARD_H, x_round, y_round); 
+       painter.end();
+@@ -281,7 +281,7 @@
+       pixmap_p = NULL;
+    } else {
+       painter.setBrush(fill);		// set up some painter options 
+-      painter.setPen(Qt::black);
++      painter.setPen(black);
+ 
+       if (bitmap_p) 			// if we made a mask bitmap
+          pixmap_p->setMask(*bitmap_p);	// set the mask for the pixmap
+@@ -295,7 +295,7 @@
+       painter.setWorldXForm(FALSE);	// disable transformation for now
+ 
+       painter.setPen(color);		// draw rank and suit in corners
+-      painter.setBackgroundColor(Qt::white);
++      painter.setBackgroundColor(white);
+       painter.drawPixmap(4, 6, *_rank_bitmaps[_rank]);
+       painter.drawPixmap(4, 23, *_small_suit_bitmaps[_suit]);
+       painter.setWorldXForm(TRUE);	// now draw flipped rank and suit 
diff --git a/games/blackjack/pkg-descr b/games/blackjack/pkg-descr
index ca39f1076c53..536066068e06 100644
--- a/games/blackjack/pkg-descr
+++ b/games/blackjack/pkg-descr
@@ -19,3 +19,5 @@ GUI library and is not slow at all on my 386.
 
 Tom Daley
 tdaley@vsys.com
+
+WWW: http://users.codenet.net/daley/blackjack/blackjack.html