13 files changed, 75 insertions, 39 deletions

diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index 1156d7a7c60f..675a93d286e9 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -1,29 +1,34 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
-PORTNAME=		CaribbeanStud
-PORTVERSION=		1.0
-PORTREVISION=		3
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+PORTNAME=	CaribbeanStud
+PORTVERSION=	1.0
+PORTREVISION=	3
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
-DISTNAME=		CS
+DISTNAME=	CS
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Caribbean Stud gambling game for X Window System
 
-MAKEFILE=		Xmakefile
-USES=			motif
-CFLAGS+=		-Wno-deprecated
+MAKEFILE=	Xmakefile
+USES=		motif
+CFLAGS+=	-Wno-deprecated
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|iostream\.h|iostream|g' \
+		${WRKSRC}/Card.cpp ${WRKSRC}/Card.h ${WRKSRC}/CaribbeanStud.cpp \
+		${WRKSRC}/Dealer.cpp ${WRKSRC}/Deck.cpp ${WRKSRC}/Player.cpp \
+		${WRKSRC}/Seat.cpp ${WRKSRC}/Table.cpp
 
-NO_STAGE=	yes
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/CaribbeanStud ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/CaribbeanStud.res ${PREFIX}/lib/X11/app-defaults/CaribbeanStud
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/CaribbeanStud
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/CaribbeanStud
-	@ ${INSTALL_DATA} ${WRKSRC}/class.ps ${PREFIX}/share/doc/CaribbeanStud
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/CaribbeanStud ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/CaribbeanStud.res ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/CaribbeanStud
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/CaribbeanStud
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/CaribbeanStud
+	${INSTALL_DATA} ${WRKSRC}/class.ps ${STAGEDIR}${PREFIX}/share/doc/CaribbeanStud
 
 .include <bsd.port.mk>
diff --git a/games/CaribbeanStud/files/patch-Card.cpp b/games/CaribbeanStud/files/patch-Card.cpp
new file mode 100644
index 000000000000..8875660fce19
--- /dev/null
+++ b/games/CaribbeanStud/files/patch-Card.cpp
@@ -0,0 +1,11 @@
+--- ./Card.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Card.cpp	2013-10-29 15:12:13.000000000 -0200
+@@ -25,6 +25,8 @@
+ #include <iostream>
+ #include "Card.h"
+ 
++using namespace std;
++
+ //## Constructors
+ 
+ Card::Card(int CardIndex)
diff --git a/games/CaribbeanStud/files/patch-Card.h b/games/CaribbeanStud/files/patch-Card.h
index 664aaa2c8e75..9c3f2cdcca79 100644
--- a/games/CaribbeanStud/files/patch-Card.h
+++ b/games/CaribbeanStud/files/patch-Card.h
@@ -1,5 +1,5 @@
---- Card.h.orig	Tue Aug 19 11:57:32 2003
-+++ Card.h	Tue Aug 19 11:58:21 2003
+--- ./Card.h.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Card.h	2013-10-29 15:12:13.000000000 -0200
 @@ -59,7 +59,7 @@
  
  // Class Card 
