* Add dependency on libX11 directly, noted in PR 38644.

 * Marked as DESTDIR ready
 * Modify patches to bit simply
 * Honor PKGMANDIR
 * Add definition virtual destructor for reliably an safely.

Bump PKGREVISION.

7 files changed, 45 insertions, 39 deletions

diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 7033877024d..e4257de09ae 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/03/24 19:21:24 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/05/24 15:59:27 obache Exp $
 
 DISTNAME=	xfreecell-1.0.5b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www2.giganet.net/~nakayama/
 EXTRACT_SUFX=	.tgz
@@ -10,6 +10,8 @@ MAINTAINER=	chris@infolaunch.com
 HOMEPAGE=	http://www2.giganet.net/~nakayama/
 COMMENT=	Popular freecell card game for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
@@ -20,8 +22,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 WRKSRC=		${WRKDIR}/xfreecell
 NO_CONFIGURE=	YES
 
-MAKE_ENV+=	GMAKE=${GMAKE:Q}
-
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfreecell/distinfo b/games/xfreecell/distinfo
index c0d8d1a414a..393ee3a5ffe 100644
--- a/games/xfreecell/distinfo
+++ b/games/xfreecell/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/01/12 23:59:02 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/05/24 15:59:27 obache Exp $
 
 SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
 RMD160 (xfreecell-1.0.5b.tgz) = 2629217bf29734bb25b30ca8aaec62ae19d0ff6f
 Size (xfreecell-1.0.5b.tgz) = 49367 bytes
-SHA1 (patch-aa) = 6fde8f98f3587fcd07b91e517d08c268f9ee4e47
-SHA1 (patch-ab) = 74326c5b4e731a32a404210cdc13b87a5b15119a
-SHA1 (patch-ac) = 4fcb28840a4619c8ceb06dd86ffea351d1b8a2c5
-SHA1 (patch-ad) = ab39728f9cb2f9cfb8b55c87185546e93ae5a231
-SHA1 (patch-ae) = 88a9048924d083c7903501302e224df5897c6838
+SHA1 (patch-aa) = d5235b5a34df4ea12c249d680cc6e674f1c50626
+SHA1 (patch-ab) = a34285fa7e8564d18d91cdb23affd1afb5cd8938
+SHA1 (patch-ac) = f2fb8f2db71c4051eb28352f02a0fed09f69f97f
+SHA1 (patch-ad) = cfdf8f50b5bba32ea8a1bc048e89e0594e85c072
+SHA1 (patch-ae) = b1d9a7cf0a9a692c4ec04379b3153e41268f0315
diff --git a/games/xfreecell/patches/patch-aa b/games/xfreecell/patches/patch-aa
index 1177d3b0749..4149df61567 100644
--- a/games/xfreecell/patches/patch-aa
+++ b/games/xfreecell/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2005/02/22 13:44:13 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2008/05/24 15:59:27 obache Exp $
 
---- makefile.orig	1999-04-03 07:42:49.000000000 -0600
+--- makefile.orig	1999-04-03 13:42:49.000000000 +0000
 +++ makefile
 @@ -1,10 +1,10 @@
  OBJECTS=card.o freecell.o option.o stack.o subwindows.o undo.o util.o gnmanager.o random.o
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.3 2005/02/22 13:44:13 minskim Exp $
 -CFLAGS=-g -Wall -DSHAPE -DBOGUSRANDOM
 -LIBS=-lm -L. -lns -L/usr/X11R6/lib -lXext -lX11
 +CFLAGS=-Wall -DSHAPE -DBOGUSRANDOM -I${X11BASE}/include
-+LIBS=-lm -L. -lns -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11
++LIBS=-lm -L. -lns ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11
  STATICDIR=xfreecell-static
  DOCS=README CHANGES mshuffle.txt xfreecell.6
 -LIBDIR=/usr/local/lib/xfreecell
@@ -16,23 +16,18 @@ $NetBSD: patch-aa,v 1.3 2005/02/22 13:44:13 minskim Exp $
  
  all: $(OBJECTS) lib
  	$(CC) -o xfreecell $(CFLAGS) $(OBJECTS) $(LIBS)
-@@ -25,13 +25,13 @@ static-release: static
- 
- clean:
- 	rm -f *~ *.o a.out xfreecell libns.a
--	make -C widget clean
-+	${GMAKE} -C widget clean
- 
+@@ -30,8 +30,8 @@ clean:
  lib:
--	make -C widget lib
-+	${GMAKE} -C widget lib
+ 	make -C widget lib
  
- install: all
+-install: all
 -	install xfreecell $(DESTDIR)/usr/local/bin
 -	install xfreecell.6 $(DESTDIR)/usr/local/man/man6
