summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2012-08-25 11:51:24 +0000
committerbsiegert <bsiegert>2012-08-25 11:51:24 +0000
commit4caf2d035d1e8b745db0d5bcf774b4141bd8745d (patch)
tree0fb4cc5762715c634bfc56bb94052ef2e4a75648 /x11
parentb5dd672cf15228a05a3cd5466e483076b0b0e39f (diff)
downloadpkgsrc-4caf2d035d1e8b745db0d5bcf774b4141bd8745d.tar.gz
Fix build of the shared library on MirBSD and likely also on OpenBSD.
No pkgrevision bump, as it did not build on these platforms anyway.
Diffstat (limited to 'x11')
-rw-r--r--x11/tk/distinfo4
-rw-r--r--x11/tk/patches/patch-unix_configure29
2 files changed, 30 insertions, 3 deletions
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 8fcef437159..2f3759586c4 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2012/08/22 22:05:05 marino Exp $
+$NetBSD: distinfo,v 1.37 2012/08/25 11:51:24 bsiegert Exp $
SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db
RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372
Size (tk8.5.12-src.tar.gz) = 3826062 bytes
SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5
-SHA1 (patch-unix_configure) = 5bb82c26a00e0660d20ebe8d42aa9e4b1a0e6346
+SHA1 (patch-unix_configure) = ae2889cd4f783c13317786edd3c5ba3dd8b2882f
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index 40d008b2309..890901bece5 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:05:06 marino Exp $
+$NetBSD: patch-unix_configure,v 1.3 2012/08/25 11:51:24 bsiegert Exp $
--- unix/configure.orig 2012-07-25 16:45:53.000000000 +0000
+++ unix/configure
@@ -15,6 +15,24 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:05:06 marino Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = yes; then
+@@ -5837,7 +5837,7 @@ fi
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+- OpenBSD-*)
++ OpenBSD-*|MirBSD-*)
+ arch=`arch -s`
+ case "$arch" in
+ m88k|vax)
+@@ -5858,7 +5858,7 @@ fi
+ fi
+
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+ ;;
+ esac
+ case "$arch" in
@@ -5930,7 +5930,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
@@ -60,6 +78,15 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:05:06 marino Exp $
TCL_LIB_VERSIONS_OK=nodots
;;
Darwin-*)
+@@ -7159,7 +7153,7 @@ fi
+ BSD/OS*) ;;
+ CYGWIN_*|MINGW32_*) ;;
+ IRIX*) ;;
+- NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++ NetBSD-*|FreeBSD-*|OpenBSD-*|MirBSD-*) ;;
+ Darwin-*) ;;
+ SCO_SV-3.2*) ;;
+ *) SHLIB_CFLAGS="-fPIC" ;;
@@ -7190,7 +7184,7 @@ fi
else