svn commit: r402448 - in head/devel/libdistance: . files

[Jonathan Anderson]

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