From nobody@FreeBSD.org  Tue Apr  1 19:48:33 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4215A106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Apr 2008 19:48:33 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 318258FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Apr 2008 19:48:33 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m31JmUkA044212
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 1 Apr 2008 19:48:30 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m31JmUYw044211;
	Tue, 1 Apr 2008 19:48:30 GMT
	(envelope-from nobody)
Message-Id: <200804011948.m31JmUYw044211@www.freebsd.org>
Date: Tue, 1 Apr 2008 19:48:30 GMT
From: Frank Fenor <frank@fenor.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Make irc/eggdrop compile with Tcl versions other than 8.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         122354
>Category:       ports
>Synopsis:       Make irc/eggdrop compile with Tcl versions other than 8.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 19:50:03 UTC 2008
>Closed-Date:    Wed Apr 02 01:56:12 UTC 2008
>Last-Modified:  Wed Apr  2 02:00:08 UTC 2008
>Originator:     Frank Fenor
>Release:        FreeBSD 7.0-PRERELEASE
>Organization:
>Environment:
FreeBSD konzentrisch.de 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #5: Tue Feb  5 00:33:58 CET 2008
>Description:
Currently irc/eggdrop requires Tcl 8.4 which is wrong because eggdrop works just as good with other Tcl versions. If your system has (for example) Tcl 8.5 only, irc/eggdrop will install 8.4 instead of using 8.5. The attached patch changes the Makefile to use the bsd.tcl.mk functions to determine the newest installed Tcl version and point the eggdrop configure script to the appropriate files. I set the minimum required Tcl version to 8.0 (the smallest possible value) since the configure only requires 7.0.

I also removed the manual setting of the build target because it results in exactly the same as compared to having the ports system automatically set it. I assume, it's better to use the provided value in case of future changes.
If this was set on purpose to circumvent a problem in other environments, you should not include this change.
>How-To-Repeat:
pkg_delete tcl84
cd /usr/ports/irc/eggdrop
make clean && make
>Fix:
cd /usr/ports/irc/eggdrop && patch -p1 < patch.txt

Patch attached with submission follows:

diff -Nru eggdrop.vanilla/Makefile eggdrop/Makefile
--- eggdrop.vanilla/Makefile	2007-06-15 11:37:12.000000000 +0200
+++ eggdrop/Makefile	2008-04-01 21:19:13.000000000 +0200
@@ -19,13 +19,12 @@
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	The most popular open source Internet Relay Chat bot
 
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
+USE_TCL=	84+
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl84.so \
-		--with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
+CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
+		--with-tclinc=${TCL_INCLUDEDIR}/tcl.h
 
 OPTIONS=	SSL "Use SSL" off
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Apr 1 19:50:13 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122354 

From: "Frank Fenor" <frank@fenor.de>
To: <FreeBSD-gnats-submit@FreeBSD.org>,
	<freebsd-ports-bugs@FreeBSD.org>
Cc:  
Subject: Re: ports/122354: Make irc/eggdrop compile with Tcl versions other than 8.4
Date: Tue, 1 Apr 2008 22:19:15 +0200

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_0062_01C89446.6BAEF9B0
 Content-Type: text/plain;
 	format=flowed;
 	charset="Windows-1252";
 	reply-type=original
 Content-Transfer-Encoding: 7bit
 
 I meant to put USE_TCL=80+ into the patchfile, by accident I left the 84+ in 
 it. Sorry. 
 
 ------=_NextPart_000_0062_01C89446.6BAEF9B0
 Content-Type: application/octet-stream;
 	name="irc-eggdrop-systemtcl.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="irc-eggdrop-systemtcl.patch"
 
 diff -Nru eggdrop.vanilla/Makefile eggdrop/Makefile
 --- eggdrop.vanilla/Makefile	2007-06-15 11:37:12.000000000 +0200
 +++ eggdrop/Makefile	2008-04-01 21:19:13.000000000 +0200
 @@ -19,13 +19,12 @@
  MAINTAINER=	beech@FreeBSD.org
  COMMENT=	The most popular open source Internet Relay Chat bot
  
 -LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 +USE_TCL=	80+
  
  USE_BZIP2=	yes
  GNU_CONFIGURE=	yes
 -CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 -CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl84.so \
 -		--with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
 +CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
 +		--with-tclinc=${TCL_INCLUDEDIR}/tcl.h
  
  OPTIONS=	SSL "Use SSL" off
  
 
 ------=_NextPart_000_0062_01C89446.6BAEF9B0--
 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Wed Apr 2 01:55:57 UTC 2008 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122354 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122354: commit references a PR
Date: Wed,  2 Apr 2008 01:55:42 +0000 (UTC)

 beech       2008-04-02 01:55:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/eggdrop          Makefile 
   Log:
   - Fix compile with Tcl versions other than 8.4
   - Bump portrevision
   
   PR:             ports/122354
   Submitted by:   Frank Fenor <frank@fenor.de>
   
   Revision  Changes    Path
   1.17      +4 -4      ports/irc/eggdrop/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
