Change Tcl/Tk library name matching to pkgsrc naming, to be found correctly.

Resolve PR pkg/49382.

4 files changed, 32 insertions, 7 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index a70f351b8ec..d37cbf84145 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2014/12/15 08:36:15 obache Exp $
+# $NetBSD: Makefile,v 1.42 2014/12/15 08:58:52 obache Exp $
 
 DISTNAME=	xcircuit-3.7.50
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/
 EXTRACT_SUFX=	.tgz
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 88459ee084f..3657e7a267a 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2013/06/11 13:31:58 ryoon Exp $
+$NetBSD: distinfo,v 1.16 2014/12/15 08:58:52 obache Exp $
 
 SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5
 RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e
 Size (xcircuit-3.7.50.tgz) = 1649046 bytes
-SHA1 (patch-aa) = 914d486e9f7c8ed421fbc747d3a49b4cc210d845
-SHA1 (patch-ab) = fe940fa499e8a4a7b717a7c8dfe6aca21500bd5e
+SHA1 (patch-aa) = 27b15c9105873f5ebe4b2ae7c04ed041a480d0f4
+SHA1 (patch-ab) = a4fea15b8a432dd8db40073aa0dbaff8bc13eab6
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index bba09bd50d8..c84fa59519f 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2013/06/11 13:31:58 ryoon Exp $
+$NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $
+
+* portability fix
+* match to pkgsrc shlib name
 
 --- configure.in.orig	2012-08-15 11:45:19.000000000 +0000
 +++ configure.in
@@ -35,3 +38,14 @@ $NetBSD: patch-aa,v 1.10 2013/06/11 13:31:58 ryoon Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
+@@ -649,8 +649,8 @@ if test "x$xc_with_tcl" != "x" ; then
+       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+       ;;
+     *)
+-      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+-      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
++      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+       ;;
+   esac
+ 
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index aeba5c6201d..9a2acb3e9d6 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.11 2013/06/11 13:31:58 ryoon Exp $
+$NetBSD: patch-ab,v 1.12 2014/12/15 08:58:52 obache Exp $
 
 --- configure.orig	2012-08-15 11:45:19.000000000 +0000
 +++ configure
@@ -50,3 +50,14 @@ $NetBSD: patch-ab,v 1.11 2013/06/11 13:31:58 ryoon Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
+@@ -6689,8 +6689,8 @@ if test "x$xc_with_tcl" != "x" ; then
+       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+       ;;
+     *)
+-      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+-      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
++      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+       ;;
+   esac
+