Sun Mar 27 15:49:40 2011 UTC ()
Ignore doxygen command not to generate doc files.


(taca)
diff -r1.4 -r1.5 pkgsrc/lang/ruby19-base/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/lang/ruby19-base/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/lang/ruby19-base/patches/patch-ab
cvs diff -r1.4 -r1.5 pkgsrc/lang/ruby19-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby19-base/Attic/distinfo 2011/02/21 14:44:11 1.4
+++ pkgsrc/lang/ruby19-base/Attic/distinfo 2011/03/27 15:49:40 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.4 2011/02/21 14:44:11 taca Exp $ 1$NetBSD: distinfo,v 1.5 2011/03/27 15:49:40 taca Exp $
2 2
3SHA1 (ruby-1.9.2-p180.tar.bz2) = 10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5 3SHA1 (ruby-1.9.2-p180.tar.bz2) = 10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5
4RMD160 (ruby-1.9.2-p180.tar.bz2) = a5870eaa18777342e562fdb513c2dd76d2045d78 4RMD160 (ruby-1.9.2-p180.tar.bz2) = a5870eaa18777342e562fdb513c2dd76d2045d78
5Size (ruby-1.9.2-p180.tar.bz2) = 8815756 bytes 5Size (ruby-1.9.2-p180.tar.bz2) = 8815756 bytes
6SHA1 (patch-aa) = 9e1d3cdbe76fc9bcc72e7de6dfc4ce5344d4510d 6SHA1 (patch-aa) = b54c275b76302feaceadde71d0deec1749c50254
7SHA1 (patch-ab) = e76b1fbb42a3a332e65b51a2ed4aab7024fcfc1e 7SHA1 (patch-ab) = 8924a50b312b9b660f4460a65d4887e17ebb1976
8SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68 8SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68
9SHA1 (patch-ad) = 872b9457ff410ccae7e8929fe994a0d1d4d80bb1 9SHA1 (patch-ad) = 872b9457ff410ccae7e8929fe994a0d1d4d80bb1
10SHA1 (patch-ae) = 5fffd09450e9f6fc4c47d3bdacaf2f4acb48f5b1 10SHA1 (patch-ae) = 5fffd09450e9f6fc4c47d3bdacaf2f4acb48f5b1
11SHA1 (patch-af) = 5a1024b66537e6dacefdc8a3aaa3d6c38c9ae171 11SHA1 (patch-af) = 5a1024b66537e6dacefdc8a3aaa3d6c38c9ae171
12SHA1 (patch-ag) = b99faa57872a04da29433ce122d94204932a10e0 12SHA1 (patch-ag) = b99faa57872a04da29433ce122d94204932a10e0
13SHA1 (patch-ah) = 33f95f111266ae5bf6f527ccbcd124ce25859890 13SHA1 (patch-ah) = 33f95f111266ae5bf6f527ccbcd124ce25859890
14SHA1 (patch-ai) = 3e4073e5e11739c0ba3e1c65f89dee169cac11cf 14SHA1 (patch-ai) = 3e4073e5e11739c0ba3e1c65f89dee169cac11cf
15SHA1 (patch-aj) = 245221025da25b6aa28d527672ca4bf0610b92dd 15SHA1 (patch-aj) = 245221025da25b6aa28d527672ca4bf0610b92dd
16SHA1 (patch-ak) = ac49cec94313d22058183f1a3af520591433b726 16SHA1 (patch-ak) = ac49cec94313d22058183f1a3af520591433b726
17SHA1 (patch-al) = c4f44e897e525c13a0276a3743fd203e290f6f97 17SHA1 (patch-al) = c4f44e897e525c13a0276a3743fd203e290f6f97
18SHA1 (patch-am) = 2136ab402ae94805c1585677eaa8cc6a83696374 18SHA1 (patch-am) = 2136ab402ae94805c1585677eaa8cc6a83696374
19SHA1 (patch-an) = ee50704eb4967b5df48fb3b6dfa4148f7c40dbba 19SHA1 (patch-an) = ee50704eb4967b5df48fb3b6dfa4148f7c40dbba
20SHA1 (patch-ao) = 32ba4bd0eccd849f7294bc60a66d181966e472b9 20SHA1 (patch-ao) = 32ba4bd0eccd849f7294bc60a66d181966e472b9
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/ruby19-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/ruby19-base/patches/Attic/patch-aa 2010/09/12 03:50:06 1.1.1.1
+++ pkgsrc/lang/ruby19-base/patches/Attic/patch-aa 2011/03/27 15:49:40 1.2
@@ -1,39 +1,53 @@ @@ -1,39 +1,53 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ 1$NetBSD: patch-aa,v 1.2 2011/03/27 15:49:40 taca Exp $
2 2
3Adding Interix support. 3* Adding Interix support.
 4* Ignore doxygen.
