From owner-svn-ports-head@freebsd.org Thu Nov 26 13:39:57 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BABA2A36BAB; Thu, 26 Nov 2015 13:39:57 +0000 (UTC) (envelope-from jonathan@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E3081DE7; Thu, 26 Nov 2015 13:39:57 +0000 (UTC) (envelope-from jonathan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQDduge022063; Thu, 26 Nov 2015 13:39:56 GMT (envelope-from jonathan@FreeBSD.org) Received: (from jonathan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQDduti022059; Thu, 26 Nov 2015 13:39:56 GMT (envelope-from jonathan@FreeBSD.org) Message-Id: <201511261339.tAQDduti022059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jonathan set sender to jonathan@FreeBSD.org using -f From: Jonathan Anderson Date: Thu, 26 Nov 2015 13:39:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402448 - in head/devel/libdistance: . 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2015 13:39:57 -0000 Author: jonathan (src committer) Date: Thu Nov 26 13:39:56 2015 New Revision: 402448 URL: https://svnweb.freebsd.org/changeset/ports/402448 Log: Stop clobbering libdistance with its own swig wrapper. The libdistance library should be called libdistance.so and its swig wrapper should be called libdistance_wrap.so. Approved by: brooks Differential Revision: https://reviews.freebsd.org/D4194 Modified: head/devel/libdistance/Makefile head/devel/libdistance/files/patch-Makefile head/devel/libdistance/files/patch-swig_tcl_Makefile head/devel/libdistance/pkg-plist Modified: head/devel/libdistance/Makefile ============================================================================== --- head/devel/libdistance/Makefile Thu Nov 26 13:36:45 2015 (r402447) +++ head/devel/libdistance/Makefile Thu Nov 26 13:39:56 2015 (r402448) @@ -2,6 +2,7 @@ PORTNAME= libdistance PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://monkey.org/~jose/software/libdistance/ Modified: head/devel/libdistance/files/patch-Makefile ============================================================================== --- head/devel/libdistance/files/patch-Makefile Thu Nov 26 13:36:45 2015 (r402447) +++ head/devel/libdistance/files/patch-Makefile Thu Nov 26 13:39:56 2015 (r402448) @@ -1,7 +1,10 @@ --- Makefile.orig 2014-10-10 13:11:38 UTC +++ Makefile -@@ -3,6 +3,7 @@ +@@ -1,8 +1,10 @@ + # $Id: Makefile,v 1.5 2004/11/29 21:42:14 jose Exp $ + LIB= distance ++SHLIB_MAJOR= 1 SRCS= levenshtein.c hamming.c bloom.c needleman_wunsch.c jaccard.c SRCS+= minkowski.c damerau.c +INCS= distance.h Modified: head/devel/libdistance/files/patch-swig_tcl_Makefile ============================================================================== --- head/devel/libdistance/files/patch-swig_tcl_Makefile Thu Nov 26 13:36:45 2015 (r402447) +++ head/devel/libdistance/files/patch-swig_tcl_Makefile Thu Nov 26 13:39:56 2015 (r402448) @@ -4,7 +4,7 @@ # $Id: Makefile,v 1.2 2004/11/30 00:26:59 jose Exp $ -all: distance.so -+LIB= distance ++LIB= distance_wrap +SHLIB_MAJOR= 1 -distance_wrap.o: ../distance.i Modified: head/devel/libdistance/pkg-plist ============================================================================== --- head/devel/libdistance/pkg-plist Thu Nov 26 13:36:45 2015 (r402447) +++ head/devel/libdistance/pkg-plist Thu Nov 26 13:39:56 2015 (r402448) @@ -3,5 +3,9 @@ lib/libdistance.a lib/libdistance.so lib/libdistance.so.1 lib/libdistance_p.a +lib/libdistance_wrap.a +lib/libdistance_wrap.so +lib/libdistance_wrap.so.1 +lib/libdistance_wrap_p.a man/man3/distance.3.gz tests/libdistance/test