From sean-freebsd@farley.org  Wed Jan 17 15:17:08 2007
Return-Path: <sean-freebsd@farley.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ED03E16A407;
	Wed, 17 Jan 2007 15:17:08 +0000 (UTC)
	(envelope-from sean-freebsd@farley.org)
Received: from mail.farley.org (farley.org [67.64.95.201])
	by mx1.freebsd.org (Postfix) with ESMTP id 39E6613C459;
	Wed, 17 Jan 2007 15:17:08 +0000 (UTC)
	(envelope-from sean-freebsd@farley.org)
Received: from thor.farley.org (thor.farley.org [192.168.1.5])
	by mail.farley.org (8.13.8/8.13.8) with ESMTP id l0HFJYcb071641;
	Wed, 17 Jan 2007 09:19:34 -0600 (CST)
	(envelope-from sean-freebsd@mail.farley.org)
Received: from thor.farley.org (localhost [127.0.0.1])
	by thor.farley.org (8.13.8/8.13.8) with ESMTP id l0HFGpVY049202;
	Wed, 17 Jan 2007 09:16:51 -0600 (CST)
	(envelope-from sean-freebsd@thor.farley.org)
Received: (from root@localhost)
	by thor.farley.org (8.13.8/8.13.8/Submit) id l0HFGpL4049201;
	Wed, 17 Jan 2007 09:16:51 -0600 (CST)
	(envelope-from sean-freebsd)
Message-Id: <200701171516.l0HFGpL4049201@thor.farley.org>
Date: Wed, 17 Jan 2007 09:16:51 -0600 (CST)
From: Sean Farley <sean-freebsd@farley.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: marcus@freebsd.org
Subject: [PATCH] net-im/libgaim: fix for silc support
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108040
>Category:       ports
>Synopsis:       [PATCH] net-im/libgaim: fix for silc support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcus
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 17 15:20:16 GMT 2007
>Closed-Date:    Mon Jan 22 06:28:34 GMT 2007
>Last-Modified:  Mon Jan 22 06:30:19 GMT 2007
>Originator:     Sean Farley
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Thu Dec 28 14:01:21 CST 2006
>Description:
- Fixed sed script to match the current configure script.
- Registered iconv dependency for silc.  Is it needed at other times?
- Added --with-silc-libs to CONFIGURE_ARGS.

I am sorry I did not find this before the earlier PR (ports/108027).

Port maintainer (marcus@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- libgaim-2.0.0.b5_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-im/libgaim.orig/Makefile /usr/ports/net-im/libgaim/Makefile
--- /usr/ports/net-im/libgaim.orig/Makefile	Tue Jan 16 23:35:08 2007
+++ /usr/ports/net-im/libgaim/Makefile	Wed Jan 17 09:11:28 2007
@@ -128,8 +128,10 @@
 .endif
 
 .if defined(WITH_SILC)
+USE_ICONV=		yes
 LIB_DEPENDS+=		silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit
-CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc
+CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc \
+			--with-silc-libs=${LOCALBASE}/lib
 PLIST_SUB+=		SILC=""
 PRPL_MODULES:=		${PRPL_MODULES},silc
 .else
@@ -218,7 +220,7 @@
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|-lpanel |-lpanel -lncurses|g' \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
-		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
+		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
 		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
 		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
 			${WRKSRC}/configure
--- libgaim-2.0.0.b5_1.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->marcus 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jan 17 15:20:27 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108040 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Mon Jan 22 06:28:21 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108040: commit references a PR
Date: Mon, 22 Jan 2007 06:28:20 +0000 (UTC)

 marcus      2007-01-22 06:28:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/libgaim       Makefile 
   Log:
   Fix SILC support.
   
   PR:             108040
   Submitted by:   Sean Farley <sean-freebsd@farley.org>
   
   Revision  Changes    Path
   1.13      +5 -3      ports/net-im/libgaim/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:
