From 437200e134dcac92af5cb021d2c51a99b88f6b64 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 18 Sep 2005 13:36:30 +0000 Subject: Adding DrafonFly BSD support provided by Joerg Sonnenberger. Bump PKGREVISION. --- lang/ruby16-base/Makefile | 3 ++- lang/ruby16-base/distinfo | 7 +++--- lang/ruby16-base/patches/patch-aa | 50 ++++++++++++++++++++++++++++---------- lang/ruby16-base/patches/patch-ab | 51 +++++++++++++++++++++++++++++---------- lang/ruby16-base/patches/patch-al | 22 +++++++++++++++++ 5 files changed, 103 insertions(+), 30 deletions(-) create mode 100644 lang/ruby16-base/patches/patch-al (limited to 'lang') diff --git a/lang/ruby16-base/Makefile b/lang/ruby16-base/Makefile index 2e41329fb1d..3ca5b7bde9d 100644 --- a/lang/ruby16-base/Makefile +++ b/lang/ruby16-base/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:16 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/09/18 13:36:30 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION} +PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby16-base/distinfo b/lang/ruby16-base/distinfo index efec79c954b..254ace8fc9e 100644 --- a/lang/ruby16-base/distinfo +++ b/lang/ruby16-base/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ +$NetBSD: distinfo,v 1.2 2005/09/18 13:36:30 taca Exp $ SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1 RMD160 (ruby/ruby-1.6.8.tar.gz) = be087ca8f852caf9fc7a35b51839f5af079dbbc1 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes -SHA1 (patch-aa) = b0f161d45194860cc0785f9d7961c6455824b0d9 -SHA1 (patch-ab) = 1bf657ee3facce8e3fb4909e11e03eee1aa7a121 +SHA1 (patch-aa) = e5b32f5ddb86a34fa1db112576aae29e71616f40 +SHA1 (patch-ab) = 95e99ea54c0aaf5851fc4c03eedb3a862d8ce4ac SHA1 (patch-ac) = 19f520406a9b699a4bbe53b0e9e2b69b4eb7d96a SHA1 (patch-ad) = 8a3e5eb250f517f10bea7f52fbfe8b05957b7bb4 SHA1 (patch-ae) = 2e096dcb882be923d2ff775a4271a300954a9dec @@ -14,3 +14,4 @@ SHA1 (patch-ah) = 72461b10296cb9a03fc37bba6af69650c8777741 SHA1 (patch-ai) = 38b4293845c0078c5c5ae40d328c0ac7842fcdbc SHA1 (patch-aj) = 03e15c32b0865d11339f609b2e98613fc09083b4 SHA1 (patch-ak) = ce23ee5dc472ebebe0c05adcb6956a50cecc4fcd +SHA1 (patch-al) = fc6ed0be40728a1125e7526f87df889e3e134cc8 diff --git a/lang/ruby16-base/patches/patch-aa b/lang/ruby16-base/patches/patch-aa index 59337e2bbf9..7632b963ec4 100644 --- a/lang/ruby16-base/patches/patch-aa +++ b/lang/ruby16-base/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/18 13:36:30 taca Exp $ ---- configure.in.orig 2002-11-13 13:59:18.000000000 -0500 +--- configure.in.orig 2002-11-13 18:59:18.000000000 +0000 +++ configure.in @@ -264,6 +264,8 @@ os2_emx*) LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no;; @@ -11,7 +11,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, -@@ -324,7 +326,8 @@ AC_HEADER_STDC +@@ -300,6 +302,9 @@ freebsd*) LIBS="-lm $LIBS" + fi + fi + ;; ++dragonfly*) LIBS="-lm $LIBS" ++ MAINLIBS="-pthread $MAINLIBS" ++ ;; + linux*) LIBS="-lm $LIBS" + case "$target_cpu" in + alpha*) +@@ -324,7 +329,8 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ @@ -21,7 +31,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T -@@ -456,6 +459,49 @@ else +@@ -456,6 +462,49 @@ else AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt) fi @@ -71,7 +81,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" -@@ -549,6 +595,7 @@ if test "$with_dln_a_out" != yes; then +@@ -549,6 +598,7 @@ if test "$with_dln_a_out" != yes; then cygwin*) ;; mingw*) ;; netbsd*) CCDLFLAGS=-fPIC;; @@ -79,7 +89,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ *) CCDLFLAGS=-fPIC;; esac else -@@ -563,7 +610,7 @@ if test "$with_dln_a_out" != yes; then +@@ -563,7 +613,7 @@ if test "$with_dln_a_out" != yes; then case "$target_os" in hpux*) DLDFLAGS="-E" @@ -88,7 +98,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then -@@ -578,7 +625,8 @@ if test "$with_dln_a_out" != yes; then +@@ -578,7 +628,8 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; @@ -98,7 +108,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; -@@ -589,6 +637,12 @@ if test "$with_dln_a_out" != yes; then +@@ -589,6 +640,12 @@ if test "$with_dln_a_out" != yes; then osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" @@ -111,8 +121,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then -@@ -601,8 +655,18 @@ if test "$with_dln_a_out" != yes; then - netbsd*) LDSHARED='${CC} -shared' +@@ -598,11 +655,22 @@ 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 ;; +- netbsd*) LDSHARED='${CC} -shared' ++ dragonfly*|netbsd*) ++ LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -130,7 +145,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in -@@ -858,6 +922,7 @@ if test "$enable_shared" = 'yes'; then +@@ -858,6 +926,7 @@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' @@ -138,7 +153,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) -@@ -879,6 +944,14 @@ if test "$enable_shared" = 'yes'; then +@@ -868,7 +937,7 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_ALIASES='' + fi + ;; +- netbsd*) ++ dragonfly*|netbsd*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' +@@ -879,6 +948,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES="" fi ;; @@ -153,7 +177,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) SOLIBS='$(LIBS)' ;; -@@ -1071,6 +1144,10 @@ if test "$search_path" != ""; then +@@ -1071,6 +1148,10 @@ if test "$search_path" != ""; then AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path") fi diff --git a/lang/ruby16-base/patches/patch-ab b/lang/ruby16-base/patches/patch-ab index e325eb77150..cc06b190e63 100644 --- a/lang/ruby16-base/patches/patch-ab +++ b/lang/ruby16-base/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ +$NetBSD: patch-ab,v 1.2 2005/09/18 13:36:30 taca Exp $ ---- configure.orig 2002-11-19 06:49:26.000000000 -0500 +--- configure.orig 2002-11-19 11:49:26.000000000 +0000 +++ configure @@ -29,6 +29,8 @@ ac_help="$ac_help --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]" @@ -20,7 +20,18 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ freebsd*) LIBS="-lm $LIBS" echo $ac_n "checking whether -lxpg4 has to be linked""... $ac_c" 1>&6 echo "configure:2330: checking whether -lxpg4 has to be linked" >&5 -@@ -2877,7 +2881,8 @@ fi +@@ -2448,6 +2452,10 @@ echo "$ac_t""$rb_cv_supplementary_lib_c_ + fi + fi + ;; ++dragonfly*) ++ LIBS="-lm $LIBS" ++ MAINLIBS="-pthread $MAINLIBS" ++ ;; + linux*) LIBS="-lm $LIBS" + case "$target_cpu" in + alpha*) +@@ -2877,7 +2885,8 @@ fi for ac_hdr in stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ @@ -30,7 +41,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -4387,6 +4392,330 @@ EOF +@@ -4387,6 +4396,330 @@ EOF fi @@ -361,7 +372,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ DEFAULT_KCODE="KCODE_NONE" # Check whether --with-default-kcode or --without-default-kcode was given. -@@ -4510,6 +4839,7 @@ echo "configure:4501: checking whether O +@@ -4510,6 +4843,7 @@ echo "configure:4501: checking whether O cygwin*) ;; mingw*) ;; netbsd*) CCDLFLAGS=-fPIC;; @@ -369,7 +380,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ *) CCDLFLAGS=-fPIC;; esac else -@@ -4524,7 +4854,7 @@ echo "configure:4501: checking whether O +@@ -4524,7 +4858,7 @@ echo "configure:4501: checking whether O case "$target_os" in hpux*) DLDFLAGS="-E" @@ -378,7 +389,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then -@@ -4539,7 +4869,8 @@ echo "configure:4501: checking whether O +@@ -4539,7 +4873,8 @@ echo "configure:4501: checking whether O rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; @@ -388,7 +399,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; -@@ -4550,6 +4881,12 @@ echo "configure:4501: checking whether O +@@ -4550,6 +4885,12 @@ echo "configure:4501: checking whether O osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" @@ -401,8 +412,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then -@@ -4562,8 +4899,18 @@ echo "configure:4501: checking whether O - netbsd*) LDSHARED='${CC} -shared' +@@ -4559,11 +4900,22 @@ echo "configure:4501: checking whether O + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" + fi + rb_cv_dlopen=yes ;; +- netbsd*) LDSHARED='${CC} -shared' ++ dragonfly*|netbsd*) ++ LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -420,7 +436,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in -@@ -5070,6 +5417,7 @@ if test "$enable_shared" = 'yes'; then +@@ -5070,6 +5422,7 @@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' @@ -428,7 +444,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) -@@ -5091,6 +5439,14 @@ if test "$enable_shared" = 'yes'; then +@@ -5080,7 +5433,7 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_ALIASES='' + fi + ;; +- netbsd*) ++ dragonfly*|netbsd*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' +@@ -5091,6 +5444,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES="" fi ;; @@ -443,7 +468,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) SOLIBS='$(LIBS)' ;; -@@ -5315,6 +5671,15 @@ EOF +@@ -5315,6 +5676,15 @@ EOF fi diff --git a/lang/ruby16-base/patches/patch-al b/lang/ruby16-base/patches/patch-al new file mode 100644 index 00000000000..d1ea17967b1 --- /dev/null +++ b/lang/ruby16-base/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1 2005/09/18 13:36:30 taca Exp $ + +--- io.c.orig 2005-08-17 17:35:04.000000000 +0000 ++++ io.c +@@ -27,7 +27,7 @@ + # define NO_LONG_FNAME + #endif + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews) || defined(__DragonFly__) + # define USE_SETVBUF + #endif + +@@ -107,6 +107,8 @@ static VALUE lineno; + # else + # define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr) + # endif ++#elif defined(__DragonFly__) ++# define READ_DATA_PENDING(fp) (__fpending(fp) != 0) + #elif defined(FILE_COUNT) + # define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0) + #elif defined(__BEOS__) -- cgit v1.2.3