From owner-svn-ports-head@FreeBSD.ORG  Mon May 27 18:53:19 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 31B835BF;
 Mon, 27 May 2013 18:53:19 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2429867B;
 Mon, 27 May 2013 18:53:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RIrIn4014533;
 Mon, 27 May 2013 18:53:18 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RIrITX014529;
 Mon, 27 May 2013 18:53:18 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201305271853.r4RIrITX014529@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Mon, 27 May 2013 18:53:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319278 - in head/net/rubygem-net-ldap: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 18:53:19 -0000

Author: swills
Date: Mon May 27 18:53:17 2013
New Revision: 319278
URL: http://svnweb.freebsd.org/changeset/ports/319278

Log:
  - Add patch to work correctly with ruby19
  
  PR:		ports/177883
  Submitted by:	Rainer Duffner <rainer@ultra-secure.de>
  Obtained from:	https://github.com/ruby-ldap/ruby-net-ldap/pull/41/files (upstream)

Added:
  head/net/rubygem-net-ldap/files/
  head/net/rubygem-net-ldap/files/patch-ruby19   (contents, props changed)
Modified:
  head/net/rubygem-net-ldap/Makefile   (contents, props changed)

Modified: head/net/rubygem-net-ldap/Makefile
==============================================================================
--- head/net/rubygem-net-ldap/Makefile	Mon May 27 17:49:44 2013	(r319277)
+++ head/net/rubygem-net-ldap/Makefile	Mon May 27 18:53:17 2013	(r319278)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	rubygem-net-ldap
-# Date created:		2010-05-13
-# Whom:			Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-#
+# Whom: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	net-ldap
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 

Added: head/net/rubygem-net-ldap/files/patch-ruby19
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/rubygem-net-ldap/files/patch-ruby19	Mon May 27 18:53:17 2013	(r319278)
@@ -0,0 +1,15 @@
+--- lib/net/ber/core_ext/string.rb
++++ lib/net/ber/core_ext/string.rb
+@@ -20,7 +20,11 @@ def raw_utf8_encoded
+     if self.respond_to?(:encode)
+       # Strings should be UTF-8 encoded according to LDAP.
+       # However, the BER code is not necessarily valid UTF-8
+-      self.encode('UTF-8').force_encoding('ASCII-8BIT')
++      begin
++        self.encode('UTF-8').force_encoding('ASCII-8BIT')
++      rescue Encoding::UndefinedConversionError
++        self
++      end
+     else
+       self
+     end