[pkgsrc/trunk]: pkgsrc Refelect change of RUBY_SRCDIR.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Refelect change of RUBY_SRCDIR.
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 15:33:35 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/64e735105279
branches:  trunk
changeset: 631774:64e735105279
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Mar 13 17:06:42 2014 +0000

description:
Refelect change of RUBY_SRCDIR.

diffstat:

 lang/ruby/Makefile             |  6 +++---
 lang/ruby/Makefile.common      |  8 ++++----
 lang/ruby/buildlink3.mk        |  8 ++++----
 lang/ruby/modules.mk           |  4 ++--
 lang/ruby18/Makefile           |  4 ++--
 lang/ruby193/Makefile          |  4 ++--
 lang/ruby200/Makefile          |  4 ++--
 misc/ec2-ami-tools/Makefile    |  4 ++--
 mk/tools/replace.mk            |  6 +++---
 net/dnsdoctor/Makefile         |  4 ++--
 textproc/groonga/Makefile      |  6 +++---
 www/webkit-gtk/Makefile.common |  4 ++--
 12 files changed, 31 insertions(+), 31 deletions(-)

diffs (254 lines):

diff -r 22e6515679d1 -r 64e735105279 lang/ruby/Makefile
--- a/lang/ruby/Makefile        Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby/Makefile        Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2013/06/27 16:37:16 taca Exp $
+# $NetBSD: Makefile,v 1.55 2014/03/13 17:06:42 taca Exp $
 
 DISTNAME=      # empty
 PKGNAME=       ruby-${RUBY_VERSION_FULL}
@@ -17,7 +17,7 @@
 
 .include "../../lang/ruby/rubyversion.mk"
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION}:../../lang/${RUBY_PKGPREFIX}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
 RUBY_COMMANDS= erb irb ruby testrb
 .if ${RUBY_VER} == "18"
@@ -41,7 +41,7 @@
 do-install:
 .if ${RUBY_NAME} != "ruby"
 .  for f in ${RUBY_COMMANDS}
-       ${LN} -sf ${f}${RUBY_VER} ${DESTDIR}${PREFIX}/bin/${f}
+       ${LN} -sf ${f}${RUBY_SUFFIX} ${DESTDIR}${PREFIX}/bin/${f}
 .  endfor
        ${LN} -sf ${RUBY_NAME}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ruby.1
 .endif
diff -r 22e6515679d1 -r 64e735105279 lang/ruby/Makefile.common
--- a/lang/ruby/Makefile.common Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby/Makefile.common Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2012/10/17 00:17:50 taca Exp $
+# $NetBSD: Makefile.common,v 1.30 2014/03/13 17:06:42 taca Exp $
 #
 # Ruby base distribution common definition
 # used by databases/ruby-gdbm/Makefile
@@ -46,7 +46,7 @@
        ftp://ftp.idaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/${RUBY_SITE_SUBDIR}/
 
 # Ruby distribution
-RUBY_DISTINFO_FILE=    ${RUBY_SRCDIR}/distinfo
+RUBY_DISTINFO_FILE=    ${.CURDIR}/${RUBY_SRCDIR}/distinfo
 
 RUBY_HOMEPAGE=         http://www.ruby-lang.org/en/
 
@@ -66,8 +66,8 @@
 .if !empty(RUBY_EXTNAME)
 
 PKGNAME?=              ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
-DISTINFO_FILE=         ${.CURDIR}/../../lang/${RUBY_BASE}/distinfo
-PATCHDIR=              ${.CURDIR}/../../lang/${RUBY_BASE}/patches
+DISTINFO_FILE=         ${.CURDIR}/${RUBY_SRCDIR}/distinfo
+PATCHDIR=              ${.CURDIR}/${RUBY_SRCDIR}/patches
 do-patch:
        ${_PKG_SILENT}${_PKG_DEBUG}     \
        cd ${WRKSRC};                   \
diff -r 22e6515679d1 -r 64e735105279 lang/ruby/buildlink3.mk
--- a/lang/ruby/buildlink3.mk   Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby/buildlink3.mk   Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2012/05/07 02:45:47 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2014/03/13 17:06:42 taca Exp $
 
 BUILDLINK_TREE+=       ${RUBY_BASE}
 
@@ -11,15 +11,15 @@
 
 BUILDLINK_API_DEPENDS.${RUBY_BASE}+=   ${RUBY_BASE}>=${RUBY_VERSION}
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+=   ${RUBY_BASE}>=${RUBY_ABI_VERSION}
-BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=     ../../lang/${RUBY_BASE}
-BUILDLINK_FILES.${RUBY_BASE}+=         lib/libruby${RUBY_VER}.*
+BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=     ${RUBY_SRCDIR}
+BUILDLINK_FILES.${RUBY_BASE}+=         lib/libruby${RUBY_SUFFIX}.*
 BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 
 BUILDLINK_TARGETS+=    buildlink-bin-ruby
 
 buildlink-bin-ruby:
        ${RUN} \
-       f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_VER}"; \
+       f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_SUFFIX}"; \
        if ${TEST} -f $$f; then \
                ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
        fi
diff -r 22e6515679d1 -r 64e735105279 lang/ruby/modules.mk
--- a/lang/ruby/modules.mk      Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby/modules.mk      Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.34 2013/06/15 09:11:27 obache Exp $
+# $NetBSD: modules.mk,v 1.35 2014/03/13 17:06:42 taca Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=       # defined
@@ -15,7 +15,7 @@
 PKGNAME?=      ${RUBY_PKGPREFIX}-${DISTNAME}
 
 .if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
-DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 .else
 .include "../../lang/ruby/buildlink3.mk"
 .endif
