Attachment #233295 for bug #263386

View | Details | Raw Unified | Return to bug 263386
Collapse All | Expand All




#
# RUBY_MODNAME		- Set to the module name (default: ${PORTNAME}).
#
# RUBY_RDOC		- Full path of rdoc executable.
#
# RUBY_BASE_PORT	- Port path of base ruby without PORTSDIR, without
#			  suffix except version.
# RUBY_PORT		- Port path of ruby without PORTSDIR.


RUBY_MODNAME?=		${PORTNAME}

# Commands
RUBY_RDOC?=		${LOCALBASE}/bin/rdoc

# Ports
RUBY_BASE_PORT?=	lang/ruby${RUBY_VER:S/.//}
RUBY_PORT?=		${RUBY_BASE_PORT}

Lines 27-33 ALL_TARGET= all rdoc Link Here

(-)b/databases/ruby-bdb/Makefile (-1 lines)
27	CONFIGURE_ARGS= --with-db-include=${BDB_INCLUDE_DIR} \	27	CONFIGURE_ARGS= --with-db-include=${BDB_INCLUDE_DIR} \
28	--with-db-lib=${BDB_LIB_DIR}	28	--with-db-lib=${BDB_LIB_DIR}
29	INSTALL_TARGET= site-install	29	INSTALL_TARGET= site-install
30	MAKE_ENV= RUBY_RDOC=${LOCALBASE}/bin/rdoc
31		30
32	DOCS= Changes README.en bdb.rd docs/*.rd	31	DOCS= Changes README.en bdb.rd docs/*.rd
33	DOCSDIR= ${RUBY_MODDOCDIR}	32	DOCSDIR= ${RUBY_MODDOCDIR}




--- extconf.rb.orig	2011-04-06 19:35:39 UTC
+++ extconf.rb
@@ -67,7 +67,7 @@ test: $(DLLIB)
 rdoc: docs/doc/index.html
 
 docs/doc/index.html: $(RDOC)
-\t@-(cd docs; rdoc .)
+\t@-(cd docs; ${RUBY_RDOC} .)
 
 ri:
 \t@-(rdoc -r docs/*rb)
@@ -67,7 +67,7 @@
    Dir.foreach('tests') do |x|
       next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
       next if FileTest.directory?(x)

    end
 ensure
    make.close
@@ -76,7 +76,7 @@ end
 subdirs.each do |subdir|
    STDERR.puts("#{$0}: Entering directory `#{subdir}'")
    Dir.chdir(subdir)
- 

Return to bug 263386

Lines 71-78 Ruby_Include_MAINTAINER= ruby@FreeBSD.org Link Here

(-)b/Mk/bsd.ruby.mk (-5 lines)
71	#	71	#
72	# RUBY_MODNAME - Set to the module name (default: ${PORTNAME}).	72	# RUBY_MODNAME - Set to the module name (default: ${PORTNAME}).
73	#	73	#
74	# RUBY_RDOC - Full path of rdoc executable.
75	#
76	# RUBY_BASE_PORT - Port path of base ruby without PORTSDIR, without	74	# RUBY_BASE_PORT - Port path of base ruby without PORTSDIR, without
77	# suffix except version.	75	# suffix except version.
78	# RUBY_PORT - Port path of ruby without PORTSDIR.	76	# RUBY_PORT - Port path of ruby without PORTSDIR.
Lines 242-250 RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" Link Here
242		240
243	RUBY_MODNAME?= ${PORTNAME}	241	RUBY_MODNAME?= ${PORTNAME}
244		242
245	# Commands
246	RUBY_RDOC?= ${LOCALBASE}/bin/rdoc
247
248	# Ports	243	# Ports
249	RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}	244	RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}
250	RUBY_PORT?= ${RUBY_BASE_PORT}	245	RUBY_PORT?= ${RUBY_BASE_PORT}

Lines 1-15 Link Here

(-)b/databases/ruby-bdb/files/patch-extconf.rb (-12 / +2 lines)
1	--- extconf.rb.orig 2011-04-06 19:35:39 UTC	1	--- extconf.rb.orig 2011-04-06 19:35:39 UTC
2	+++ extconf.rb	2	+++ extconf.rb
3	@@ -50,7 +50,7 @@	3	@@ -67,7 +67,7 @@ test: $(DLLIB)
4	rdoc: docs/doc/index.html
5
6	docs/doc/index.html: $(RDOC)
7	-\t@-(cd docs; rdoc .)
8	+\t@-(cd docs; ${RUBY_RDOC} .)
9
10	ri:
11	\t@-(rdoc -r docs/*rb)
12	@@ -67,7 +67,7 @@
13	Dir.foreach('tests') do \|x\|	4	Dir.foreach('tests') do \|x\|
14	next if /^\./ =~ x \|\| /(_\.rb\|~)$/ =~ x	5	next if /^\./ =~ x \|\| /(_\.rb\|~)$/ =~ x
15	next if FileTest.directory?(x)	6	next if FileTest.directory?(x)
Lines 18-24 Link Here
18	end	9	end
19	ensure	10	ensure
20	make.close	11	make.close
21	@@ -76,7 +76,7 @@	12	@@ -76,7 +76,7 @@ end
22	subdirs.each do \|subdir\|	13	subdirs.each do \|subdir\|
23	STDERR.puts("#{$0}: Entering directory `#{subdir}'")	14	STDERR.puts("#{$0}: Entering directory `#{subdir}'")
24	Dir.chdir(subdir)	15	Dir.chdir(subdir)
25	-