From tom@eborcom.com  Sun Jan 24 09:46:37 1999
Received: from mail2.svr.pol.co.uk (mail2.svr.pol.co.uk [195.92.193.210])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id JAA26645
          for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Jan 1999 09:46:36 -0800 (PST)
          (envelope-from tom@eborcom.com)
Received: from modem-31.ytterbium.dialup.pol.co.uk ([62.136.34.159])
	by mail2.svr.pol.co.uk with esmtp (Exim 2.10 #1)
	id 104Tc7-0002Ma-00
	for FreeBSD-gnats-submit@freebsd.org; Sun, 24 Jan 1999 17:46:24 +0000
Received: (qmail 4333 invoked by uid 5000); 24 Jan 1999 17:08:42 -0000
Message-Id: <19990124170842.4332.qmail@eborcom.com>
Date: 24 Jan 1999 17:08:42 -0000
From: Tom Hukins <tom@eborcom.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: freeciv port does not honour ${PREFIX}
X-Send-Pr-Version: 3.2

>Number:         9667
>Category:       ports
>Synopsis:       freeciv port does not honour ${PREFIX}
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 24 09:50:01 PST 1999
>Closed-Date:    Sat Jan 30 09:48:54 PST 1999
>Last-Modified:  Sat Jan 30 09:49:08 PST 1999
>Originator:     Tom Hukins
>Release:        FreeBSD 2.2.8-STABLE i386
>Organization:
eBORcOM
>Environment:

	

>Description:

The port of Freeciv uses HAS_CONFIGURE instead of GNU_CONFIGURE, and
thus does not honour ${PREFIX}.

The patch attached fixes this, and also modifies the port to use a
bzip2 compressed distfile. This issue was discussed recently in
freebsd-ports.

I sent in a patch similar to this for ports/9449, when Freeciv was
upgraded from 1.7.1 to 1.7.2, but my patch was not applied.

>How-To-Repeat:

	

>Fix:
	
diff -ruN freeciv.old/Makefile freeciv/Makefile
--- freeciv.old/Makefile	Sat Jan 23 16:41:09 1999
+++ freeciv/Makefile	Sun Jan 24 17:01:54 1999
@@ -3,17 +3,23 @@
 # Date created:		Jun 20 1997
 # Whom:			ada@bsd.org
 #
-# $Id: Makefile,v 1.14 1999/01/18 03:24:01 steve Exp $
+# $Id$
 #
 
 DISTNAME=	freeciv-1.7.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ada@bsd.org
 
+BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-HAS_CONFIGURE=	yes
+EXTRACT_CMD=	bzip2
+EXTRACT_BEFORE_ARGS= -cd
+EXTRACT_AFTER_ARGS= | tar xf -
+
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff -ruN freeciv.old/files/md5 freeciv/files/md5
--- freeciv.old/files/md5	Sat Jan 23 16:41:09 1999
+++ freeciv/files/md5	Tue Jan 12 17:47:51 1999
@@ -1,3 +1 @@
-MD5 (freeciv-1.0k.tar.Z) = 317845454015fd3c0c4e6fdf6a6c57c6
-MD5 (freeciv-151.tgz) = 4e15c94feef647bd93934243dbb853d7
-MD5 (freeciv-1.7.2.tar.gz) = 2058dd135c5eaa4f9a83e0ab6f228d03
+MD5 (freeciv-1.7.2.tar.bz2) = 88d5ab3a0482df864fcb53fd387d3239
>Release-Note:
>Audit-Trail:

From: Steve Price <sprice@hiwaay.net>
To: Tom Hukins <tom@eborcom.com>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/9667: freeciv port does not honour ${PREFIX}
Date: Sun, 24 Jan 1999 12:34:19 -0600 (CST)

 On 24 Jan 1999, Tom Hukins wrote:
 
 # The port of Freeciv uses HAS_CONFIGURE instead of GNU_CONFIGURE, and
 # thus does not honour ${PREFIX}.
 # 
 # The patch attached fixes this, and also modifies the port to use a
 # bzip2 compressed distfile. This issue was discussed recently in
 # freebsd-ports.
 
 I remember this discussion too.  If our plans are really to use
 bzip2 for all new ports that support it, we should probably get
 Satoshi to add something like USE_BZIP2 so we don't have to litter
 every port with the BUILD_DEPENDS and EXTRACT_* cruft to
 support it.  IMHO.
 
 # >Fix:
 # 	
 # diff -ruN freeciv.old/Makefile freeciv/Makefile
 # --- freeciv.old/Makefile	Sat Jan 23 16:41:09 1999
 # +++ freeciv/Makefile	Sun Jan 24 17:01:54 1999
 # @@ -3,17 +3,23 @@
 #  # Date created:		Jun 20 1997
 #  # Whom:			ada@bsd.org
 #  #
 # -# $Id: Makefile,v 1.14 1999/01/18 03:24:01 steve Exp $
 # +# $Id$
 #  #
 
 Please don't do this.  This will be automagically updated when
 your fix gets committed.
 
 [remainder of patch elided]
 
State-Changed-From-To: open->closed 
State-Changed-By: vanilla 
State-Changed-When: Sat Jan 30 09:48:54 PST 1999 
State-Changed-Why:  
Committed, thanks. 
>Unformatted:
