* 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.

5 files changed, 34 insertions, 29 deletions

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>