5 files changed, 96 insertions, 59 deletions

diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 32166ed7e059..3219109a25ba 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -3,10 +3,10 @@
 # Date created:		12 September 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/10/06 07:53:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/18 09:52:57 asami Exp $
 #
 
-DISTNAME=	xbill-1.1
+DISTNAME=	xbill-2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -17,10 +17,8 @@ MAINTAINER=	asami@FreeBSD.ORG
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/xbill
-NO_INSTALL_MANPAGES=	yes
 
 post-install:
-	cp ${WRKSRC}/README ${PREFIX}/lib/xbill
+	${CP} ${WRKSRC}/README ${PREFIX}/share/xbill
 
 .include <bsd.port.mk>
diff --git a/games/xbill/distinfo b/games/xbill/distinfo
index bcc7b1adcb57..3fa64a1939b0 100644
--- a/games/xbill/distinfo
+++ b/games/xbill/distinfo
@@ -1 +1 @@
-MD5 (xbill-1.1.tgz) = 409294e2589de8b77c607aed1b3d7f86
+MD5 (xbill-2.0.tgz) = 132e4b340618924b6a41ec5ec106ca32
diff --git a/games/xbill/files/patch-aa b/games/xbill/files/patch-aa
index b5f37c955975..76dd647a5afa 100644
--- a/games/xbill/files/patch-aa
+++ b/games/xbill/files/patch-aa
@@ -1,51 +1,17 @@
---- ./Imakefile.org	Mon Apr 17 20:23:20 1995
-+++ ./Imakefile	Tue Sep 12 03:09:04 1995
-@@ -4,22 +4,22 @@
- XCOMM installed setgid daemon to allow it to write to the scores file
- XCOMM if a system score file is used.
- 
--SCORE_DEF = -DSCORE_FILE=\"/var/games/xbill/scores\"
-+SCORE_DEF = -DSCORE_FILE=\"$(USRLIBDIR)/xbill/scores\"
- XCOMM SCORE_DEF = -DSCORE_FILE=\"$(HOME)/.xbill-scores\"
- 
- XCOMM If you do not have libXpm installed in the standard place, 
- XCOMM uncomment the second define below and insert the correct paths.
- XCOMM Make sure xpm.h can be referenced as <X11/xpm.h>
- 
--XCOMM XPMINC = -I<xpm include dir>
--XCOMM XPMLIBDIR = -L<xpm lib dir>
-+XPMINC = -I$(INCROOT)
-+XPMLIBDIR = -L$(USRLIBDIR)
-  XPMLIB = -lXpm
- 
- XCOMM Use one of the following two lines.  Motif looks a lot better,
- XCOMM but Athena is free and may compile easier.
- 
--#define Use_Motif
--XCOMM #define Use_Athena
-+XCOMM #define Use_Motif
-+#define Use_Athena
- 
- #ifdef Use_Motif
- XMLIB = -lXm
-@@ -42,6 +42,6 @@
- 
- ComplexProgramTarget(xbill)
- 
--MakeDirectories(install,/var/games/xbill)
-+MakeDirectories(install,$(USRLIBDIR)/xbill)
- InstallMultipleFlags(xbill,$(BINDIR),-s -g daemon -m 2755)
--InstallMultipleFlags(scores,/var/games/xbill,-g daemon -m 664)
-+InstallMultipleFlags(scores,$(USRLIBDIR)/xbill,-g daemon -m 664)
---- ./xbill.h.org	Sun Apr 16 12:47:02 1995
-+++ ./xbill.h	Tue Sep 12 03:09:23 1995
-@@ -10,7 +10,9 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
-+#endif
- 
- #define INTERVAL 250		/*timer interval*/
- #define MAX_COMPUTERS 25	/*maximum number of computers on screen*/
+--- Imakefile.orig	Thu Jan 23 08:38:35 1997
++++ Imakefile	Tue Feb 11 22:05:59 1997
+@@ -1,4 +1,4 @@
+-XBILL_DIR = /var/lib/games/xbill/
++XBILL_DIR = $(PROJECTROOT)/share/xbill/
+ XCOMM XBILL_DIR = $(HOME)/.xbill/
+ 
+ XCOMM Which widget set?  Motif looks slightly better; Athena is free.
+@@ -136,6 +136,7 @@
+ 
+ ComplexProgramTarget($(TARGET))
+ 
+-InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
++# need to pick something with "Flags", but Program ==> strip
++InstallMultipleFlags(scores,$(XBILL_DIR),-m 666)
+ InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
+ InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
diff --git a/games/xbill/files/patch-ad b/games/xbill/files/patch-ad
new file mode 100644
index 000000000000..a4aa4d4e228a
--- /dev/null
+++ b/games/xbill/files/patch-ad
@@ -0,0 +1,11 @@
+--- Library.cc.orig	Thu Jan 23 08:22:50 1997
++++ Library.cc	Wed Feb 12 00:51:28 1997
+@@ -3,7 +3,7 @@
+ void Library::load_pix() {
+ 	int i;
+         char *name[] = {"wingdows", "apple", "next", "sgi", "sun", "os2",
+-		"bsd", "linux", "redhat", "hurd"};
++		"bsd", "linux", "bsd", "hurd"};
+ 	for (i=0; i <= NUM_OS; i++) {
+ 		os[i].load(name[i]);
+ 		if (i) cursor[i].load(name[i], cursor[i].OWN_MASK);
diff --git a/games/xbill/pkg-plist b/games/xbill/pkg-plist
index 22be3e5a0953..42d9adb2c0b8 100644
--- a/games/xbill/pkg-plist
+++ b/games/xbill/pkg-plist
@@ -1,3 +1,65 @@
 bin/xbill
-lib/xbill/scores
-lib/xbill/README
+man/man1/xbill.1.gz
+share/xbill/scores
+share/xbill/README
+share/xbill/pixmaps/about.xpm
+share/xbill/pixmaps/apple.xpm
+share/xbill/pixmaps/billA_0.xpm
+share/xbill/pixmaps/billA_1.xpm
+share/xbill/pixmaps/billA_10.xpm
+share/xbill/pixmaps/billA_11.xpm
+share/xbill/pixmaps/billA_12.xpm
+share/xbill/pixmaps/billA_2.xpm
+share/xbill/pixmaps/billA_3.xpm
+share/xbill/pixmaps/billA_4.xpm
+share/xbill/pixmaps/billA_5.xpm
+share/xbill/pixmaps/billA_6.xpm
+share/xbill/pixmaps/billA_7.xpm
+share/xbill/pixmaps/billA_8.xpm
+share/xbill/pixmaps/billA_9.xpm
+share/xbill/pixmaps/billD_0.xpm
+share/xbill/pixmaps/billD_1.xpm
+share/xbill/pixmaps/billD_2.xpm
+share/xbill/pixmaps/billD_3.xpm
+share/xbill/pixmaps/billD_4.xpm
+share/xbill/pixmaps/billL_0.xpm
+share/xbill/pixmaps/billL_1.xpm
+share/xbill/pixmaps/billL_2.xpm
+share/xbill/pixmaps/billR_0.xpm
+share/xbill/pixmaps/billR_1.xpm
+share/xbill/pixmaps/billR_2.xpm
+share/xbill/pixmaps/bsd.xpm
+share/xbill/pixmaps/bsdcpu.xpm
+share/xbill/pixmaps/bucket.xpm
+share/xbill/pixmaps/hurd.xpm
+share/xbill/pixmaps/icon.xpm
+share/xbill/pixmaps/linux.xpm
+share/xbill/pixmaps/logo.xpm
+share/xbill/pixmaps/maccpu.xpm
+share/xbill/pixmaps/next.xpm
+share/xbill/pixmaps/nextcpu.xpm
+share/xbill/pixmaps/os2.xpm
+share/xbill/pixmaps/os2cpu.xpm
+share/xbill/pixmaps/redhat.xpm
+share/xbill/pixmaps/sgi.xpm
+share/xbill/pixmaps/sgicpu.xpm
+share/xbill/pixmaps/spark_0.xpm
+share/xbill/pixmaps/spark_1.xpm
+share/xbill/pixmaps/sun.xpm
+share/xbill/pixmaps/suncpu.xpm
+share/xbill/pixmaps/toaster.xpm
+share/xbill/pixmaps/wingdows.xpm
+share/xbill/bitmaps/apple.xbm
+share/xbill/bitmaps/bsd.xbm
+share/xbill/bitmaps/bucket.xbm
+share/xbill/bitmaps/hand_down.xbm
+share/xbill/bitmaps/hand_down_mask.xbm
+share/xbill/bitmaps/hand_up.xbm
+share/xbill/bitmaps/hand_up_mask.xbm
+share/xbill/bitmaps/hurd.xbm
+share/xbill/bitmaps/linux.xbm
+share/xbill/bitmaps/next.xbm
+share/xbill/bitmaps/os2.xbm
+share/xbill/bitmaps/redhat.xbm
+share/xbill/bitmaps/sgi.xbm
+share/xbill/bitmaps/sun.xbm