Revision: 2934
http://gar.svn.sourceforge.net/gar/?rev=2934&view=rev
Author: bdwalton
Date: 2009-01-30 03:40:29 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
cleanup of gar description; workaround for rdoc bug
Modified Paths:
--------------
csw/mgar/pkg/ruby/trunk/Makefile
csw/mgar/pkg/ruby/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ruby/trunk/files/rdoc_parse_order_fix.patch
Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile 2009-01-30 00:44:24 UTC (rev 2933)
+++ csw/mgar/pkg/ruby/trunk/Makefile 2009-01-30 03:40:29 UTC (rev 2934)
@@ -4,8 +4,16 @@
GARVERSION = $(DISTVERSION)
CATEGORIES = lang
-WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION)-$(PATCHLEVEL)
+PREREQUISITE_PKGS = CSWbdb3 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
+PREREQUISITE_PKGS += CSWreadline CSWzlib
+REQUIRED_PKGS_CSWruby = CSWbdb3n CSWgdbm CSWiconv
+REQUIRED_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib
+
+REQUIRED_PKGS_CSWrubytk = CSWruby CSWtk
+
+REQUIRED_PKGS_CSWrubydoc = CSWruby
+
DESCRIPTION = An object-oriented language for quick and easy programming.
define BLURB
Ruby is a language for quick and easy programming. Similar in scope to Perl
@@ -20,28 +28,25 @@
MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/
MASTER_SITES += ftp://www.ibiblio.org/pub/languages/ruby/
-DISTFILES = $(GARNAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2
-
-# We define upstream file regex so we can be notifed of new upstream software
release
+# We define upstream file regex so we can be notifed of new upstream
+# software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-p(\d+).tar.bz2
-DISTFILES += CSWruby.gspec CSWruby.depend CSWruby.prototype
-DISTFILES += CSWrubytk.gspec CSWrubytk.depend CSWrubytk.prototype
+DISTFILES = $(GARNAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2
+DISTFILES += $(call admfiles,CSWruby,) $(call admfiles,CSWrubytk,)
+# See:
http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698
+PATCHFILES = rdoc_parse_order_fix.patch
+
ifneq ($(SKIP_RUBYDOC),1)
-DISTFILES += CSWrubydoc.gspec CSWrubydoc.depend
+DISTFILES += $(call admfiles,CSWrubydoc,)
endif
-# Force the dbm extension to build
-#PATCHFILES += dbm.diff
-
-#LIBDEPS += lib/iconv lib/gdbm lib/ncurses lib/readline
-#LIBDEPS += lib/zlib lib/openssl lib/bdb3
-#LIBDEPS += lang/tcl lang/tk
-
# Put samples and RI documentation in share/doc/ruby
datadir = $(docdir)/ruby
+GARCOMPILER = GNU
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-pthread
CONFIGURE_ARGS += --enable-shared
@@ -54,30 +59,18 @@
CONFIGURE_ARGS += --with-readline-dir=$(prefix)
CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
-#override this as the configure script wants to use the obsolete (broken in
-#some cases) -KPIC
-#ifeq "$(GARCH)" "sparc"
-#CONFIGURE_ARGS += CFLAGS="-xO3 -xtarget=ultra -xarch=v8
-I/export/home/bwalton/build.5.8-sparc/ruby/opt/csw/include -I/opt/csw/include"
-#CFLAGS = -xO3 -xtarget=ultra -xarch=v8
-I/export/home/bwalton/build.5.8-sparc/ruby/opt/csw/include -I/opt/csw/include
-#endif
+WORKSRC = $(WORKDIR)/$(DISTNAME)-$(PATCHLEVEL)
+WORKSRC_FIRSTMOD = $(WORKROOTDIR)/build-$(firstword
$(MODULATIONS))/$(DISTNAME)-$(PATCHLEVEL)
include gar/category.mk
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(PATCHLEVEL)
-# Replace current build arch in prototype
-pre-package:
- @for proto in "" $(wildcard $(WORKDIR)/*.prototype) ; do \
- test -z "$$proto" && continue ; \
- gsed -i -e s,%GARCH%,$(GARCH),g $$proto ; \
- done
+INSTALL_ARGS = install-all
PI_TARGETS = samples rbconfig rbscripts
-ifneq ($(SKIP_RUBYDOC),1)
-PI_TARGETS += rubydoc
-endif
-post-install: $(PI_TARGETS)
+post-install-modulated: $(PI_TARGETS)
@$(MAKECOOKIE)
# Fix up rbconfig
@@ -89,28 +82,12 @@
# Copy samples
samples:
@mkdir -p $(DESTDIR)$(datadir)
- @cp -R $(WORKSRC)/sample $(DESTDIR)$(datadir)
+ @cp -R $(WORKSRC_FIRSTMOD)/sample $(DESTDIR)$(datadir)
@for ext in bigdecimal dl tk ; do \
- cp -R $(WORKSRC)/ext/$$ext/sample
$(DESTDIR)$(datadir)/sample/$$ext ; \
+ cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample
$(DESTDIR)$(datadir)/sample/$$ext ; \
done
@$(MAKECOOKIE)
-# Doing a 'make install-doc' in $(WORKSRC) tries to install
-# docs to the real prefix. This target installs to the packaging
-# prefix instead.
-rubydoc:
- ( cd $(WORKSRC) ; \
- LD_LIBRARY_PATH=$(DESTDIR)$(libdir) \
- $(DESTDIR)$(bindir)/ruby \
- -I $(DESTDIR)$(libdir)/ruby/1.8 \
- -I $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.8 \
- bin/rdoc \
- --all \
- --ri-system \
- --op $(DESTDIR)$(datadir)/ri/1.8/system \
- $(DESTDIR)$(libdir)/ruby/1.8 )
- @$(MAKECOOKIE)
-
# Some scripts come with /usr/local/bin/ruby hard coded.
rbscripts:
@echo " ==> Fixing shebang path in distributed ruby scripts"
Modified: csw/mgar/pkg/ruby/trunk/checksums
===================================================================
--- csw/mgar/pkg/ruby/trunk/checksums 2009-01-30 00:44:24 UTC (rev 2933)
+++ csw/mgar/pkg/ruby/trunk/checksums 2009-01-30 03:40:29 UTC (rev 2934)
@@ -1,9 +1,5 @@
0b215c46b89b28d7ab8d56d96e72d5b9 download/ruby-1.8.7-p72.tar.bz2
b2d3f1987e4dd3962f15131dc6ab28a3 download/CSWruby.gspec
-25662a7cdcf85d39c6d570d59a3fb6e1 download/CSWruby.depend
-86606872b8f3ee082d450749de65278f download/CSWruby.prototype
1b4a5fec67986e3f38df7e34c2155ed1 download/CSWrubytk.gspec
-817e7a061bed70106d8cf71c9663089b download/CSWrubytk.depend
-8f76677cdf9627f1f203e3cfee871422 download/CSWrubytk.prototype
02d0cf5721de6c1f6740b399cbe141f1 download/CSWrubydoc.gspec
-75313e990d12f29577e16fc44aab7dfa download/CSWrubydoc.depend
+36460ea6a145017c3ddd1173e903a511 download/rdoc_parse_order_fix.patch
Added: csw/mgar/pkg/ruby/trunk/files/rdoc_parse_order_fix.patch
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rdoc_parse_order_fix.patch
(rev 0)
+++ csw/mgar/pkg/ruby/trunk/files/rdoc_parse_order_fix.patch 2009-01-30
03:40:29 UTC (rev 2934)
@@ -0,0 +1,11 @@
+--- ruby-1.8.7-p72/lib/rdoc/rdoc.rb.orig 2009-01-30 03:16:02.823906957
+0100
++++ ruby-1.8.7-p72/lib/rdoc/rdoc.rb 2009-01-30 03:16:09.628913124 +0100
+@@ -200,7 +200,7 @@
+ # we may well contain subdirectories which must
+ # be tested for .document files
+ def list_files_in_directory(dir, options)
+- normalized_file_list(options, Dir.glob(File.join(dir, "*")), false,
options.exclude)
++ normalized_file_list(options, Dir.glob(File.join(dir, "*")).sort,
false, options.exclude)
+ end
+
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
