Mon Dec 15 08:58:52 2014 UTC ()
Change Tcl/Tk library name matching to pkgsrc naming, to be found correctly.
Resolve PR pkg/49382.


(obache)
diff -r1.41 -r1.42 pkgsrc/cad/xcircuit/Makefile
diff -r1.15 -r1.16 pkgsrc/cad/xcircuit/distinfo
diff -r1.10 -r1.11 pkgsrc/cad/xcircuit/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/cad/xcircuit/patches/patch-ab
cvs diff -r1.41 -r1.42 pkgsrc/cad/xcircuit/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/Makefile 2014/12/15 08:36:15 1.41
+++ pkgsrc/cad/xcircuit/Makefile 2014/12/15 08:58:52 1.42
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.41 2014/12/15 08:36:15 obache Exp $ 1# $NetBSD: Makefile,v 1.42 2014/12/15 08:58:52 obache Exp $
2 2
3DISTNAME= xcircuit-3.7.50 3DISTNAME= xcircuit-3.7.50
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= cad graphics 5CATEGORIES= cad graphics
6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ 6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= shaun@inerd.com 9MAINTAINER= shaun@inerd.com
10HOMEPAGE= http://opencircuitdesign.com/xcircuit/ 10HOMEPAGE= http://opencircuitdesign.com/xcircuit/
11COMMENT= Drawing program for X11 (especially for circuits) 11COMMENT= Drawing program for X11 (especially for circuits)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME} 14WRKSRC= ${WRKDIR}/${DISTNAME}
15USE_TOOLS+= gmake gs:run 15USE_TOOLS+= gmake gs:run
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
cvs diff -r1.15 -r1.16 pkgsrc/cad/xcircuit/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/distinfo 2013/06/11 13:31:58 1.15
+++ pkgsrc/cad/xcircuit/distinfo 2014/12/15 08:58:52 1.16
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.15 2013/06/11 13:31:58 ryoon Exp $ 1$NetBSD: distinfo,v 1.16 2014/12/15 08:58:52 obache Exp $
2 2
3SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5 3SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5
4RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e 4RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e
5Size (xcircuit-3.7.50.tgz) = 1649046 bytes 5Size (xcircuit-3.7.50.tgz) = 1649046 bytes
6SHA1 (patch-aa) = 914d486e9f7c8ed421fbc747d3a49b4cc210d845 6SHA1 (patch-aa) = 27b15c9105873f5ebe4b2ae7c04ed041a480d0f4
7SHA1 (patch-ab) = fe940fa499e8a4a7b717a7c8dfe6aca21500bd5e 7SHA1 (patch-ab) = a4fea15b8a432dd8db40073aa0dbaff8bc13eab6
cvs diff -r1.10 -r1.11 pkgsrc/cad/xcircuit/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/patches/patch-aa 2013/06/11 13:31:58 1.10
+++ pkgsrc/cad/xcircuit/patches/patch-aa 2014/12/15 08:58:52 1.11
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-aa,v 1.10 2013/06/11 13:31:58 ryoon Exp $ 1$NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $
 2
 3* portability fix
 4* match to pkgsrc shlib name
