From owner-freebsd-ports-bugs Fri Feb 21 8: 0:36 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBABE37B405 for ; Fri, 21 Feb 2003 08:00:22 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95BFE43FDF for ; Fri, 21 Feb 2003 08:00:19 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LG0JNS088286 for ; Fri, 21 Feb 2003 08:00:19 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1LG0JeM088285; Fri, 21 Feb 2003 08:00:19 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0334E37B401 for ; Fri, 21 Feb 2003 07:56:09 -0800 (PST) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 851EE43FE1 for ; Fri, 21 Feb 2003 07:56:07 -0800 (PST) (envelope-from root@cultdeadsheep.org) Received: (qmail 594 invoked by uid 0); 21 Feb 2003 15:56:06 -0000 Message-Id: <20030221155606.593.qmail@cultdeadsheep.org> Date: 21 Feb 2003 15:56:06 -0000 From: Clement Laforet Reply-To: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet X-Send-Pr-Version: 3.113 Subject: ports/48529: [update orphan port] : games/xbill Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 48529 >Category: ports >Synopsis: [update orphan port] : games/xbill >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 21 08:00:19 PST 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 4.6-STABLE i386 >Organization: cotds.org >Environment: System: FreeBSD goofy.cultdeadsheep.org 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 4 10:05:12 CEST 2002 root@goofy.cultdeadsheep.org:/usr/obj/usr/src/sys/GOOFY i386 >Description: - Update to 2.1 - Add USE_GTK >How-To-Repeat: N/A. >Fix: --- xbill.diff begins here --- diff -Nru xbill.orig/Makefile xbill/Makefile --- xbill.orig/Makefile Fri Feb 21 16:26:46 2003 +++ xbill/Makefile Fri Feb 21 16:25:32 2003 @@ -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 diff -Nru xbill.orig/distinfo xbill/distinfo --- xbill.orig/distinfo Fri Feb 21 16:26:46 2003 +++ xbill/distinfo Fri Feb 21 14:06:57 2003 @@ -1 +1 @@ -MD5 (xbill-2.0.tgz) = 132e4b340618924b6a41ec5ec106ca32 +MD5 (xbill-2.1.tar.gz) = 585e4866b15255a24203db9959407b2f diff -Nru xbill.orig/files/patch-aa xbill/files/patch-aa --- xbill.orig/files/patch-aa Fri Feb 21 16:26:46 2003 +++ xbill/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -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 -Nru xbill.orig/files/patch-ad xbill/files/patch-ad --- xbill.orig/files/patch-ad Fri Feb 21 16:26:46 2003 +++ xbill/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -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 -Nru xbill.orig/files/patch-ae xbill/files/patch-ae --- xbill.orig/files/patch-ae Fri Feb 21 16:26:46 2003 +++ xbill/files/patch-ae Thu Jan 1 01:00:00 1970 @@ -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 -Nru xbill.orig/files/patch-configure xbill/files/patch-configure --- xbill.orig/files/patch-configure Thu Jan 1 01:00:00 1970 +++ xbill/files/patch-configure Fri Feb 21 14:22:55 2003 @@ -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 -Nru xbill.orig/pkg-descr xbill/pkg-descr --- xbill.orig/pkg-descr Fri Feb 21 16:26:46 2003 +++ xbill/pkg-descr Fri Feb 21 14:07:28 2003 @@ -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 -Nru xbill.orig/pkg-plist xbill/pkg-plist --- xbill.orig/pkg-plist Fri Feb 21 16:26:46 2003 +++ xbill/pkg-plist Fri Feb 21 16:20:42 2003 @@ -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/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/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,12 @@ 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 +@dirrm share/xbill/scores @dirrm share/xbill/pixmaps +@dirrm share/xbill/bitmaps @dirrm share/xbill --- xbill.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message