From mitsuru@zebu.yokohama.riken.jp  Mon Sep 14 06:19:38 2009
Return-Path: <mitsuru@zebu.yokohama.riken.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A40231065672
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Sep 2009 06:19:38 +0000 (UTC)
	(envelope-from mitsuru@zebu.yokohama.riken.jp)
Received: from zebu.yokohama.riken.go.jp (zebu.yokohama.riken.go.jp [134.160.84.77])
	by mx1.freebsd.org (Postfix) with SMTP id DF8798FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Sep 2009 06:19:37 +0000 (UTC)
Received: (qmail 95157 invoked from network); 14 Sep 2009 05:53:19 -0000
Received: from localhost (HELO zebu.yokohama.riken.jp) (127.0.0.1)
  by zebu.yokohama.riken.go.jp with SMTP; 14 Sep 2009 05:53:19 -0000
Received: (from mitsuru@localhost)
	by zebu.yokohama.riken.jp (8.14.3/8.14.3/Submit) id n8E5rIpF095155;
	Mon, 14 Sep 2009 14:53:18 +0900 (JST)
	(envelope-from mitsuru)
Message-Id: <200909140553.n8E5rIpF095155@zebu.yokohama.riken.jp>
Date: Mon, 14 Sep 2009 14:53:18 +0900 (JST)
From: <mitsuru@riken.jp>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: net/csync2  a patch to compile with new gnuTLS 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         138804
>Category:       ports
>Synopsis:       Update port: net/csync2  a patch to compile with new gnuTLS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 14 06:20:02 UTC 2009
>Closed-Date:    Wed Sep 16 14:27:13 UTC 2009
>Last-Modified:  Wed Sep 16 14:30:10 UTC 2009
>Originator:     
>Release:        FreeBSD 7.2-RELEASE
>Organization:
>Environment:
System: FreeBSD 7.2-RELEASE


	
>Description:
	This is a patch to solve the problem of net/csync2, which does not
       compile with new gnuTLS.
>How-To-Repeat:
	
>Fix:


diff -ruN csync2.org/Makefile csync2/Makefile
--- csync2.org/Makefile	2009-09-03 14:39:39.000000000 +0900
+++ csync2/Makefile	2009-09-03 14:40:09.000000000 +0900
@@ -24,12 +24,11 @@
 
 MAN1=	csync2.1
 
-BROKEN=		does not compile with new gnuTLS
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
 
 PLIST_FILES=	etc/csync2.cfg-dist \
 		sbin/csync2 \
diff -ruN csync2.org/files/patch-configure csync2/files/patch-configure
--- csync2.org/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
+++ csync2/files/patch-configure	2009-09-03 14:23:51.000000000 +0900
@@ -0,0 +1,11 @@
+--- configure.org	2009-09-03 14:22:32.000000000 +0900
++++ configure	2009-09-03 14:23:02.000000000 +0900
+@@ -3836,7 +3836,7 @@
+   else
+     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+-    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
++    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
+ 
+ 
+       ac_save_CFLAGS="$CFLAGS"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Sep 14 17:54:34 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138804 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Sep 16 14:27:12 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138804: commit references a PR
Date: Wed, 16 Sep 2009 14:27:28 +0000 (UTC)

 miwi        2009-09-16 14:26:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/csync2           Makefile 
   Added files:
     net/csync2/files     patch-configure 
   Log:
   - Unbreak and fix build with gnuTLS
   
   PR:             138804
   Submitted by:   mitsuru@riken.jp
   Feature safe:   yes
   
   Revision  Changes    Path
   1.14      +1 -2      ports/net/csync2/Makefile
   1.1       +11 -0     ports/net/csync2/files/patch-configure (new)
 _______________________________________________
 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:
