[update orphan port] : games/xbill

- Update to 2.1
- Add USE_GTK

PR:		ports/48529
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

8 files changed, 31 insertions, 65 deletions

diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index ce3023c9e5c6..a41528dce365 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -7,24 +7,22 @@
 #
 
 PORTNAME=	xbill
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.xbill.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Save your computers from the evil clutches of Bill
 
-USE_IMAKE=	yes
+SCORES_DIR?=	${DATADIR}/scores
+
+USE_X_PREFIX=	yes
+HAS_CONFIGURE=	yes
 USE_XPM=	yes
-MAN1=		xbill.1
+USE_GTK=	yes
+CONFIGURE_ENV+=	PREFIX=${PREFIX}
+CONFIGURE_ARGS+=--localstatedir=${SCORES_DIR}
 
-post-install:
-	${CP} ${WRKSRC}/README ${PREFIX}/share/xbill
-	${CHOWN} root:games ${PREFIX}/bin/xbill
-	${CHMOD} 2755 ${PREFIX}/bin/xbill
-	${CHOWN} root:games ${PREFIX}/share/xbill/scores
-	${CHMOD} 664 ${PREFIX}/share/xbill/scores
+MAN6=		xbill.6
 
 .include <bsd.port.mk>
diff --git a/games/xbill/distinfo b/games/xbill/distinfo
index 3fa64a1939b0..ce526a6825c8 100644
--- a/games/xbill/distinfo
+++ b/games/xbill/distinfo
@@ -1 +1 @@
-MD5 (xbill-2.0.tgz) = 132e4b340618924b6a41ec5ec106ca32
+MD5 (xbill-2.1.tar.gz) = 585e4866b15255a24203db9959407b2f
diff --git a/games/xbill/files/patch-aa b/games/xbill/files/patch-aa
deleted file mode 100644
index 2117cc6ed518..000000000000
--- a/games/xbill/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- Imakefile.orig	Fri Jan 24 00:38:35 1997
-+++ Imakefile	Fri Apr 24 01:45:58 1998
-@@ -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.
-@@ -19,7 +19,7 @@
- 
- INCLUDES = -I. $(XPMINC)
- CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS)
--CCFLAGS = $(ALLDEFINES) -Wall -g
-+CCFLAGS = $(ALLDEFINES) -Wall
- 
- CXX = g++ $(CCFLAGS)
- CCC = $(CXX)
-@@ -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
deleted file mode 100644
index a4aa4d4e228a..000000000000
--- a/games/xbill/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-ae b/games/xbill/files/patch-ae
deleted file mode 100644
index 0a8dd3ecf241..000000000000
--- a/games/xbill/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- Cable.h.orig	Thu Jan 23 08:22:49 1997
-+++ Cable.h	Tue Jan 11 23:39:25 2000
-@@ -13,7 +13,7 @@
- 	void setup();
- 	void draw();
- 	void update();
--	onspark (int locx, int locy);
-+	int onspark (int locx, int locy);
- 
- };
- 
diff --git a/games/xbill/files/patch-configure b/games/xbill/files/patch-configure
new file mode 100644
index 000000000000..b7b7bfadd6fd
--- /dev/null
+++ b/games/xbill/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Feb 21 14:21:59 2003
++++ configure	Fri Feb 21 14:22:22 2003
+@@ -9,7 +9,7 @@
+ 
+ # Defaults:
+ ac_help=
+-ac_default_prefix=/usr/local
++ac_default_prefix=${PREFIX}
+ # Any additions from configure.in:
+ ac_help="$ac_help
+   --with-x                use the X Window System"
diff --git a/games/xbill/pkg-descr b/games/xbill/pkg-descr
index 94346de5441c..eaa3f4c77bef 100644
--- a/games/xbill/pkg-descr
+++ b/games/xbill/pkg-descr
@@ -1,5 +1,6 @@
 xbill is a game for Bill-haters.  Ah, the escasy to squish the evil Bill
 like a bug! :>
 
+WWW: http://www.xbill.org
 - Satoshi
 asami@cs.berkeley.edu
diff --git a/games/xbill/pkg-plist b/games/xbill/pkg-plist
index bb0249f3b321..ec465154ffba 100644
--- a/games/xbill/pkg-plist
+++ b/games/xbill/pkg-plist
@@ -1,6 +1,4 @@
 bin/xbill
-share/xbill/scores
-share/xbill/README
 share/xbill/pixmaps/about.xpm
 share/xbill/pixmaps/apple.xpm
 share/xbill/pixmaps/billA_0.xpm
@@ -24,10 +22,10 @@ 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/bsd.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
@@ -39,6 +37,8 @@ share/xbill/pixmaps/next.xpm
 share/xbill/pixmaps/nextcpu.xpm
 share/xbill/pixmaps/os2.xpm
 share/xbill/pixmaps/os2cpu.xpm
+share/xbill/pixmaps/palm.xpm
+share/xbill/pixmaps/palmcpu.xpm
 share/xbill/pixmaps/redhat.xpm
 share/xbill/pixmaps/sgi.xpm
 share/xbill/pixmaps/sgicpu.xpm
@@ -59,9 +59,13 @@ share/xbill/bitmaps/hurd.xbm
 share/xbill/bitmaps/linux.xbm
 share/xbill/bitmaps/next.xbm
 share/xbill/bitmaps/os2.xbm
+share/xbill/bitmaps/palm.xbm
 share/xbill/bitmaps/redhat.xbm
 share/xbill/bitmaps/sgi.xbm
 share/xbill/bitmaps/sun.xbm
-@dirrm share/xbill/bitmaps
+share/xbill/scores/xbill/scores
+@dirrm share/xbill/scores/xbill
+@dirrm share/xbill/scores
 @dirrm share/xbill/pixmaps
+@dirrm share/xbill/bitmaps
 @dirrm share/xbill