diff --git a/games/CaribbeanStud/files/patch-CaribbeanStud.cpp b/games/CaribbeanStud/files/patch-CaribbeanStud.cpp
new file mode 100644
index 000000000000..449d19bf5cc8
--- /dev/null
+++ b/games/CaribbeanStud/files/patch-CaribbeanStud.cpp
@@ -0,0 +1,11 @@
+--- ./CaribbeanStud.cpp.orig	2013-10-29 15:12:43.000000000 -0200
++++ ./CaribbeanStud.cpp	2013-10-29 15:12:55.000000000 -0200
+@@ -27,6 +27,8 @@
+ #include "Player.h"
+ #include "Table.h"
+ 
++using namespace std;
++
+ 
+ int main(int argc, char ** argv)
+ {
diff --git a/games/CaribbeanStud/files/patch-Dealer.cpp b/games/CaribbeanStud/files/patch-Dealer.cpp
index 336810a407e6..bb4586b3f1f6 100644
--- a/games/CaribbeanStud/files/patch-Dealer.cpp
+++ b/games/CaribbeanStud/files/patch-Dealer.cpp
@@ -1,6 +1,15 @@
---- Dealer.cpp.orig	Tue Aug 19 12:01:24 2003
-+++ Dealer.cpp	Tue Aug 19 12:02:07 2003
-@@ -141,7 +141,8 @@
+--- ./Dealer.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Dealer.cpp	2013-10-29 15:12:13.000000000 -0200
+@@ -28,6 +28,8 @@
+ #include "Dealer.h"
+ #include "Player.h"
+ 
++using namespace std;
++
+ Dealer::Dealer( Seat * dealerSeat ) : _seat(dealerSeat), _current(0)
+ {
+    _minjackPot = 2000000;
+@@ -141,7 +143,8 @@
  
  void Dealer::NewGame()
  {
diff --git a/games/CaribbeanStud/files/patch-Dealer.h b/games/CaribbeanStud/files/patch-Dealer.h
index e9ed49b0242d..d4ca3d57a1ca 100644
--- a/games/CaribbeanStud/files/patch-Dealer.h
+++ b/games/CaribbeanStud/files/patch-Dealer.h
@@ -1,5 +1,5 @@
---- Dealer.h.orig	Tue Aug 19 11:59:05 2003
-+++ Dealer.h	Tue Aug 19 12:00:14 2003
+--- ./Dealer.h.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Dealer.h	2013-10-29 15:12:13.000000000 -0200
 @@ -92,7 +92,8 @@
  
  inline void Dealer::Add    (Player* newPlayer)
diff --git a/games/CaribbeanStud/files/patch-Deck.cpp b/games/CaribbeanStud/files/patch-Deck.cpp
index 21a640edf064..9f2f7da417c1 100644
--- a/games/CaribbeanStud/files/patch-Deck.cpp
+++ b/games/CaribbeanStud/files/patch-Deck.cpp
@@ -1,5 +1,5 @@
---- Deck.cpp.orig	Tue Aug 19 12:02:29 2003
-+++ Deck.cpp	Tue Aug 19 12:05:01 2003
+--- ./Deck.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Deck.cpp	2013-10-29 15:12:13.000000000 -0200
 @@ -38,7 +38,8 @@
  			_globalCards[j] = Card(j);
  		_globalInit = 1;
diff --git a/games/CaribbeanStud/files/patch-Hands.cpp b/games/CaribbeanStud/files/patch-Hands.cpp
index e4f4eebc2cec..1885539d01d9 100644
--- a/games/CaribbeanStud/files/patch-Hands.cpp
+++ b/games/CaribbeanStud/files/patch-Hands.cpp
@@ -1,5 +1,5 @@
---- Hands.cpp.orig	Fri Jan 31 23:47:58 1997
-+++ Hands.cpp	Tue Aug 19 12:11:29 2003
+--- ./Hands.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Hands.cpp	2013-10-29 15:12:13.000000000 -0200
 @@ -46,7 +46,7 @@
  		_next = 0;
  }
diff --git a/games/CaribbeanStud/files/patch-Player.h b/games/CaribbeanStud/files/patch-Player.h
index 0de812e73330..518dde0e917c 100644
--- a/games/CaribbeanStud/files/patch-Player.h
+++ b/games/CaribbeanStud/files/patch-Player.h
@@ -1,5 +1,5 @@
---- Player.h.orig	Tue Aug 19 12:00:36 2003
-+++ Player.h	Tue Aug 19 12:01:09 2003
+--- ./Player.h.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Player.h	2013-10-29 15:12:13.000000000 -0200
 @@ -72,7 +72,7 @@
        int     _lastWinLost;
  };
diff --git a/games/CaribbeanStud/files/patch-Seat.cpp b/games/CaribbeanStud/files/patch-Seat.cpp
index f8aeb85740fd..d859ff10701e 100644
--- a/games/CaribbeanStud/files/patch-Seat.cpp
+++ b/games/CaribbeanStud/files/patch-Seat.cpp
@@ -1,5 +1,5 @@
---- Seat.cpp.orig	Fri Jan 31 23:47:58 1997
-+++ Seat.cpp	Tue Aug 19 12:13:30 2003
+--- ./Seat.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Seat.cpp	2013-10-29 15:12:13.000000000 -0200
 @@ -151,10 +151,10 @@
  	   gcv.font = XLoadFont(_dpy, "10x20"); 
  		gcflags = GCForeground | GCBackground | GCGraphicsExposures;
diff --git a/games/CaribbeanStud/files/patch-Seat.h b/games/CaribbeanStud/files/patch-Seat.h
index 7c18c19d48d7..872e3742753d 100644
--- a/games/CaribbeanStud/files/patch-Seat.h
+++ b/games/CaribbeanStud/files/patch-Seat.h
@@ -1,5 +1,5 @@
---- Seat.h.orig	Tue Aug 19 12:12:00 2003
-+++ Seat.h	Tue Aug 19 12:12:40 2003
+--- ./Seat.h.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Seat.h	2013-10-29 15:12:13.000000000 -0200
 @@ -148,7 +148,7 @@
  };
  
diff --git a/games/CaribbeanStud/files/patch-Table.cpp b/games/CaribbeanStud/files/patch-Table.cpp
index 3956e0d54404..880b793036fb 100644
--- a/games/CaribbeanStud/files/patch-Table.cpp
+++ b/games/CaribbeanStud/files/patch-Table.cpp
@@ -1,5 +1,5 @@
---- Table.cpp.orig	Tue Aug 19 12:13:59 2003
-+++ Table.cpp	Tue Aug 19 12:20:07 2003
+--- ./Table.cpp.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Table.cpp	2013-10-29 15:12:13.000000000 -0200
 @@ -306,7 +306,7 @@
  	XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_POSITION); ac++;
  	XtSetArg(al[ac], XmNbottomPosition, 30); ac++;
diff --git a/games/CaribbeanStud/files/patch-Xmakefile b/games/CaribbeanStud/files/patch-Xmakefile
index cb172009950a..b947b1c16131 100644
--- a/games/CaribbeanStud/files/patch-Xmakefile
+++ b/games/CaribbeanStud/files/patch-Xmakefile
@@ -1,5 +1,5 @@
---- Xmakefile.orig	Fri Jan 31 23:47:59 1997
-+++ Xmakefile	Tue Aug 19 11:56:52 2003
+--- ./Xmakefile.orig	2013-10-29 15:12:13.000000000 -0200
++++ ./Xmakefile	2013-10-29 15:12:13.000000000 -0200
 @@ -77,17 +77,27 @@
  #UILFLAGS=-I/usr/include/uil -I/usr/include/Motif1.2/uil
  ###