Date: Fri, 2 Jun 2000 17:34:52 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18974: Update port: games/blackjack to 1.2 Message-ID: <20000603003452.1ECAE37B8F6@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18974
>Category: ports
>Synopsis: Update port: games/blackjack to 1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 02 17:40:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2
- Add WWW: line into pkg/DESCR
New file:
patches/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/blackjack/Makefile games/blackjack/Makefile
--- /usr/ports/games/blackjack/Makefile Mon Apr 24 18:56:57 2000
+++ games/blackjack/Makefile Sat Jun 3 03:07:08 2000
@@ -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 -urN /usr/ports/games/blackjack/files/md5 games/blackjack/files/md5
--- /usr/ports/games/blackjack/files/md5 Thu Apr 23 07:55:28 1998
+++ games/blackjack/files/md5 Sat Jun 3 01:22:00 2000
@@ -1 +1 @@
-MD5 (blackjack-1.1.tar.gz) = 2e6d2747e368f4f70eb598b437a9dc76
+MD5 (blackjack-1.2.tgz) = 3b7751ee38c06ce758ab06015d57cb11
diff -urN /usr/ports/games/blackjack/patches/patch-aa games/blackjack/patches/patch-aa
--- /usr/ports/games/blackjack/patches/patch-aa Sun Jan 9 17:00:59 2000
+++ games/blackjack/patches/patch-aa Sat Jun 3 01:28:57 2000
@@ -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 -urN /usr/ports/games/blackjack/patches/patch-ad games/blackjack/patches/patch-ad
--- /usr/ports/games/blackjack/patches/patch-ad Thu Jan 1 09:00:00 1970
+++ games/blackjack/patches/patch-ad Sat Jun 3 02:47:59 2000
@@ -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 -urN /usr/ports/games/blackjack/pkg/DESCR games/blackjack/pkg/DESCR
--- /usr/ports/games/blackjack/pkg/DESCR Tue Feb 24 04:55:07 1998
+++ games/blackjack/pkg/DESCR Sat Jun 3 03:06:20 2000
@@ -19,3 +19,5 @@
Tom Daley
tdaley@vsys.com
+
+WWW: http://users.codenet.net/daley/blackjack/blackjack.html
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000603003452.1ECAE37B8F6>