- Switch to use vendor_dir with Ruby 1.8.7. - And make it build with Ruby 1.8.7, too. Bump PKGREVISION.diff -r1.21 -r1.22 pkgsrc/textproc/ruby-eruby/Makefile
(taca)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.21 2007/03/17 17:29:01 rillig Exp $ | 1 | # $NetBSD: Makefile,v 1.22 2008/06/19 14:55:16 taca Exp $ | |
2 | 2 | |||
3 | DISTNAME= eruby-${ERUBY_VERSION} | 3 | DISTNAME= eruby-${ERUBY_VERSION} | |
4 | PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} | |
5 | PKGREVISION= 6 | 5 | PKGREVISION= 7 | |
6 | CATEGORIES= textproc ruby | 6 | CATEGORIES= textproc ruby | |
7 | MASTER_SITES= http://www.modruby.net/archive/ | 7 | MASTER_SITES= http://www.modruby.net/archive/ | |
8 | 8 | |||
9 | MAINTAINER= taca@NetBSD.org | 9 | MAINTAINER= taca@NetBSD.org | |
10 | HOMEPAGE= http://modruby.net/en/index.rbx/eruby/ | 10 | HOMEPAGE= http://modruby.net/en/index.rbx/eruby/ | |
11 | COMMENT= Interprets Ruby code embedded in a text file | 11 | COMMENT= Interprets Ruby code embedded in a text file | |
12 | 12 | |||
13 | # manual page conflicts. | 13 | # manual page conflicts. | |
14 | CONFLICTS+= ruby[1-9][0-9]-eruby-* | 14 | CONFLICTS+= ruby[1-9][0-9]-eruby-* | |
15 | 15 | |||
16 | RUBY_HAS_ARCHLIB= yes | 16 | RUBY_HAS_ARCHLIB= yes | |
17 | ERUBY_VERSION= 1.0.5 | 17 | ERUBY_VERSION= 1.0.5 | |
18 | HAS_CONFIGURE= yes | 18 | HAS_CONFIGURE= yes | |
@@ -25,29 +25,30 @@ PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR | @@ -25,29 +25,30 @@ PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR | |||
25 | ERUBY_MINOR=${ERUBY_MINOR:Q} \ | 25 | ERUBY_MINOR=${ERUBY_MINOR:Q} \ | |
26 | ERUBY_TEENY=${ERUBY_TEENY:Q} | 26 | ERUBY_TEENY=${ERUBY_TEENY:Q} | |
27 | 27 | |||
28 | .include "../../mk/bsd.prefs.mk" | 28 | .include "../../mk/bsd.prefs.mk" | |
29 | 29 | |||
30 | ERUBY_DEFAULT_CHARSET?= ISO-8859-1 | 30 | ERUBY_DEFAULT_CHARSET?= ISO-8859-1 | |
31 | ERUBY_MAJOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} | 31 | ERUBY_MAJOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} | |
32 | ERUBY_MINOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} | 32 | ERUBY_MINOR= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} | |
33 | ERUBY_TEENY= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} | 33 | ERUBY_TEENY= ${ERUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} | |
34 | MAN1= eruby.1 | 34 | MAN1= eruby.1 | |
35 | DOCS= ChangeLog README.en README.ja eruby.rd eruby.html | 35 | DOCS= ChangeLog README.en README.ja eruby.rd eruby.html | |
36 | EXAMPLES= e2r.rb foo.rhtml test.rb test.rhtml | 36 | EXAMPLES= e2r.rb foo.rhtml test.rb test.rhtml | |
37 | 37 | |||
38 | INSTALLATION_DIRS= bin include lib ${RUBY_DOC}/eruby ${RUBY_EG}/eruby | |||
39 | ||||
38 | post-build: | 40 | post-build: | |
39 | cd ${WRKSRC}; ${RUBY_RD} eruby.rd > eruby.html | 41 | cd ${WRKSRC}; ${RUBY_RD} eruby.rd > eruby.html | |
40 | 42 | |||
41 | post-install: | 43 | post-install: | |
42 | ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/eruby | |||
43 | .for f in ${DOCS} | 44 | .for f in ${DOCS} | |
44 | ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/eruby | 45 | ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/eruby | |
45 | .endfor | 46 | .endfor | |
46 | ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/eruby | |||
47 | .for f in ${EXAMPLES} | 47 | .for f in ${EXAMPLES} | |
48 | ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/eruby | 48 | ${INSTALL_DATA} ${WRKSRC}/examples/${f} \ | |
49 | ${DESTDIR}${PREFIX}/${RUBY_EG}/eruby | |||
49 | .endfor | 50 | .endfor | |
50 | 51 | |||
51 | .include "../../lang/ruby/modules.mk" | 52 | .include "../../lang/ruby/modules.mk" | |
52 | .include "../../textproc/ruby-rdtool/buildlink3.mk" | 53 | .include "../../textproc/ruby-rdtool/buildlink3.mk" | |
53 | .include "../../mk/bsd.pkg.mk" | 54 | .include "../../mk/bsd.pkg.mk" |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.7 2006/09/07 15:55:50 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.8 2008/06/19 14:55:16 taca Exp $ | |
2 | bin/eruby | 2 | bin/eruby | |
3 | include/eruby.h | 3 | include/eruby.h | |
4 | lib/liberuby.a | 4 | lib/liberuby.a | |
5 | lib/liberuby.so | 5 | lib/liberuby.so | |
6 | lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR} | 6 | lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR} | |
7 | lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}.${ERUBY_TEENY} | 7 | lib/liberuby.so.${ERUBY_MAJOR}${ERUBY_MINOR}.${ERUBY_TEENY} | |
8 | ${RUBY_SITEARCHLIBDIR}/eruby.${RUBY_DLEXT} | 8 | ${RUBY_VENDORARCHLIB}/eruby.${RUBY_DLEXT} | |
9 | man/man1/eruby.1 | 9 | man/man1/eruby.1 | |
10 | ${RUBY_DOCDIR}/eruby/ChangeLog | 10 | ${RUBY_DOC}/eruby/ChangeLog | |
11 | ${RUBY_DOCDIR}/eruby/README.en | 11 | ${RUBY_DOC}/eruby/README.en | |
12 | ${RUBY_DOCDIR}/eruby/README.ja | 12 | ${RUBY_DOC}/eruby/README.ja | |
13 | ${RUBY_DOCDIR}/eruby/eruby.rd | 13 | ${RUBY_DOC}/eruby/eruby.rd | |
14 | ${RUBY_DOCDIR}/eruby/eruby.html | 14 | ${RUBY_DOC}/eruby/eruby.html | |
15 | ${RUBY_EXAMPLESDIR}/eruby/e2r.rb | 15 | ${RUBY_EG}/eruby/e2r.rb | |
16 | ${RUBY_EXAMPLESDIR}/eruby/foo.rhtml | 16 | ${RUBY_EG}/eruby/foo.rhtml | |
17 | ${RUBY_EXAMPLESDIR}/eruby/test.rb | 17 | ${RUBY_EG}/eruby/test.rb | |
18 | ${RUBY_EXAMPLESDIR}/eruby/test.rhtml | 18 | ${RUBY_EG}/eruby/test.rhtml | |
19 | @dirrm ${RUBY_DOCDIR}/eruby | 19 | @dirrm ${RUBY_DOC}/eruby | |
20 | @dirrm ${RUBY_EXAMPLESDIR}/eruby | 20 | @dirrm ${RUBY_EG}/eruby |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2006/01/03 14:25:50 taca Exp $ | 1 | $NetBSD: distinfo,v 1.11 2008/06/19 14:55:16 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996 | 3 | SHA1 (eruby-1.0.5.tar.gz) = d8900f8a7c30661351d2bf6f53753fa86df24996 | |
4 | RMD160 (eruby-1.0.5.tar.gz) = 4fb288dd768f98780dc705574968f090cd82d560 | 4 | RMD160 (eruby-1.0.5.tar.gz) = 4fb288dd768f98780dc705574968f090cd82d560 | |
5 | Size (eruby-1.0.5.tar.gz) = 61187 bytes | 5 | Size (eruby-1.0.5.tar.gz) = 61187 bytes | |
6 | SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d | 6 | SHA1 (patch-aa) = ca7a9d4d9827b18040cbebac54eabe762355b76d | |
7 | SHA1 (patch-ab) = bf3bce49348e0e157b67e5e4a26c2e9411248a84 | 7 | SHA1 (patch-ab) = bf3bce49348e0e157b67e5e4a26c2e9411248a84 | |
8 | SHA1 (patch-ac) = 1b035cbaec6c905a01344eb56401f5b0c4fa6ed6 | 8 | SHA1 (patch-ac) = 1480e55e46dccfdf29015f0cac7a8395cb725bc6 |
@@ -1,18 +1,47 @@ | @@ -1,18 +1,47 @@ | |||
1 | $NetBSD: patch-ac,v 1.3 2005/02/17 15:11:23 taca Exp $ | 1 | $NetBSD: patch-ac,v 1.4 2008/06/19 14:55:16 taca Exp $ | |
2 | 2 | |||
3 | --- configure.rb.orig 2003-02-10 12:18:10.000000000 +0900 | 3 | --- configure.rb.orig 2003-02-10 03:18:10.000000000 +0000 | |
4 | +++ configure.rb | 4 | +++ configure.rb | |
5 | @@ -443,27 +443,22 @@ $LIBERUBY_A = "liberuby.a" | 5 | @@ -210,6 +210,7 @@ $bindir = CONFIG["bindir"].sub(prefix, " | |
6 | $datadir = CONFIG["datadir"].sub(prefix, "$(prefix)").sub(drive, '') | |||
7 | $libdir = CONFIG["libdir"].sub(prefix, "$(exec_prefix)").sub(drive, '') | |||
8 | $archdir = $archdir.sub(prefix, "$(prefix)").sub(drive, '') | |||
9 | +$sitedir = $vendordir | |||
10 | $sitelibdir = $sitelibdir.sub(prefix, "$(prefix)").sub(drive, '') | |||
11 | $sitearchdir = $sitearchdir.sub(prefix, "$(prefix)").sub(drive, '') | |||
12 | $includedir = CONFIG["includedir"].sub(prefix, "$(prefix)").sub(drive, '') | |||
13 | @@ -307,11 +308,15 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ | |||
14 | end | |||
15 | $LIBS = CONFIG["LIBS"] | |||
16 | $XLDFLAGS = CONFIG["XLDFLAGS"] | |||
17 | -$XLDFLAGS.gsub!(/-L\./, "") | |||
18 | -if /mswin32/ !~ RUBY_PLATFORM | |||
19 | - $XLDFLAGS += " -L$(libdir)" | |||
20 | -elsif RUBY_VERSION >= "1.8" | |||
21 | - $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}" | |||
22 | +if $XLDFLAGS.nil? | |||
23 | + $XLDFLAGS = '' | |||
24 | +else | |||
25 | + $XLDFLAGS.gsub!(/-L\./, "") | |||
26 | + if /mswin32/ !~ RUBY_PLATFORM | |||
27 | + $XLDFLAGS += " -L$(libdir)" | |||
28 | + elsif RUBY_VERSION >= "1.8" | |||
29 | + $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}" | |||
30 | + end | |||
31 | end | |||
32 | $DLDFLAGS = CONFIG["DLDFLAGS"] | |||
33 | $LDSHARED = CONFIG["LDSHARED"] | |||
34 | @@ -443,27 +448,22 @@ $LIBERUBY_A = "liberuby.a" | |||
6 | $LIBERUBY = "${LIBERUBY_A}" | 35 | $LIBERUBY = "${LIBERUBY_A}" | |
7 | $LIBERUBYARG="$(LIBERUBY_A)" | 36 | $LIBERUBYARG="$(LIBERUBY_A)" | |
8 | 37 | |||
9 | -$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR).$(MINOR).$(TEENY)" | 38 | -$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR).$(MINOR).$(TEENY)" | |
10 | -$LIBERUBY_ALIASES = "liberuby.#{CONFIG['DLEXT']}" | 39 | -$LIBERUBY_ALIASES = "liberuby.#{CONFIG['DLEXT']}" | |
11 | +$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR_MINOR)" | 40 | +$LIBERUBY_SO = "liberuby.#{CONFIG['DLEXT']}.$(MAJOR_MINOR)" | |
12 | +$LIBERUBY_ALIASES = "liberuby.so.$(MAJOR_MINOR).$(TEENY) liberuby.so" | 41 | +$LIBERUBY_ALIASES = "liberuby.so.$(MAJOR_MINOR).$(TEENY) liberuby.so" | |
13 | 42 | |||
14 | if $ENABLE_SHARED | 43 | if $ENABLE_SHARED | |
15 | $LIBERUBY = "${LIBERUBY_SO}" | 44 | $LIBERUBY = "${LIBERUBY_SO}" | |
16 | $LIBERUBYARG = "-L. -leruby" | 45 | $LIBERUBYARG = "-L. -leruby" | |
17 | case PLATFORM | 46 | case PLATFORM | |
18 | - when /-sunos4/ | 47 | - when /-sunos4/ |