-+	install xfreecell $(DESTDIR)${PREFIX}/bin
-+	install xfreecell.6 $(DESTDIR)${PREFIX}/man/man6
- #	install -d $(LIBDIR)
+-#	install -d $(LIBDIR)
 -#	install ms-compatible/MSNumbers $(DESTDIR)/usr/local/lib/xfreecell
 \ No newline at end of file
-+#	install ms-compatible/MSNumbers $(DESTDIR)${PREFIX}/lib/xfreecell
++install: xfreecell
++	${BSD_INSTALL_PROGRAM} xfreecell $(DESTDIR)${PREFIX}/bin
++	${BSD_INSTALL_MAN} xfreecell.6 $(DESTDIR)${PREFIX}/${PKGMANDIR}/man6
++#	install -d $(DESTDIR)$(LIBDIR)
++#	install ms-compatible/MSNumbers $(DESTDIR)$(LIBDIR)
diff --git a/games/xfreecell/patches/patch-ab b/games/xfreecell/patches/patch-ab
index 12cc56a72f0..783c386f6f0 100644
--- a/games/xfreecell/patches/patch-ab
+++ b/games/xfreecell/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2004/07/10 23:03:47 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2008/05/24 15:59:27 obache Exp $
 
---- widget/makefile.orig	1999-03-18 06:54:57.000000000 +0100
+--- widget/makefile.orig	1999-03-18 05:54:57.000000000 +0000
 +++ widget/makefile
-@@ -1,7 +1,7 @@
+@@ -1,8 +1,8 @@
  OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
  #C=/usr/local/gcc-2.8.1/bin/g++
  CC=g++
 -CFLAGS=-g -Wall
-+CFLAGS=-g -Wall -I/usr/X11R6/include
- LIBS=-L/usr/X11R6/lib -lX11
+-LIBS=-L/usr/X11R6/lib -lX11
++CFLAGS=-Wall -I${X11BASE}/include
++LIBS=-L${X11BASE}/lib -lX11
  LIBNAME=libns.a
  
+ all: test.o $(OBJECTS)
diff --git a/games/xfreecell/patches/patch-ac b/games/xfreecell/patches/patch-ac
index 8b82504a98c..b57ad490c4f 100644
--- a/games/xfreecell/patches/patch-ac
+++ b/games/xfreecell/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2004/07/18 16:06:59 kristerw Exp $
+$NetBSD: patch-ac,v 1.3 2008/05/24 15:59:27 obache Exp $
 
---- gnmanager.h.orig	Mon Mar 29 15:07:19 1999
-+++ gnmanager.h	Sun Jul 18 18:01:51 2004
+--- gnmanager.h.orig	1999-03-29 13:07:19.000000000 +0000
++++ gnmanager.h
 @@ -2,7 +2,13 @@
  #define GNManager_H
  
diff --git a/games/xfreecell/patches/patch-ad b/games/xfreecell/patches/patch-ad
index 6c95cc13a5d..0dcfd601eaa 100644
--- a/games/xfreecell/patches/patch-ad
+++ b/games/xfreecell/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2004/07/10 23:03:47 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2008/05/24 15:59:27 obache Exp $
 
---- widget/widget.h.orig	1999-03-15 17:29:32.000000000 +0100
+--- widget/widget.h.orig	1999-03-15 16:29:32.000000000 +0000
 +++ widget/widget.h
 @@ -8,6 +8,8 @@
  #include <vector>
@@ -11,3 +11,11 @@ $NetBSD: patch-ad,v 1.1 2004/07/10 23:03:47 wiz Exp $
  const char defaultFont[] = "7x14";
  
  extern Display* NSdpy;
+@@ -42,6 +44,7 @@ Display* NSdisplay();
+ // ##### NSComponent #####
+ class NSComponent {
+ public:
++  virtual ~NSComponent() {};
+   virtual int x() const = 0;
+   virtual int y() const = 0;
+   virtual unsigned int width() const = 0;
diff --git a/games/xfreecell/patches/patch-ae b/games/xfreecell/patches/patch-ae
index cbb70e5bb2a..e5ea4ddd1f4 100644
--- a/games/xfreecell/patches/patch-ae
+++ b/games/xfreecell/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2006/01/12 23:59:02 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2008/05/24 15:59:27 obache Exp $
 
---- subwindows.cpp.orig	2006-01-12 23:55:23.000000000 +0000
+--- subwindows.cpp.orig	1999-07-27 14:15:36.000000000 +0000
 +++ subwindows.cpp
 @@ -1,5 +1,6 @@
  #include <sys/stat.h>