summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2013-05-18 07:39:36 +0000
committertaca <taca@pkgsrc.org>2013-05-18 07:39:36 +0000
commitca6a0ed1709c7ef152be040a574a82ffa0a87935 (patch)
tree7c85d2bb39c02eb0f270f42c174f122c928b191a /lang
parent34f1c5bc418da7609ae0005165737c3b3c7c5618 (diff)
downloadpkgsrc-ca6a0ed1709c7ef152be040a574a82ffa0a87935.tar.gz
Correct patch of configure scripts for DragonFly/FreeBSD.
That place was changed prior to my update of ruby193-base pacakge and I'm not sure it was correct or not. And suffix of libruby shared library has something historical part of pkgsrc. I don't care so much to changing the name, but also don't think it is so important thing to bump revisions. Noted by pkg/47831 from David Shao.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby193-base/distinfo6
-rw-r--r--lang/ruby193-base/patches/patch-configure28
-rw-r--r--lang/ruby193-base/patches/patch-configure.in26
3 files changed, 30 insertions, 30 deletions
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 843fa2f747e..cf597d08e5c 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2013/05/16 16:13:59 taca Exp $
+$NetBSD: distinfo,v 1.21 2013/05/18 07:39:36 taca Exp $
SHA1 (ruby-1.9.3-p429.tar.bz2) = 18f464c49c857fad3b3b277c8ef5eb8c30a7794a
RMD160 (ruby-1.9.3-p429.tar.bz2) = c39f2f713f6438c14e32f992d1e50e5624a84eba
Size (ruby-1.9.3-p429.tar.bz2) = 10042323 bytes
SHA1 (patch-Makefile.in) = 2d162718be709f8367b476148a2a68ebd527fb2f
-SHA1 (patch-configure) = 383a492bad17fa27d4aee8e68b360ac719c18dcd
-SHA1 (patch-configure.in) = ded6328a328a1ce79c937158e4ebbfecd7ca6db3
+SHA1 (patch-configure) = 635457438255f1ef2359739e80c95e066d2d54c7
+SHA1 (patch-configure.in) = cec3db9f3ec245f13515059102cb3c66449b26aa
SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index cc04e387052..287b516f3c0 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
+$NetBSD: patch-configure,v 1.9 2013/05/18 07:39:36 taca Exp $
* Adding Interix and MirBSD support.
* Ignore doxygen.
---- configure.orig 2013-05-14 11:40:01.000000000 +0000
+--- configure.orig 2013-05-14 16:42:05.000000000 +0000
+++ configure
-@@ -10724,6 +10724,9 @@ esac
+@@ -10738,6 +10738,9 @@ esac
superux*) :
ac_cv_func_setitimer=no
;; #(
@@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
*) :
LIBS="-lm $LIBS" ;;
esac
-@@ -11327,7 +11330,13 @@ for ac_header in limits.h sys/file.h sys
+@@ -11341,7 +11344,13 @@ for ac_header in limits.h sys/file.h sys
net/socket.h sys/socket.h process.h atomic.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -12072,6 +12081,9 @@ fi
+@@ -12086,6 +12095,9 @@ fi
ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
#include <time.h>
#endif
@@ -40,7 +40,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
"
if test "x$ac_cv_type_struct_timespec" = xyes; then :
-@@ -13863,6 +13875,8 @@ else
+@@ -13877,6 +13889,8 @@ else
# ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca
@@ -49,7 +49,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
# else
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-@@ -15803,7 +15817,7 @@ done
+@@ -15817,7 +15831,7 @@ done
MAINLIBS="-pthread $MAINLIBS" ;; #(
*) :
case "$target_os" in #(
@@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
LIBS="-pthread $LIBS" ;; #(
*) :
LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16253,7 +16267,9 @@ esac ;; #(
+@@ -16267,7 +16281,9 @@ esac ;; #(
interix*) :
: ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -68,7 +68,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
rb_cv_dlopen=yes ;; #(
freebsd*|dragonfly*) :
-@@ -16265,7 +16281,7 @@ esac ;; #(
+@@ -16279,7 +16295,7 @@ esac ;; #(
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;; #(
@@ -77,16 +77,16 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16796,7 +16812,7 @@ _ACEOF
+@@ -16810,7 +16826,7 @@ _ACEOF
freebsd*|dragonfly*) :
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)\$(TEENY)'
++ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -16813,7 +16829,7 @@ _ACEOF
+@@ -16827,7 +16843,7 @@ _ACEOF
LIBRUBY_ALIASES=""
fi
;; #(
@@ -95,7 +95,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16874,7 +16890,12 @@ esac
+@@ -16888,7 +16904,12 @@ esac
;; #(
interix*) :
@@ -109,7 +109,7 @@ $NetBSD: patch-configure,v 1.8 2013/05/16 16:13:59 taca Exp $
;; #(
*) :
;;
-@@ -16937,11 +16958,7 @@ if test "$install_doc" != no; then
+@@ -16951,11 +16972,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi
diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in
index f960c3fcf38..a77779c4f94 100644
--- a/lang/ruby193-base/patches/patch-configure.in
+++ b/lang/ruby193-base/patches/patch-configure.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
+$NetBSD: patch-configure.in,v 1.8 2013/05/18 07:39:36 taca Exp $
* Adding Interix and MirBSD support.
* Ignore doxygen.
---- configure.in.orig 2013-05-14 02:23:27.000000000 +0000
+--- configure.in.orig 2013-05-14 15:26:08.000000000 +0000
+++ configure.in
-@@ -1129,6 +1129,8 @@ main()
+@@ -1136,6 +1136,8 @@ main()
],
[superux*], [ ac_cv_func_setitimer=no
],
@@ -14,7 +14,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
[ LIBS="-lm $LIBS"])
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
-@@ -1169,7 +1171,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys
+@@ -1176,7 +1178,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys
syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
@@ -28,7 +28,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
AC_TYPE_SIZE_T
RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
-@@ -1202,6 +1209,9 @@ AC_CHECK_TYPES([struct timeval], [], [],
+@@ -1209,6 +1216,9 @@ AC_CHECK_TYPES([struct timeval], [], [],
AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
@%:@include <time.h>
@@ -38,7 +38,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
@%:@endif])
AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@@ -1794,7 +1804,7 @@ if test x"$enable_pthread" = xyes; then
+@@ -1801,7 +1811,7 @@ if test x"$enable_pthread" = xyes; then
[root], [],
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
[AS_CASE(["$target_os"],
@@ -47,7 +47,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
[LIBS="-l$pthread_lib $LIBS"])])
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-@@ -2025,7 +2035,9 @@ if test "$with_dln_a_out" != yes; then
+@@ -2032,7 +2042,9 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes],
[interix*], [ : ${LDSHARED='$(CC) -shared'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -57,7 +57,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
rb_cv_dlopen=yes],
[freebsd*|dragonfly*], [
: ${LDSHARED='$(CC) -shared'}
-@@ -2036,7 +2048,7 @@ if test "$with_dln_a_out" != yes; then
+@@ -2043,7 +2055,7 @@ if test "$with_dln_a_out" != yes; then
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes],
@@ -66,16 +66,16 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
-@@ -2337,7 +2349,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2344,7 +2356,7 @@ AS_CASE("$enable_shared", [yes], [
],
[freebsd*|dragonfly*], [
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)\$(TEENY)'
++ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
-@@ -2353,7 +2365,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2360,7 +2372,7 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES=""
fi
],
@@ -84,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
],
-@@ -2403,7 +2415,12 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2410,7 +2422,12 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
],
[interix*], [
@@ -98,7 +98,7 @@ $NetBSD: patch-configure.in,v 1.7 2013/05/16 16:13:59 taca Exp $
])
], [
LIBRUBYARG_SHARED=
-@@ -2448,11 +2465,7 @@ if test "$install_doc" != no; then
+@@ -2455,11 +2472,7 @@ if test "$install_doc" != no; then
else
RDOCTARGET="nodoc"
fi