summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2000-10-20 19:56:05 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2000-10-20 19:56:05 +0000
commit849badb66173129a5af142bfe8051fb2d19db582 (patch)
tree7f1c6afaddee8a46fc924ed3a6087898853c13db
parentAllow users to define RUBY variable to utilize ruby ports with (diff)
Use RUBY_PORTVERSION, RUBY_DISTNAME and RUBY_WRKSRC.
Notes
Notes: svn path=/head/; revision=34040
-rw-r--r--databases/ruby-gdbm/Makefile6
-rw-r--r--lang/ruby-tcltklib/Makefile8
-rw-r--r--lang/ruby/Makefile4
-rw-r--r--lang/ruby16/Makefile4
-rw-r--r--x11-toolkits/ruby-tk/Makefile6
5 files changed, 16 insertions, 12 deletions
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index 5c2b77cbd711..40ae0d021168 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= gdbm
-PORTVERSION= ${RUBY_VERSION}
+PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= databases ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ruby-${PORTVERSION}
+DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
@@ -23,7 +23,7 @@ USE_RUBY_EXTCONF= yes
MD5_FILE= ${PORTSDIR}/lang/ruby/distinfo
-WRKSRC= ${WRKDIR}/${DISTNAME}/ext/gdbm
+WRKSRC= ${RUBY_WRKSRC}/ext/gdbm
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 90528c362f80..660748d9505a 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= tcltklib
-PORTVERSION= ${RUBY_VERSION}
+PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES+= lang x11-toolkits ruby tcl${TCL_VERSION} tk${TK_VERSION}
MASTER_SITES= ${MASTER_SITE_RUBY}
-#MASTER_SITE_SUBDIR= ${RUBY_VER}
-DISTNAME= ruby-${PORTVERSION}
+MASTER_SITE_SUBDIR= ${RUBY_VER}
+DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
MAINTAINER?= knu@FreeBSD.org
@@ -24,7 +24,7 @@ USE_XLIB= yes
MD5_FILE= ${PORTSDIR}/lang/ruby/distinfo
-WRKSRC= ${WRKDIR}/${DISTNAME}/ext/tcltklib
+WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib
CONFIGURE_ARGS= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
--with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \
--with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 82e177ae05be..61ff05fee6e7 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= ruby
-PORTVERSION= ${RUBY_VERSION}
+PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= lang ruby ipv6
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
+DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
@@ -20,6 +21,7 @@ RUBY_NO_RUN_DEPENDS= yes
USE_AUTOCONF= yes
INSTALLS_SHLIB= yes
+WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= --enable-shared
MAN1= ruby${_RUBY_SUFFIX}.1
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 82e177ae05be..61ff05fee6e7 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= ruby
-PORTVERSION= ${RUBY_VERSION}
+PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES= lang ruby ipv6
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
+DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
@@ -20,6 +21,7 @@ RUBY_NO_RUN_DEPENDS= yes
USE_AUTOCONF= yes
INSTALLS_SHLIB= yes
+WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= --enable-shared
MAN1= ruby${_RUBY_SUFFIX}.1
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index f0def93ef3dc..2eeb82009315 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= tk
-PORTVERSION= ${RUBY_VERSION}
+PORTVERSION= ${RUBY_PORTVERSION}
CATEGORIES+= x11-toolkits ruby tk${TK_VERSION}
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= ${RUBY_VER}
-DISTNAME= ruby-${PORTVERSION}
+DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
MAINTAINER?= knu@FreeBSD.org
@@ -22,7 +22,7 @@ USE_RUBY_EXTCONF= yes
MD5_FILE= ${PORTSDIR}/lang/ruby/distinfo
-WRKSRC= ${WRKDIR}/${DISTNAME}/ext/tk
+WRKSRC= ${RUBY_WRKSRC}/ext/tk
TK_VERSION?= 82
.if defined(WITH_TCLTK_JP)