4 5
5--- configure.in.orig 2010-08-14 08:11:59.000000000 +0000 6--- configure.in.orig 2011-02-18 10:43:45.000000000 +0000
6+++ configure.in 7+++ configure.in
7@@ -958,6 +958,8 @@ main() 8@@ -351,11 +351,7 @@ AC_SUBST(MAKEDIRS)
 9
 10 AC_CHECK_TOOL(DOT, dot)
 11 AC_CHECK_TOOL(DOXYGEN, doxygen)
 12-if test x"$DOXYGEN" = x; then
 13- CAPITARGET=nodoc
 14-else
 15- CAPITARGET=capi
 16-fi
 17+CAPITARGET=nodoc
 18 AC_SUBST(CAPITARGET)
 19
 20 # checks for UNIX variants that set C preprocessor variables
 21@@ -980,6 +976,8 @@ main()
8 ], 22 ],
9 [superux*], [ ac_cv_func_setitimer=no 23 [superux*], [ ac_cv_func_setitimer=no
10 ], 24 ],
11+[interix*], [ LIBS="-lm $LIBS" 25+[interix*], [ LIBS="-lm $LIBS"
12+ ac_cv_func_getpgrp_void=yes], 26+ ac_cv_func_getpgrp_void=yes],
13 [ LIBS="-lm $LIBS"]) 27 [ LIBS="-lm $LIBS"])
14 AC_CHECK_LIB(crypt, crypt) 28 AC_CHECK_LIB(crypt, crypt)
15 AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV 29 AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
16@@ -1809,7 +1811,9 @@ if test "$with_dln_a_out" != yes; then 30@@ -1831,7 +1829,9 @@ if test "$with_dln_a_out" != yes; then
17 rb_cv_dlopen=yes], 31 rb_cv_dlopen=yes],
18 [interix*], [ : ${LDSHARED='$(CC) -shared'} 32 [interix*], [ : ${LDSHARED='$(CC) -shared'}
19 XLDFLAGS="$XLDFLAGS -Wl,-E" 33 XLDFLAGS="$XLDFLAGS -Wl,-E"
20+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 34+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
21 LIBPATHFLAG=" -L%1\$-s" 35 LIBPATHFLAG=" -L%1\$-s"
22+ RPATHFLAG=' -Wl,-R%1$-s' 36+ RPATHFLAG=' -Wl,-R%1$-s'
23 rb_cv_dlopen=yes], 37 rb_cv_dlopen=yes],
24 [freebsd*|dragonfly*], [ 38 [freebsd*|dragonfly*], [
25 : ${LDSHARED='$(CC) -shared'} 39 : ${LDSHARED='$(CC) -shared'}
26@@ -2164,7 +2168,12 @@ if test "$enable_shared" = 'yes'; then 40@@ -2188,7 +2188,12 @@ if test "$enable_shared" = 'yes'; then
27 LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' 41 LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
28 ], 42 ],
29 [interix*], [ 43 [interix*], [
30- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 44- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
31+ SOLIBS='$(LIBS)' 45+ SOLIBS='$(LIBS)'
32+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 46+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
33+ # link explicitly to 0x48000000 47+ # link explicitly to 0x48000000
34+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 48+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
35+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' 49+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
36+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 50+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
37 ]) 51 ])
38 fi 52 fi
39 if test "$enable_rpath" = yes; then 53 if test "$enable_rpath" = yes; then
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/ruby19-base/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/ruby19-base/patches/Attic/patch-ab 2010/09/12 03:50:06 1.1.1.1
+++ pkgsrc/lang/ruby19-base/patches/Attic/patch-ab 2011/03/27 15:49:40 1.2
@@ -1,43 +1,57 @@ @@ -1,43 +1,57 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ 1$NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
2 2
3Adding Interix support. 3* Adding Interix support.
 4* Ignore doxygen.
