Thu Aug 15 16:27:35 2013 UTC ()
Don't use ${libdir} when linking sockets.so as it will be relinked
during install stage and get the DESTDIR prepended.


(joerg)
diff -r1.1 -r1.2 pkgsrc/lang/ruby200-base/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ruby200-base/patches/patch-configure
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby200-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby200-base/Attic/distinfo 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/Attic/distinfo 2013/08/15 16:27:35 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.1 2013/07/21 02:32:58 taca Exp $ 1$NetBSD: distinfo,v 1.2 2013/08/15 16:27:35 joerg Exp $
2 2
3SHA1 (ruby-2.0.0-p247.tar.bz2) = 9d3e5758c87a2c8016aec246f278b7551f8cb675 3SHA1 (ruby-2.0.0-p247.tar.bz2) = 9d3e5758c87a2c8016aec246f278b7551f8cb675
4RMD160 (ruby-2.0.0-p247.tar.bz2) = 4a3b6653f17c145c6938c538022c199f830a0dee 4RMD160 (ruby-2.0.0-p247.tar.bz2) = 4a3b6653f17c145c6938c538022c199f830a0dee
5Size (ruby-2.0.0-p247.tar.bz2) = 10804581 bytes 5Size (ruby-2.0.0-p247.tar.bz2) = 10804581 bytes
6SHA1 (patch-configure) = 2e1d733bbbbf1f598d0c57a9ac79f5cfa63de67f 6SHA1 (patch-configure) = ddd8dd57b86f3e77d5004287a5be7883a78cd0be
7SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec 7SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
8SHA1 (patch-ext_tk_extconf.rb) = 537db204c7a766602529ce48ef89a2fc7cbda19f 8SHA1 (patch-ext_tk_extconf.rb) = 537db204c7a766602529ce48ef89a2fc7cbda19f
9SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc 9SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc
10SHA1 (patch-lib_rubygems.rb) = ebb230dbfdeecaf764fd089d2aa1baaac1dbd34b 10SHA1 (patch-lib_rubygems.rb) = ebb230dbfdeecaf764fd089d2aa1baaac1dbd34b
11SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 266f1059d3d180637eec4fa3f1ea127a29b4aff8 11SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 266f1059d3d180637eec4fa3f1ea127a29b4aff8
12SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = f39435fbdbbfcc8c756e54fcbec89a4ff796ee2d 12SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = f39435fbdbbfcc8c756e54fcbec89a4ff796ee2d
13SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05 13SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05
14SHA1 (patch-lib_rubygems_config__file.rb) = cb7e22fa912d7043aabde8c916c45108b51e5361 14SHA1 (patch-lib_rubygems_config__file.rb) = cb7e22fa912d7043aabde8c916c45108b51e5361
15SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985 15SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985
16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 501860ee30861b5a1e4cf75502334145ce57f575 16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 501860ee30861b5a1e4cf75502334145ce57f575
17SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = 63b6b67116073fa2fc11ece20dc9a232b322604a 17SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = 63b6b67116073fa2fc11ece20dc9a232b322604a
18SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf 18SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf
19SHA1 (patch-lib_rubygems_installer.rb) = ef2ab9f965fc7946e68c8d751d3c21a2c676f343 19SHA1 (patch-lib_rubygems_installer.rb) = ef2ab9f965fc7946e68c8d751d3c21a2c676f343
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby200-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby200-base/patches/Attic/patch-configure 2013/07/21 02:32:58 1.1
+++ pkgsrc/lang/ruby200-base/patches/Attic/patch-configure 2013/08/15 16:27:35 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure,v 1.1 2013/07/21 02:32:58 taca Exp $ 1$NetBSD: patch-configure,v 1.2 2013/08/15 16:27:35 joerg Exp $
2 2
3* Adding Interix and MirBSD support. 3* Adding Interix and MirBSD support.
4* Ignore doxygen. 4* Ignore doxygen.
5 5
6--- configure.orig 2013-06-27 11:16:17.000000000 +0000 6--- configure.orig 2013-06-27 11:16:17.000000000 +0000
7+++ configure 7+++ configure
8@@ -8259,6 +8259,10 @@ esac 8@@ -8259,6 +8259,10 @@ esac
9 superux*) : 9 superux*) :
10 ac_cv_func_setitimer=no 10 ac_cv_func_setitimer=no
11 ;; #( 11 ;; #(
12+ interix*) : 12+ interix*) :
13+ LIBS="-lm $LIBS" 13+ LIBS="-lm $LIBS"
14+ ac_cv_func_getpgrp_void=yes 14+ ac_cv_func_getpgrp_void=yes
@@ -70,31 +70,40 @@ $NetBSD: patch-configure,v 1.1 2013/07/2 @@ -70,31 +70,40 @@ $NetBSD: patch-configure,v 1.1 2013/07/2
70+ openbsd*|mirbsd*) : 70+ openbsd*|mirbsd*) :
71  71
72 SOLIBS='$(LIBS)' 72 SOLIBS='$(LIBS)'
73 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` 73 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
74@@ -18332,7 +18340,12 @@ esac 74@@ -18332,7 +18340,12 @@ esac
75 ;; #( 75 ;; #(
76 interix*) : 76 interix*) :
77  77
78- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 78- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
79+ SOLIBS='$(LIBS)' 79+ SOLIBS='$(LIBS)'
80+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 80+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
81+ # link explicitly to 0x48000000 81+ # link explicitly to 0x48000000
82+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 82+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
83+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' 83+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
84+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 84+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
85 ;; #( 85 ;; #(
86 mingw*|cygwin*|mswin*) : 86 mingw*|cygwin*|mswin*) :
87  87
 88@@ -18490,7 +18503,7 @@ esac
 89 esac
 90 if test "$enable_rpath" = yes; then
 91 test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
 92- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
 93+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib -L\$(libdir)"
 94 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
 95 LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 96 fi
88@@ -18655,11 +18668,7 @@ if test "$install_doc" != no; then 97@@ -18655,11 +18668,7 @@ if test "$install_doc" != no; then
89 else 98 else
90 RDOCTARGET="nodoc" 99 RDOCTARGET="nodoc"
91 fi 100 fi
92- if test "$install_capi" != no -a -n "$DOXYGEN"; then 101- if test "$install_capi" != no -a -n "$DOXYGEN"; then
93- CAPITARGET="capi" 102- CAPITARGET="capi"
94- else 103- else
95- CAPITARGET="nodoc" 104- CAPITARGET="nodoc"
96- fi 105- fi
97+ CAPITARGET="nodoc" 106+ CAPITARGET="nodoc"
98 else 107 else
99 RDOCTARGET="nodoc" 108 RDOCTARGET="nodoc"
100 CAPITARGET="nodoc" 109 CAPITARGET="nodoc"