2 5
3--- configure.in.orig 2012-08-15 11:45:19.000000000 +0000 6--- configure.in.orig 2012-08-15 11:45:19.000000000 +0000
4+++ configure.in 7+++ configure.in
5@@ -164,7 +164,7 @@ AC_ARG_WITH(opengl, 8@@ -164,7 +164,7 @@ AC_ARG_WITH(opengl,
6 dnl Graphics double-buffering? Enabled by default unless OpenGL used. 9 dnl Graphics double-buffering? Enabled by default unless OpenGL used.
7 AC_ARG_ENABLE(double-buffer, 10 AC_ARG_ENABLE(double-buffer,
8 [ --disable-double-buffer disable graphics double-buffering], , [ 11 [ --disable-double-buffer disable graphics double-buffering], , [
9- if test "x$xc_with_GL" == "x" ; then 12- if test "x$xc_with_GL" == "x" ; then
10+ if test "x$xc_with_GL" = "x" ; then 13+ if test "x$xc_with_GL" = "x" ; then
11 AC_DEFINE(DOUBLEBUFFER) 14 AC_DEFINE(DOUBLEBUFFER)
12 else 15 else
13 AC_MSG_WARN(Double-buffering option not applicable to OpenGL version.) 16 AC_MSG_WARN(Double-buffering option not applicable to OpenGL version.)
14@@ -303,7 +303,7 @@ xc_with_tk_libraries="" 17@@ -303,7 +303,7 @@ xc_with_tk_libraries=""
@@ -25,13 +28,24 @@ $NetBSD: patch-aa,v 1.10 2013/06/11 13:3 @@ -25,13 +28,24 @@ $NetBSD: patch-aa,v 1.10 2013/06/11 13:3
25 if test -r "${xc_with_tcl_includes}/tcl.h" ; then 28 if test -r "${xc_with_tcl_includes}/tcl.h" ; then
26 TCL_INC_DIR=${xc_with_tcl_includes} 29 TCL_INC_DIR=${xc_with_tcl_includes}
27- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 30- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
28+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 31+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
29 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\"" 32 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\""
30 echo "Reverting to non-Tcl compilation" 33 echo "Reverting to non-Tcl compilation"
31 xc_with_tcl="" 34 xc_with_tcl=""
32 fi 35 fi
33- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 36- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
34+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 37+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
35 for dir in \ 38 for dir in \
36 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \ 39 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
37 ${TCL_PREFIX}/include \ 40 ${TCL_PREFIX}/include \
 41@@ -649,8 +649,8 @@ if test "x$xc_with_tcl" != "x" ; then
 42 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 43 ;;
 44 *)
 45- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
 46- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
 47+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
 48+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 49 ;;
 50 esac
 51
cvs diff -r1.11 -r1.12 pkgsrc/cad/xcircuit/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/patches/patch-ab 2013/06/11 13:31:58 1.11
+++ pkgsrc/cad/xcircuit/patches/patch-ab 2014/12/15 08:58:52 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.11 2013/06/11 13:31:58 ryoon Exp $ 1$NetBSD: patch-ab,v 1.12 2014/12/15 08:58:52 obache Exp $
2 2
3--- configure.orig 2012-08-15 11:45:19.000000000 +0000 3--- configure.orig 2012-08-15 11:45:19.000000000 +0000
4+++ configure 4+++ configure
5@@ -3794,12 +3794,12 @@ static char *f (char * (*g) (char **, in 5@@ -3794,12 +3794,12 @@ static char *f (char * (*g) (char **, in
6 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an 6 proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
7 array size at least. It's necessary to write '\x00'==0 to get something 7 array size at least. It's necessary to write '\x00'==0 to get something
8 that's true only with -std. */ 8 that's true only with -std. */
9-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; 9-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
10+int osf4_cc_array ['\x00' = 0 ? 1 : -1]; 10+int osf4_cc_array ['\x00' = 0 ? 1 : -1];
11  11
12 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters 12 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
13 inside strings and character constants. */ 13 inside strings and character constants. */
14 #define FOO(x) 'x' 14 #define FOO(x) 'x'
@@ -40,13 +40,24 @@ $NetBSD: patch-ab,v 1.11 2013/06/11 13:3 @@ -40,13 +40,24 @@ $NetBSD: patch-ab,v 1.11 2013/06/11 13:3
40 if test -r "${xc_with_tcl_includes}/tcl.h" ; then 40 if test -r "${xc_with_tcl_includes}/tcl.h" ; then
41 TCL_INC_DIR=${xc_with_tcl_includes} 41 TCL_INC_DIR=${xc_with_tcl_includes}
42- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 42- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
43+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 43+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
44 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\"" 44 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\""
45 echo "Reverting to non-Tcl compilation" 45 echo "Reverting to non-Tcl compilation"
46 xc_with_tcl="" 46 xc_with_tcl=""
47 fi 47 fi
48- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 48- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
49+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 49+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
50 for dir in \ 50 for dir in \
51 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \ 51 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
52 ${TCL_PREFIX}/include \ 52 ${TCL_PREFIX}/include \
 53@@ -6689,8 +6689,8 @@ if test "x$xc_with_tcl" != "x" ; then
 54 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 55 ;;
 56 *)
 57- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
 58- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
 59+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
 60+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 61 ;;
 62 esac
 63