diff -r 22e6515679d1 -r 64e735105279 lang/ruby18/Makefile
--- a/lang/ruby18/Makefile      Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby18/Makefile      Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/02/16 16:46:24 taca Exp $
+# $NetBSD: Makefile,v 1.23 2014/03/13 17:06:42 taca Exp $
 #
 
 DISTNAME=      # empty
@@ -14,7 +14,7 @@
 
 META_PACKAGE=          yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
diff -r 22e6515679d1 -r 64e735105279 lang/ruby193/Makefile
--- a/lang/ruby193/Makefile     Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby193/Makefile     Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/11/08 16:12:25 taca Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 17:06:42 taca Exp $
 #
 
 DISTNAME=      # empty
@@ -14,7 +14,7 @@
 
 META_PACKAGE=          yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
diff -r 22e6515679d1 -r 64e735105279 lang/ruby200/Makefile
--- a/lang/ruby200/Makefile     Thu Mar 13 17:06:12 2014 +0000
+++ b/lang/ruby200/Makefile     Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/07/21 02:36:38 taca Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 17:06:43 taca Exp $
 #
 
 DISTNAME=      # empty
@@ -14,7 +14,7 @@
 
 META_PACKAGE=          yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
diff -r 22e6515679d1 -r 64e735105279 misc/ec2-ami-tools/Makefile
--- a/misc/ec2-ami-tools/Makefile       Thu Mar 13 17:06:12 2014 +0000
+++ b/misc/ec2-ami-tools/Makefile       Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 09:57:20 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/13 17:06:43 taca Exp $
 #
 
 PKGNAME=       ec2-ami-tools-1.3.57676
@@ -20,7 +20,7 @@
 
 DEPENDS+=      curl-[0-9]*:../../www/curl
 DEPENDS+=      rsync-[0-9]*:../../net/rsync
-DEPENDS+=      ruby${RUBY_VER}-base>=1.8.2:../../lang/ruby${RUBY_VER}-base
+DEPENDS+=      ${RUBY_BASE}>=1.8.2:${RUBY_SRCDIR}
 
 NO_BUILD=      yes
 
diff -r 22e6515679d1 -r 64e735105279 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Mar 13 17:06:12 2014 +0000
+++ b/mk/tools/replace.mk       Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.268 2014/03/07 15:07:44 jperkin Exp $
+# $NetBSD: replace.mk,v 1.269 2014/03/13 17:06:43 taca Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -430,11 +430,11 @@
 .    if !defined(RUBY_VER) || !empty(RUBY_VER:M18)
 TOOLS_DEPENDS.gem?=            ${RUBY_PKGPREFIX}-rubygems-[0-9]*:../../misc/rubygems
 .    else
-TOOLS_DEPENDS.gem?=            ${RUBY_BASE}>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+TOOLS_DEPENDS.gem?=            ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 .    endif
 TOOLS_CREATE+=                 gem
 TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.gem=gem
-TOOLS_PATH.gem=                        ${TOOLS_PREFIX.gem}/bin/gem${RUBY_VER}
+TOOLS_PATH.gem=                        ${TOOLS_PREFIX.gem}/bin/gem${RUBY_SUFFIX}
 .  endif
 .endif
 
diff -r 22e6515679d1 -r 64e735105279 net/dnsdoctor/Makefile
--- a/net/dnsdoctor/Makefile    Thu Mar 13 17:06:12 2014 +0000
+++ b/net/dnsdoctor/Makefile    Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/23 17:18:17 asau Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/13 17:06:43 taca Exp $
 #
 
 DISTNAME=      dnsdoctor-1.0.1
@@ -11,7 +11,7 @@
 COMMENT=       DNS zones misconfigurations or inconsistencies diagnostic tool
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ruby${RUBY_VER}-base>=${RUBY_VERSION}:../../lang/ruby${RUBY_VER}-base
+DEPENDS+=      ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
 WRKSRC=                ${WRKDIR}/dnsdoctor
 
diff -r 22e6515679d1 -r 64e735105279 textproc/groonga/Makefile
--- a/textproc/groonga/Makefile Thu Mar 13 17:06:12 2014 +0000
+++ b/textproc/groonga/Makefile Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2014/02/25 04:32:54 obache Exp $
+# $NetBSD: Makefile,v 1.38 2014/03/13 17:06:43 taca Exp $
 #
 
 DISTNAME=      groonga-4.0.0
@@ -10,9 +10,9 @@
 COMMENT=       Fulltext search engine and column store
 LICENSE=       gnu-lgpl-v2.1
 
-RUBY_VERSION_SUPPORTED=        200 193
+RUBY_VERSION_SUPPORTED=        21 200 193
 .include "../../lang/ruby/rubyversion.mk"
-DEPENDS+=      ${RUBY_BASE}>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+DEPENDS+=      ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
diff -r 22e6515679d1 -r 64e735105279 www/webkit-gtk/Makefile.common
--- a/www/webkit-gtk/Makefile.common    Thu Mar 13 17:06:12 2014 +0000
+++ b/www/webkit-gtk/Makefile.common    Thu Mar 13 17:06:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2014/01/25 10:30:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.31 2014/03/13 17:06:43 taca Exp $
 # used by www/webkit-gtk/Makefile
 # used by www/webkit-gtk3/Makefile
 
@@ -39,7 +39,7 @@
                Source/WebCore/platform/text/mac/*.pl
 
 .include "../../lang/ruby/rubyversion.mk"
-BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 CONFIGURE_ENV+=        RUBY=${RUBY}
 
 PYTHON_FOR_BUILD_ONLY= yes
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated www/nginx to 1.4.7
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/mdocml Sort. From Kai-Uwe Eckhardt.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated www/nginx to 1.4.7
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/mdocml Sort. From Kai-Uwe Eckhardt.
Indexes:
Home | Main Index | Thread Index | Old Index