[Midnightbsd-cvs] mports: bsd.ruby.mk: Overhaul ruby, part 1 of many

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Jun 26 15:30:41 EDT 2008


Log Message:
-----------
Overhaul ruby, part 1 of many

Modified Files:
--------------
    mports/Mk:
        bsd.ruby.mk (r1.6 -> r1.7)

-------------- next part --------------
Index: bsd.ruby.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.ruby.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -L Mk/bsd.ruby.mk -L Mk/bsd.ruby.mk -u -r1.6 -r1.7
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -16,62 +16,82 @@
 # [variables that a user may define]
 #
 # RUBY_VER		- (See below)
-# RUBY_DEFAULT_VER	- Set to (e.g.) "1.8" if you want to refer to "ruby18" just as "ruby".
+# RUBY_DEFAULT_VER	- Set to (e.g.) "1.8" if you want to refer to "ruby18"
+#			  just as "ruby".
 # RUBY_ARCH		- (See below)
 # RUBY_RD_HTML		- Define if you want HTML files generated from RD files.
 #
+#
 # [variables that each port can define]
 #
-# RUBY			- Set to full path of ruby.  If you set this, the values of the following variables are automatically obtained from the ruby executable: RUBY_VER, RUBY_VERSION, RUBY_NAME, RUBY_ARCH, RUBY_LIBDIR, RUBY_ARCHLIBDIR, RUBY_SITELIBDIR, and RUBY_SITEARCHLIBDIR.
-# RUBY_VER		- Set to the alternative short version of ruby in the form of `x.y' (see below for current value).
+# RUBY			- Set to full path of ruby.  If you set this, the values
+#			  of the following variables are automatically obtained
+#			  from the ruby executable: RUBY_VER, RUBY_VERSION,
+#			  RUBY_NAME, RUBY_ARCH, RUBY_LIBDIR, RUBY_ARCHLIBDIR,
+#			  RUBY_SITELIBDIR, and RUBY_SITEARCHLIBDIR.
+# RUBY_VER		- Set to the alternative short version of ruby in the
+#			  form of `x.y' (see below for current value).
 # USE_RUBY		- Says that the port uses ruby for building and running.
 # RUBY_NO_BUILD_DEPENDS	- Says that the port should not build-depend on ruby.
 # RUBY_NO_RUN_DEPENDS	- Says that the port should not run-depend on ruby.
 # USE_LIBRUBY		- Says that the port uses libruby.
-# USE_RUBY_EXTCONF	- Says that the port uses extconf.rb to configure.  Implies USE_RUBY.
-# RUBY_EXTCONF		- Set to the alternative name of extconf.rb (default: extconf.rb).
-# RUBY_EXTCONF_SUBDIRS	- Set to list of subdirectories, if multiple modules are included.
-# USE_RUBY_SETUP	- Says that the port uses setup.rb to configure and build.
-# RUBY_SETUP		- Set to the alternative name of setup.rb (default: setup.rb).
-# USE_RUBY_AMSTD	- Says that the port uses amstd for building and running.
+# USE_RUBY_EXTCONF	- Says that the port uses extconf.rb to configure.
+#			  Implies USE_RUBY.
+# RUBY_EXTCONF		- Set to the alternative name of extconf.rb
+#			  (default: extconf.rb).
+# RUBY_EXTCONF_SUBDIRS	- Set to list of subdirectories, if multiple modules
+#			  are included.
+# USE_RUBY_SETUP	- Says that the port uses setup.rb to configure and
+#			  build.
+# RUBY_SETUP		- Set to the alternative name of setup.rb
+#			  (default: setup.rb).
+# USE_RUBY_AMSTD	- Says that the port uses amstd for building and
+#			  running.
 # USE_RUBY_RDTOOL	- Says that the port uses rdtool to generate documents.
 # USE_RUBY_RDOC		- Says that the port uses rdoc to generate documents.
-# USE_RUBY_FEATURES	- Says that the port requires some of the following features
-#			  for building and/or running (default: none):
-#				benchmark	bigdecimal	devel-logger
-#				dl		drb		erb
-#				fileutils	gserver		iconv
-#				ipaddr		open-uri	openssl
-#				optparse	pp		racc-runtime
-#				rdoc		rexml		ruby18
-#				runit		set		soap
-#				stringio	strscan		testunit
-#				tsort		webrick		xmlrpc
-#				yaml		zlib
-#			    benchmark dl fileutil optparse pp racc-runtime
-#			    rexml ruby18 set stringio strscan tsort yaml
-# RUBY_REQUIRE		- Set to a Ruby expression to evaluate before building the port.  The constant "Ruby" is set to the integer version number of ruby, and the result of the expression will be set to RUBY_PROVIDED, which is left undefined if the result is nil, false or a zero-length string.  Implies USE_RUBY.
+# USE_RUBY_FEATURES	- Says that the port requires some of the following
+#			  features for building and/or running (default: none):
+#			  iconv
+# RUBY_REQUIRE		- Set to a Ruby expression to evaluate before building
+#			  the port.  The constant "Ruby" is set to the integer
+#			  version number of ruby, and the result of the
+#			  expression will be set to RUBY_PROVIDED, which is
+#			  left undefined if the result is nil, false or a
+#			  zero-length string.  Implies USE_RUBY.
 # RUBY_SHEBANG_FILES	- Specify the files which shebang lines you want to fix.
-# RUBY_RD_FILES		- Specify the RD files which you want to generate HTML documents from.
-#			  If this is defined and not empty, USE_RUBY_RDTOOL is implied and
-#			  RUBY_RD_HTML_FILES is defined.
+# RUBY_RD_FILES		- Specify the RD files which you want to generate HTML
+#			  documents from. If this is defined and not empty,
+#			  USE_RUBY_RDTOOL is implied and RUBY_RD_HTML_FILES is
+#			  defined.
+#
 #
 # [variables that each port should not (re)define]
 #
-# RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports (default: ruby${RUBY_SUFFIX}-)
-# RUBY_VERSION		- Full version of ruby without preview/beta suffix in the form of `x.y.z' (see below for current value).
-# RUBY_VERSION_CODE	- Full integer version of ruby without preview/beta suffix in the form of `xyz'.
-# RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby, ruby-gdbm, etc.).
-# RUBY_DISTNAME		- DISTNAME for the standard ruby ports, i.e. the basename of the ruby distribution tarball.
+# RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby ports
+#			  (default: ruby${RUBY_SUFFIX}-)
+# RUBY_VERSION		- Full version of ruby without preview/beta suffix in
+#			  the form of `x.y.z' (see below for current value).
+# RUBY_VERSION_CODE	- Full integer version of ruby without preview/beta
+#			  suffix in the form of `xyz'.
+# RUBY_PORTVERSION	- PORTVERSION for the standard ruby ports (ruby,
+#			  ruby-gdbm, etc.).
+# RUBY_PORTREVISION	- PORTREVISION for the standard ruby ports.
+# RUBY_PORTEPOCH	- PORTEPOCH for the standard ruby ports.
+# RUBY_DISTNAME		- DISTNAME for the standard ruby ports, i.e. the
+#			  basename of the ruby distribution tarball.
 # RUBY_DISTVERSION	- The version number part of RUBY_DISTNAME.
-# RUBY_PATCHFILES	- PATCHFILES for the standard ruby ports, i.e. the basename of the ruby distribution tarball.
+# RUBY_PATCHFILES	- PATCHFILES for the standard ruby ports, i.e. the
+#			  basename of the ruby distribution tarball.
 # RUBY_WRKSRC		- WRKSRC for the ruby port.
 # MASTER_SITE_SUBDIR_RUBY	- MASTER_SITE_SUBDIR for the ruby distfiles.
 #
-# RUBY_SHLIBVER		- Major version of libruby (see below for current value).
-# RUBY_ARCH		- Set to target architecture name. (e.g. i386-freebsdelf4.3)
-# RUBY_SUFFIX		- Suffix for ruby binaries and directories (${RUBY_VER:S/.//}).
-# RUBY_WITHOUT_SUFFIX	- Always ${PREFIX}/bin/ruby.
+# RUBY_SHLIBVER		- Major version of libruby (see below for current
+#			  value).
+# RUBY_ARCH		- Set to target architecture name.
+#			  (e.g. i386-freebsd7)
+# RUBY_SUFFIX		- Suffix for ruby binaries and directories
+#			  (${RUBY_VER:S/.//}).
+# RUBY_WITHOUT_SUFFIX	- Always ${LOCALBASE}/bin/ruby.
 # RUBY_WITH_SUFFIX	- Always ${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}.
 # RUBY_NAME		- Ruby's name with trailing suffix.
 #
@@ -80,9 +100,9 @@
 # RUBY_RD2		- Full path of rd2 executable.
 # RUBY_RDOC		- Full path of rdoc executable.
 #
-# RUBY_BASE_PORT	- Port path of base ruby without PORTSDIR, without suffix except version.
+# RUBY_BASE_PORT	- Port path of base ruby without PORTSDIR, without
+#			  suffix except version.
 # RUBY_PORT		- Port path of ruby without PORTSDIR.
-# RUBY_SHIM18_PORT	- Port path of ruby16-shim-ruby18 without PORTSDIR.
 # RUBY_AMSTD_PORT	- Port path of ruby-amstd without PORTSDIR.
 # RUBY_RDTOOL_PORT	- Port path of rdtool without PORTSDIR.
 # RUBY_RDOC_PORT	- Port path of rdoc without PORTSDIR.
@@ -90,20 +110,25 @@
 #
 # DEPEND_LIBRUBY	- LIB_DEPENDS entry for libruby.
 # DEPEND_RUBY		- BUILD_DEPENDS/RUN_DEPENDS entry for ruby.
-# DEPEND_RUBY_SHIM18	- BUILD_DEPENDS/RUN_DEPENDS entry for ruby16-shim-ruby18.
 # DEPEND_RUBY_AMSTD	- BUILD_DEPENDS/RUN_DEPENDS entry for ruby-amstd.
 # DEPEND_RUBY_RDTOOL	- BUILD_DEPENDS entry for rdtool.
 # DEPEND_RUBY_RDOC	- BUILD_DEPENDS entry for rdoc.
 # DEPEND_RUBY_ICONV	- BUILD_DEPENDS/RUN_DEPENDS entry for ruby-iconv.
 #
-# RUBY_LIBDIR		- Installation path for architecture independent libraries.
-# RUBY_ARCHLIBDIR	- Installation path for architecture dependent libraries.
-# RUBY_SITELIBDIR	- Installation path for site architecture independent libraries.
-# RUBY_SITEARCHLIBDIR	- Installation path for site architecture dependent libraries.
+# RUBY_LIBDIR		- Installation path for architecture independent
+#			  libraries.
+# RUBY_ARCHLIBDIR	- Installation path for architecture dependent
+#			  libraries.
+# RUBY_SITELIBDIR	- Installation path for site architecture independent
+#			  libraries.
+# RUBY_SITEARCHLIBDIR	- Installation path for site architecture dependent
+#			  libraries.
 # RUBY_DOCDIR		- Installation path for documents.
 # RUBY_EXAMPLESDIR	- Installation path for examples.
-# RUBY_RIDIR		- Installation path for site architecture independentri documents.
-# RUBY_SITERIDIR	- Installation path for site architecture dependent ri documents.
+# RUBY_RIDIR		- Installation path for site architecture independent ri
+#			  documents.
+# RUBY_SITERIDIR	- Installation path for site architecture dependent ri
+#			  documents.
 # RUBY_MODDOCDIR	- Installation path for the module's documents.
 # RUBY_MODEXAMPLESDIR	- Installation path for the module's examples.
 # RUBY_ELISPDIR		- Installation path for emacs lisp files.
@@ -114,7 +139,7 @@
 RUBY_VER?=		${RUBY_DEFAULT_VER}
 
 .if defined(RUBY)
-.if !exists(${DESTDIR}${RUBY})
+.if !exists(${RUBY})
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist.  Please specify an already installed ruby executable.
 .endif
 
@@ -123,7 +148,7 @@
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig.  Please specify a properly installed ruby executable.
 .endif
 
-_RUBY_CONFIG=		${DESTDIR}${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
+_RUBY_CONFIG=		${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
 
 RUBY_VERSION!=		${_RUBY_CONFIG} 'puts VERSION'
 RUBY_SUFFIX?=		# empty
@@ -133,35 +158,68 @@
 
 _RUBY_SYSLIBDIR!=	${_RUBY_CONFIG} 'puts C["libdir"]'
 _RUBY_SITEDIR!=		${_RUBY_CONFIG} 'puts C["sitedir"]'
+_RUBY_VENDORDIR!=	${_RUBY_CONFIG} 'puts C["vendordir"]'
 .else
-RUBY?=			${PREFIX}/bin/${RUBY_NAME}
+RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
-.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
-RUBY_VERSION?=		1.8.5
-#RUBY_DISTVERSION?=	${RUBY_VERSION}
-#RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
+.if defined(RUBY_VER)
+. if ${RUBY_VER} == 1.8
+#
+# Ruby 1.8
+#
+RUBY_RELVERSION=	1.8.6
+RUBY_PORTREVISION=	2
+RUBY_PORTEPOCH=		1
+RUBY_PATCHLEVEL=	111
+
+.  if ${RUBY_PATCHLEVEL} == 0
+RUBY_VERSION?=		${RUBY_RELVERSION}
+RUBY_DISTVERSION?=	${RUBY_RELVERSION}
+.  else
+RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
+RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
+.  endif
 
 # Security patch
 RUBY_PATCHFILES?=	${RUBY_VERSION}-patch1.gz
 
-#RUBY_PORTVERSION?=	${RUBY_VERSION}
-RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
-#MASTER_SITE_SUBDIR_RUBY=	snapshots
-.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
-IGNORE=	Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead.
-.else
-RUBY_VERSION?=		1.6.8
-RUBY_DISTVERSION?=	${RUBY_VERSION}-2004.07.28
-#RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-${RUBY_PORTVERSION}.diff.bz2
+RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 
-# Security patch
-RUBY_PATCHFILES?=	${RUBY_VERSION}-patch1.gz
+#
+# PLIST_SUB helpers
+#
+RUBY18=			""
+RUBY19=			"@comment "
 
-RUBY_PORTVERSION?=	${RUBY_VERSION}.2004.07.28
-#RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
-MASTER_SITE_SUBDIR_RUBY=	snapshots
-.endif
-#      defined(RUBY_VER) && ${RUBY_VER} == 1.8
+. elif ${RUBY_VER} == 1.9
+#
+# Ruby 1.9
+#
+RUBY_RELVERSION=	1.9.0
+RUBY_PORTREVISION=	0
+RUBY_PORTEPOCH=		1
+RUBY_PATCHLEVEL=	1
+
+RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
+RUBY_DISTVERSION?=	${RUBY_RELVERSION}-${RUBY_PATCHLEVEL}
+
+RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
+
+RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-1.9/"
+
+#
+# PLIST_SUB helpers
+#
+RUBY18=			"@comment "
+RUBY19=			""
+
+. else
+#
+# Other versions
+#
+IGNORE=	Only ruby 1.8 and 1.9 are supported
+. endif
+.endif # defined(RUBY_VER)
 
 CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}
 
@@ -170,6 +228,7 @@
 
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib
 _RUBY_SITEDIR?=		${_RUBY_SYSLIBDIR}/ruby/site_ruby
+_RUBY_VENDORDIR?=	${_RUBY_SYSLIBDIR}/ruby/vendor_ruby
 .endif
 #      defined(RUBY)
 
@@ -183,10 +242,10 @@
 RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
 RUBY_VERSION_CODE?=	${RUBY_VERSION:S/.//g}
-RUBY_VER=		${RUBY_VERSION:R}
+RUBY_VER=		${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/}
 RUBY_SUFFIX=		${RUBY_VER:S/.//}
 
-RUBY_WITHOUT_SUFFIX?=	${PREFIX}/bin/ruby
+RUBY_WITHOUT_SUFFIX?=	${LOCALBASE}/bin/ruby
 RUBY_WITH_SUFFIX?=	${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}
 
 RUBY_PKGNAMEPREFIX?=	ruby${RUBY_SUFFIX}-
@@ -207,7 +266,6 @@
 # Ports
 RUBY_BASE_PORT?=	lang/ruby${RUBY_VER:S/.//}
 RUBY_PORT?=		${RUBY_BASE_PORT}
-RUBY_SHIM18_PORT?=	lang/ruby16-shim-ruby18
 RUBY_AMSTD_PORT?=	devel/ruby-amstd
 RUBY_RDTOOL_PORT?=	textproc/ruby-rdtool
 RUBY_RDOC_PORT?=	textproc/ruby-rdoc
@@ -216,61 +274,50 @@
 # Depends
 DEPEND_LIBRUBY?=	${RUBY_NAME}.${RUBY_SHLIBVER}:${PORTSDIR}/${RUBY_PORT}
 DEPEND_RUBY?=		${RUBY}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY_SHIM18?=	${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/${RUBY_SHIM18_PORT}
 DEPEND_RUBY_AMSTD?=	${RUBY_SITELIBDIR}/amstd/version.rb:${PORTSDIR}/${RUBY_AMSTD_PORT}
 DEPEND_RUBY_RDTOOL?=	${RUBY_RD2}:${PORTSDIR}/${RUBY_RDTOOL_PORT}
-.if ${RUBY_VER} <= 1.6
-DEPEND_RUBY_ICONV=	${RUBY_SITEARCHLIBDIR}/iconv.so:${PORTSDIR}/${RUBY_ICONV_PORT}
-.else
 DEPEND_RUBY_ICONV=	${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/${RUBY_ICONV_PORT}
-.endif
 
 # Directories
 RUBY_LIBDIR?=		${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
 RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
 RUBY_SITELIBDIR?=	${_RUBY_SITEDIR}/${RUBY_VER}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
+RUBY_VENDORLIBDIR?=	${_RUBY_VENDORDIR}/${RUBY_VER}
+RUBY_VENDORARCHLIBDIR?=	${RUBY_VENDORLIBDIR}/${RUBY_ARCH}
 RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
 RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
 RUBY_RIDIR?=		${PREFIX}/share/ri/${RUBY_VER}/system
 RUBY_SITERIDIR?=	${PREFIX}/share/ri/${RUBY_VER}/site
 RUBY_MODDOCDIR?=	${RUBY_DOCDIR}/${RUBY_MODNAME}
 RUBY_MODEXAMPLESDIR?=	${RUBY_EXAMPLESDIR}/${RUBY_MODNAME}
-RUBY_ELISPDIR?=		${_RUBY_SYSLIBDIR}/ruby/elisp
+RUBY_ELISPDIR?=		${PREFIX}/lib/ruby/elisp
 
 # PLIST
 PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 			RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \
 			RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" \
 			RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \
+			RUBY_VENDORLIBDIR="${RUBY_VENDORLIBDIR}" \
+			RUBY_VENDORARCHLIBDIR="${RUBY_VENDORARCHLIBDIR}" \
+			RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \
+			RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \
 			RUBY_DOCDIR="${RUBY_DOCDIR}" \
 			RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}" \
 			RUBY_RIDIR="${RUBY_RIDIR}" \
 			RUBY_SITERIDIR="${RUBY_SITERIDIR}" \
-			RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \
-			RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \
 			RUBY_ELISPDIR="${RUBY_ELISPDIR}"
 
-PLIST_SUB+=		RUBY_VERSION="${RUBY_VERSION}" \
+PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
+			RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_VER="${RUBY_VER}" \
 			RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
-			${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
-
-.if ${RUBY_VER} >= 1.7
-RUBY18_ONLY=		""
-.elif ${RUBY_VER} >= 1.6
-RUBY16_ONLY=		""
-.endif
-
-RUBY16_ONLY?=		"@comment "
-RUBY18_ONLY?=		"@comment "
-
-PLIST_SUB+=		RUBY16_ONLY=${RUBY16_ONLY} \
-			RUBY18_ONLY=${RUBY18_ONLY}
+			RUBY18=${RUBY18} \
+			RUBY19=${RUBY19}
 
 # require check
 .if defined(RUBY_REQUIRE)
@@ -298,15 +345,25 @@
 ruby-shebang-patch:
 	@cd ${WRKSRC}; for f in ${RUBY_SHEBANG_FILES}; do \
 	${ECHO_MSG} "===>  Fixing the #! line of $$f"; \
-	${RUBY} ${RUBY_FLAGS} -i -p \
-			-e 'if $$. == 1; ' \
-			-e ' if /^#!/; ' \
-			-e '  sub /^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}";' \
-			-e ' else;' \
-			-e '  $$_ = "#!${RUBY}\n" + $$_;' \
-			-e ' end;' \
-			-e 'end' \
-			$$f; \
+	TMPFILE=`mktemp -t rubyshebang`; \
+	cp $$f $$TMPFILE; \
+	${AWK} 'BEGIN {flag = 0;}								\
+		{										\
+			if (flag == 0) {							\
+				if ($$0 ~ /^#!/) {						\
+					sub(/#!(.*\/)?(env[[:space:]]+)?ruby/, "#!${RUBY}", $$0);\
+					print $$0;						\
+				}								\
+				else {								\
+					print "#!${RUBY}";					\
+					print $$0;						\
+				}								\
+				flag = 1;							\
+			} else {								\
+				print $$0;							\
+			}									\
+		}' $$TMPFILE > $$f; \
+	rm -f $$TMPFILE; \
 	done
 .endif
 
@@ -379,7 +436,7 @@
 USE_RUBY=		yes
 
 RUBY_EXTCONF?=		extconf.rb
-CONFIGURE_ARGS+=	--with-opt-dir="${PREFIX}"
+CONFIGURE_ARGS+=	--with-opt-dir="${LOCALBASE}"
 
 do-configure:	ruby-extconf-configure
 
@@ -397,7 +454,9 @@
 .endif
 .endif
 
-# setup.rb
+#
+# setup.rb support
+#
 .if defined(USE_RUBY_SETUP)
 RUBY_SETUP?=		setup.rb
 
@@ -438,43 +497,7 @@
 .endif
 .endif
 
-.if !defined(NOPORTDOCS) && defined(USE_RUBY_RDOC)
-USE_RUBY_FEATURES+=	rdoc
-.endif
-
 .if defined(USE_RUBY_FEATURES)
-_use=	${USE_RUBY_FEATURES:Mbenchmark} \
-	${USE_RUBY_FEATURES:Mbigdecimal} \
-	${USE_RUBY_FEATURES:Mdevel-logger} \
-	${USE_RUBY_FEATURES:Mdl} \
-	${USE_RUBY_FEATURES:Mdrb} \
-	${USE_RUBY_FEATURES:Merb} \
-	${USE_RUBY_FEATURES:Mfileutils} \
-	${USE_RUBY_FEATURES:Mgserver} \
-	${USE_RUBY_FEATURES:Mipaddr} \
-	${USE_RUBY_FEATURES:Mopen-uri} \
-	${USE_RUBY_FEATURES:Mopenssl} \
-	${USE_RUBY_FEATURES:Moptparse} \
-	${USE_RUBY_FEATURES:Mpp} \
-	${USE_RUBY_FEATURES:Mracc-runtime} \
-	${USE_RUBY_FEATURES:Mrdoc} \
-	${USE_RUBY_FEATURES:Mrexml} \
-	${USE_RUBY_FEATURES:Mruby18} \
-	${USE_RUBY_FEATURES:Mrunit} \
-	${USE_RUBY_FEATURES:Mset} \
-	${USE_RUBY_FEATURES:Msoap} \
-	${USE_RUBY_FEATURES:Mstringio} \
-	${USE_RUBY_FEATURES:Mstrscan} \
-	${USE_RUBY_FEATURES:Mtestunit} \
-	${USE_RUBY_FEATURES:Mtsort} \
-	${USE_RUBY_FEATURES:Mwebrick} \
-	${USE_RUBY_FEATURES:Mxmlrpc} \
-	${USE_RUBY_FEATURES:Myaml} \
-	${USE_RUBY_FEATURES:Mzlib}
-.if !empty(_use) && ${RUBY_VER} <= 1.6
-BUILD_DEPENDS+=		${DEPEND_RUBY_SHIM18}
-RUN_DEPENDS+=		${DEPEND_RUBY_SHIM18}
-.endif
 
 _use=	${USE_RUBY_FEATURES:Miconv}
 .if !empty(_use)
@@ -485,6 +508,15 @@
 .undef _use
 .endif
 
+.if defined(USE_RAKE)
+. if ${RUBY_VER} == 1.8
+BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+RAKE_BIN=	 ${LOCALBASE}/bin/rake
+. else
+RAKE_BIN=	 ${LOCALBASE}/bin/${RUBY_VER:S/.//}
+. endif
+.endif
+
 .if defined(USE_RUBY_AMSTD)
 BUILD_DEPENDS+=		${DEPEND_RUBY_AMSTD}
 RUN_DEPENDS+=		${DEPEND_RUBY_AMSTD}
@@ -498,10 +530,6 @@
 .undef RUBY_NO_RD_HTML
 .endif
 
-.if (${ARCH} == sparc64) && ${RUBY_VER} <= 1.6
-RUBY_NO_RD_HTML=	yes
-.endif
-
 .if defined(NOPORTDOCS)
 RUBY_NO_RD_HTML=	yes
 .endif


More information about the Midnightbsd-cvs mailing list