pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/ruby-eruby Migrate ruby-eruby to use new fram...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a66764659c76
branches: trunk
changeset: 484531:a66764659c76
user: taca <taca%pkgsrc.org@localhost>
date: Sun Nov 28 04:30:48 2004 +0000
description:
Migrate ruby-eruby to use new framework for Ruby packages.
diffstat:
textproc/ruby-eruby/DESCR | 2 -
textproc/ruby-eruby/Makefile | 43 +++++++++++++++++------------------
textproc/ruby-eruby/buildlink3.mk | 15 ++++++++----
textproc/ruby-eruby/distinfo | 4 +-
textproc/ruby-eruby/patches/patch-aa | 11 +--------
5 files changed, 34 insertions(+), 41 deletions(-)
diffs (144 lines):
diff -r 5d4c0c220069 -r a66764659c76 textproc/ruby-eruby/DESCR
--- a/textproc/ruby-eruby/DESCR Sun Nov 28 04:27:13 2004 +0000
+++ b/textproc/ruby-eruby/DESCR Sun Nov 28 04:30:48 2004 +0000
@@ -1,5 +1,3 @@
eruby interprets Ruby code embedded in a text file just like PHP,
ePerl, ASP, or JSP. For example, eruby enables you to embed a Ruby
code in a HTML file.
-
-Author: Shugo Maeda <shugo%netlab.co.jp@localhost>
diff -r 5d4c0c220069 -r a66764659c76 textproc/ruby-eruby/Makefile
--- a/textproc/ruby-eruby/Makefile Sun Nov 28 04:27:13 2004 +0000
+++ b/textproc/ruby-eruby/Makefile Sun Nov 28 04:30:48 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/28 04:30:48 taca Exp $
# FreeBSD: ports/textproc/eruby/Makefile,v 1.9 2000/12/12 14:04:26 knu Exp
DISTNAME= eruby-${ERUBY_VERSION}
-PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME}
+PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
CATEGORIES= textproc ruby
MASTER_SITES= http://www.modruby.net/archive/
@@ -10,28 +10,27 @@
HOMEPAGE= http://www.modruby.net/
COMMENT= Interprets Ruby code embedded in a text file
-DIST_SUBDIR= ruby
-USE_RUBY_RD= yes
-RUBY_REQD= 1.6
-ERUBY_MAJOR= 1
-ERUBY_MINOR= 0
-ERUBY_TEENY= 5
-ERUBY_VERSION= ${ERUBY_MAJOR}.${ERUBY_MINOR}.${ERUBY_TEENY}
+# manual page conflicts.
+CONFLICTS+= ruby[1-9][0-9]-eruby-*
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= ./configure.rb
-CONFIGURE_ARGS= --enable-shared --with-charset="${ERUBY_DEFAULT_CHARSET}"
-INSTALL_TARGET= site-install
-PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR} ERUBY_MINOR=${ERUBY_MINOR}
+USE_BUILDLINK3= yes
+ERUBY_VERSION= 1.0.5
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT= ${RUBY} configure.rb
+CONFIGURE_ARGS= --enable-shared \
+ --with-charset="${ERUBY_DEFAULT_CHARSET}"
+INSTALL_TARGET= site-install
+PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR} ERUBY_MINOR=${ERUBY_MINOR}
.include "../../mk/bsd.prefs.mk"
-ERUBY_DEFAULT_CHARSET?= ISO-8859-1
-
-MAN1= eruby.1
-
-DOCS= ChangeLog README.en README.ja eruby.rd eruby.html
-EXAMPLES= e2r.rb foo.rhtml test.rb test.rhtml
+ERUBY_DEFAULT_CHARSET?= ISO-8859-1
+ERUBY_MAJOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
+ERUBY_MINOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
+ERUBY_TEENY= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+MAN1= eruby.1
+DOCS= ChangeLog README.en README.ja eruby.rd eruby.html
+EXAMPLES= e2r.rb foo.rhtml test.rb test.rhtml
post-build:
cd ${WRKSRC}; ${RUBY_RD} eruby.rd > eruby.html
@@ -46,6 +45,6 @@
${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/eruby
.endfor
-.include "../../textproc/ruby-rdtool/Makefile.common"
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
+.include "../../textproc/ruby-rdtool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5d4c0c220069 -r a66764659c76 textproc/ruby-eruby/buildlink3.mk
--- a/textproc/ruby-eruby/buildlink3.mk Sun Nov 28 04:27:13 2004 +0000
+++ b/textproc/ruby-eruby/buildlink3.mk Sun Nov 28 04:30:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 23:46:37 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/11/28 04:30:48 taca Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_ERUBY_BUILDLINK3_MK:= ${RUBY_ERUBY_BUILDLINK3_MK}+
@@ -7,12 +7,17 @@
BUILDLINK_DEPENDS+= ruby-eruby
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-eruby}
-BUILDLINK_PACKAGES+= ruby-eruby
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
+BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-eruby
.if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby-eruby+= ruby-eruby>=0.9.7
-BUILDLINK_PKGSRCDIR.ruby-eruby?= ../../textproc/ruby-eruby
+.if ${RUBY_VER} == "16"
+BUILDLINK_DEPENDS.ruby16-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7
+BUILDLINK_PKGSRCDIR.ruby16-eruby?= ../../textproc/ruby-eruby
+.elif ${RUBY_VER} == "18"
+BUILDLINK_DEPENDS.ruby18-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7
+BUILDLINK_PKGSRCDIR.ruby18-eruby?= ../../textproc/ruby-eruby
+.endif
.endif # RUBY_ERUBY_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 5d4c0c220069 -r a66764659c76 textproc/ruby-eruby/distinfo
--- a/textproc/ruby-eruby/distinfo Sun Nov 28 04:27:13 2004 +0000
+++ b/textproc/ruby-eruby/distinfo Sun Nov 28 04:30:48 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/03/11 15:17:52 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/11/28 04:30:48 taca Exp $
SHA1 (ruby/eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996
Size (ruby/eruby-1.0.5.tar.gz) = 61187 bytes
-SHA1 (patch-aa) = 4715a4b23d662e036c9d6ef31c6bdc8d4f21aead
+SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d
SHA1 (patch-ab) = 55f0b3661286a107858e71599f9522ae2fc8389c
SHA1 (patch-ac) = f2bc2d847ea84b28acbfea8733e309c2bee6b1b0
diff -r 5d4c0c220069 -r a66764659c76 textproc/ruby-eruby/patches/patch-aa
--- a/textproc/ruby-eruby/patches/patch-aa Sun Nov 28 04:27:13 2004 +0000
+++ b/textproc/ruby-eruby/patches/patch-aa Sun Nov 28 04:30:48 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/03/04 17:29:51 taca Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/28 04:30:48 taca Exp $
--- Makefile.in.orig 2001-10-10 11:39:12.000000000 +0900
+++ Makefile.in
@@ -11,12 +11,3 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
XLDFLAGS = @XLDFLAGS@
-@@ -37,7 +37,7 @@ LDSHARED = @LDSHARED@
- EXT_DLDFLAGS = @EXT_DLDFLAGS@
- INSTALL_PROGRAM = $(RUBY) -r ftools -e 'File.install ARGV[0], ARGV[1], 0755, true'
- INSTALL_DLLIB = $(RUBY) -r ftools -e 'File.install ARGV[0], ARGV[1], 0555, true'
--INSTALL_DATA = $(RUBY) -r ftools -e 'File.install ARGV[0], ARGV[1], 0644, true'
-+INSTALL_DATA = $(RUBY) -r ftools -e 'File.install ARGV[0], ARGV[1], 0444, true'
- INSTALL_DIR = $(RUBY) -r ftools -e 'File.makedirs(*ARGV)'
-
- RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
Home |
Main Index |
Thread Index |
Old Index