4 5
5--- configure.orig 2010-08-18 05:56:27.000000000 +0000 6--- configure.orig 2011-02-18 12:13:10.000000000 +0000
6+++ configure 7+++ configure
7@@ -9296,6 +9296,9 @@ esac 8@@ -5979,11 +5979,7 @@ else
 9 DOXYGEN="$ac_cv_prog_DOXYGEN"
 10 fi
 11
 12-if test x"$DOXYGEN" = x; then
 13- CAPITARGET=nodoc
 14-else
 15- CAPITARGET=capi
 16-fi
 17+CAPITARGET=nodoc
 18
 19
 20 # checks for UNIX variants that set C preprocessor variables
 21@@ -9459,6 +9455,9 @@ esac
8 superux*) : 22 superux*) :
9 ac_cv_func_setitimer=no 23 ac_cv_func_setitimer=no
10 ;; #( 24 ;; #(
11+ interix*) LIBS="-lm $LIBS" 25+ interix*) LIBS="-lm $LIBS"
12+ ac_cv_func_getpgrp_void=yes 26+ ac_cv_func_getpgrp_void=yes
13+ ;; #( 27+ ;; #(
14 *) : 28 *) :
15 LIBS="-lm $LIBS" ;; 29 LIBS="-lm $LIBS" ;;
16 esac 30 esac
17@@ -14926,8 +14929,12 @@ esac ;; #( 31@@ -15256,8 +15255,12 @@ esac ;; #(
18 rb_cv_dlopen=yes ;; #( 32 rb_cv_dlopen=yes ;; #(
19 interix*) : 33 interix*) :
20 : ${LDSHARED='$(CC) -shared'} 34 : ${LDSHARED='$(CC) -shared'}
21+ LDFLAGS="$LDFLAGS -Wl,-E" 35+ LDFLAGS="$LDFLAGS -Wl,-E"
22 XLDFLAGS="$XLDFLAGS -Wl,-E" 36 XLDFLAGS="$XLDFLAGS -Wl,-E"
23+ # use special random-slot linkage in 0x[56]XXXXXXX 37+ # use special random-slot linkage in 0x[56]XXXXXXX
24 LIBPATHFLAG=" -L%1\$-s" 38 LIBPATHFLAG=" -L%1\$-s"
25+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 39+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
26+ RPATHFLAG=' -Wl,-R%1$-s' 40+ RPATHFLAG=' -Wl,-R%1$-s'
27 rb_cv_dlopen=yes ;; #( 41 rb_cv_dlopen=yes ;; #(
28 freebsd*|dragonfly*) : 42 freebsd*|dragonfly*) :
29  43
30@@ -15424,7 +15431,12 @@ esac 44@@ -15756,7 +15759,12 @@ esac
31 ;; #( 45 ;; #(
32 interix*) : 46 interix*) :
33  47
34- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 48- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
35+ SOLIBS='$(LIBS)' 49+ SOLIBS='$(LIBS)'
36+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 50+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
37+ # link explicitly to 0x48000000 51+ # link explicitly to 0x48000000
38+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 52+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
39+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' 53+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
40+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 54+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
41 ;; #( 55 ;; #(
42 *) : 56 *) :
43 ;; 57 ;;