Add RUBY_HAS_ARCHLIB which have machine dependent extention libraries.

Bump PKG_REVISION.

30 files changed, 89 insertions, 45 deletions

diff --git a/comms/ruby-termios/Makefile b/comms/ruby-termios/Makefile
index d363299635a..6b7cada19b8 100644
--- a/comms/ruby-termios/Makefile
+++ b/comms/ruby-termios/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/11/27 15:34:29 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=	ruby-termios-0.9.4
 PKGNAME=	${RUBY_PKGPREFIX}-termios-0.9.4
+PKGREVISION=	1
 CATEGORIES=	comms ruby
 MASTER_SITES=	http://arika.org/archive/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://arika.org/ruby/termios
 COMMENT=	Ruby extension to termios library
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index b123934272a..26f8a7a3e2e 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/11/29 05:53:40 taca Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/japanese/ruby-uconv/Makefile,v 1.8 2001/01/30 19:26:22 knu Exp
 
 DISTNAME=	uconv-0.4.12
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	converters japanese ruby
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.yoshidam.net/Ruby.html#uconv
 COMMENT=	Unicode conversion library with Japanese codesets support
 
+RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}/uconv
 
diff --git a/converters/ruby16-iconv/Makefile b/converters/ruby16-iconv/Makefile
index 5c5aa90c876..c36a7c53675 100644
--- a/converters/ruby16-iconv/Makefile
+++ b/converters/ruby16-iconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:24:15 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=	iconv-0.5
@@ -11,6 +11,7 @@ HOMEPAGE=	# not available
 COMMENT=	Iconv wrapper class for Ruby
 
 RUBY_VERSION=		${RUBY16_VERSION}
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		YES
 USE_RUBY_EXTCONF=	YES
 USE_RUBY_RD=		YES
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 9556b6461f0..88c40c4907e 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/11/27 15:45:57 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=	mysql-ruby-2.5.1
 PKGNAME=	${RUBY_PKGPREFIX}-mysql-2.5.1
+PKGREVISION=	1
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://www.tmtm.org/mysql/ruby/
 
@@ -10,8 +11,8 @@ MAINTAINER=	neumann@s-direktnet.de
 HOMEPAGE=       http://www.tmtm.org/mysql/ruby/
 COMMENT=	Ruby extension for MySQL
 
-USE_BUILDLINK3=	yes
-
+RUBY_HAS_ARCHLIB=	yes
+USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
 CONFIGURE_ARGS+= --with-mysql-include-dir=${BUILDLINK_PREFIX.mysql-client}/include \
diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile
index 7501280d2b4..8764f95a060 100644
--- a/databases/ruby-postgresql/Makefile
+++ b/databases/ruby-postgresql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/11/27 15:47:02 taca Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/28 14:08:01 taca Exp $
 
 DISTNAME=		ruby-postgres-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-postgresql-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		databases ruby
 MASTER_SITES=		http://www.postgresql.jp/interfaces/ruby/archive/
 
@@ -9,6 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.postgresql.jp/interfaces/ruby/a
 COMMENT=		Ruby extension for postgresql
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF= 	yes
 VERSION=		0.7.1
diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile
index e9892d87d3f..957025461d6 100644
--- a/devel/newfile/Makefile
+++ b/devel/newfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/16 07:10:16 taca Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=	newfile-1.0.14
@@ -9,9 +9,9 @@ MAINTAINER=	flynn@energyhq.es.eu.org
 HOMEPAGE=	http://newfile.sourceforge.net/
 COMMENT=	Tool for creating starter files in various languages
 
-USE_BUILDLINK3=	YES
-NO_BUILD=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	yes
+NO_BUILD=	yes
+GNU_CONFIGURE=	yes
 
 .include "../../lang/ruby/rubyversion.mk"
 
diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index 87f2fad4ce1..1f64659158f 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/11/27 16:01:37 taca Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/devel/ruby-filelock/Makefile,v 1.4 2000/09/26 08:01:52 knu Exp
 
 DISTNAME=	filelock-0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	ftp://ftp.ruby-lang.org/pub/ruby/contrib/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	Ruby module which provides file locking mechanism
 
+RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF= 	yes
 INSTALL_TARGET=		site-install
 DOCS=			README
diff --git a/devel/ruby-strscan/Makefile b/devel/ruby-strscan/Makefile
index 7d5da9342e1..d862f8cfb42 100644
--- a/devel/ruby-strscan/Makefile
+++ b/devel/ruby-strscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/28 06:04:04 taca Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/devel/ruby-strscan/Makefile,v 1.13 2001/01/27 09:41:20 knu Exp
 
 DISTNAME=	strscan-0.6.7
@@ -10,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.loveruby.net/en/strscan.html
 COMMENT=	Fast string scanner class library for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_RUBY_SETUP=		yes
 RUBY_SETUP=		install.rb
diff --git a/devel/ruby-textbuf/Makefile b/devel/ruby-textbuf/Makefile
index b6946bb0917..04feffa3dbf 100644
--- a/devel/ruby-textbuf/Makefile
+++ b/devel/ruby-textbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/28 06:04:55 taca Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/devel/ruby-textbuf/Makefile,v 1.1 2001/01/19 06:16:46 knu Exp
 
 DISTNAME=	textbuf-0.3.8
@@ -10,8 +10,9 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.loveruby.net/en/textbuf.html
 COMMENT=	Gapped text buffer extension for Ruby
 
-RUBY_VERSION=	${RUBY16_VERSION}
-USE_RUBY_SETUP=	yes
+RUBY_HAS_ARCHLIB=	yes
+RUBY_VERSION=		${RUBY16_VERSION}
+USE_RUBY_SETUP=		yes
 
 DOCS=		README.en README.ja
 
diff --git a/devel/ruby16-curses/Makefile b/devel/ruby16-curses/Makefile
index 90183259bea..40fc7b996b7 100644
--- a/devel/ruby16-curses/Makefile
+++ b/devel/ruby16-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:35:59 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -10,6 +10,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby extension to curses library
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
diff --git a/devel/ruby16-zlib/Makefile b/devel/ruby16-zlib/Makefile
index fe81a7647e5..9a6231658b3 100644
--- a/devel/ruby16-zlib/Makefile
+++ b/devel/ruby16-zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/30 16:56:33 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/archivers/ruby-zlib/Makefile,v 1.7 2000/09/26 22:01:12 knu Exp
 
 DISTNAME=	ruby-zlib-${VERSION}
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.blue.sky.or.jp/atelier/
 COMMENT=	Zlib library for Ruby 1.6.X
 
 VERSION=		0.6.0
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_RUBY_EXTCONF=	yes
 
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 8f371f70bbb..6f31473c9ca 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/11/27 16:12:57 taca Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/28 14:08:01 taca Exp $
 
 DISTNAME=	ruby-GD-${VER}-1
 PKGNAME=	${RUBY_PKGPREFIX}-gd-${VER}.1
+PKGREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://tam.0xfa.com/ruby-gd/
 
@@ -9,6 +10,7 @@ MAINTAINER=	rasputin@idoru.mine.nu
 HOMEPAGE=	# not available
 COMMENT=	Ruby extension to drive the GD library
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}/ruby-GD-${VER}
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index d5bf7bc014e..e10ab345947 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2004/11/28 14:55:00 taca Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/graphics/ruby-opengl/Makefile,v 1.4 2000/09/26 08:01:58 knu Exp
 
 DISTNAME=	rbogl-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-opengl-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www2.giganet.net/~yoshi/
 COMMENT=	OpenGL/GLU/GLUT interface modules for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 USE_X11=		yes
diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index 04dcd35d58b..98122b2a17c 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/11/27 16:14:11 taca Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/mail/ruby-tmail/Makefile,v 1.10 2001/01/27 09:46:32 knu Exp
 
 DISTNAME=	tmail-0.10.8
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www.loveruby.net/archive/tmail/
 
@@ -10,7 +11,8 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.loveruby.net/en/tmail.html
 COMMENT=	Mail manipulating library for Ruby including MIME multipart support
 
-USE_RUBY_SETUP=	yes
+RUBY_HAS_ARCHLIB=	yes
+USE_RUBY_SETUP=		yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tmail/en
diff --git a/math/ruby-bigfloat/Makefile b/math/ruby-bigfloat/Makefile
index 650954997d5..3cb9592cd2b 100644
--- a/math/ruby-bigfloat/Makefile
+++ b/math/ruby-bigfloat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 16:20:25 taca Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/math/ruby-bigfloat/Makefile,v 1.8 2000/10/02 14:57:26 knu Exp
 
 DISTNAME=	bigfloat-1.2.1
@@ -10,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.tinyforest.gr.jp/ruby/bigfloat_en.html
 COMMENT=	Variable precision floating library for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}
 INSTALL_TARGET=		site-install
diff --git a/math/ruby-bitvector/Makefile b/math/ruby-bitvector/Makefile
index 66a8d1a7be6..e9b0ff22692 100644
--- a/math/ruby-bitvector/Makefile
+++ b/math/ruby-bitvector/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/11/27 16:26:09 taca Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/math/ruby-bitvector/Makefile,v 1.1 2000/11/23 14:13:41 knu Exp
 
 DISTNAME=	bitvector-0.1.7
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math ruby
 MASTER_SITES=	ftp://ftp.ruby-lang.org/pub/ruby/contrib/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/lib/bitvector/
 COMMENT=	Efficient Ruby bit vector extension
 
+RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
 DOCS=			NOTWRAPPED README TODO
diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile
index 2625bec26d9..68701b5e01e 100644
--- a/math/ruby-gsl/Makefile
+++ b/math/ruby-gsl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/11/27 16:27:45 taca Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/28 14:08:01 taca Exp $
 
 DISTNAME=	ruby-gsl-0.2.0
 PKGNAME=	${RUBY_PKGPREFIX}-gsl-0.2.0
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-gsl/}
 
@@ -9,6 +10,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://ruby-gsl.sourceforge.net/
 COMMENT=	Wrapper of the GNU Scientific Library (GSL) for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index cbf1b0b9944..0a168ce1551 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/01/23 05:01:44 hamajima Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/28 14:08:01 taca Exp $
 #
 
 DISTNAME=	dtcp-20040611
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 		http://home.jp.FreeBSD.org/~ume/ipv6/
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 1b7dd111685..911bf04353f 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/11/28 04:19:35 taca Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/28 14:08:01 taca Exp $
 # FreeBSD: ports/security/ruby-tcpwrap/Makefile,v 1.6 2000/09/26 08:02:10 knu Exp
 
 DISTNAME=	ruby-tcpwrap-0.6
 PKGNAME=	${RUBY_PKGPREFIX}-tcpwrap-0.6
+PKGREVISION=	1
 CATEGORIES=	security ruby
 MASTER_SITES=	http://www.shugo.net/archive/ruby-tcpwrap/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	TCP wrappers library for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 WRKSRC=			${WRKDIR}/ruby-tcpwrap
diff --git a/security/ruby16-openssl/Makefile b/security/ruby16-openssl/Makefile
index aab29a1cc1c..d09a29fad45 100644
--- a/security/ruby16-openssl/Makefile
+++ b/security/ruby16-openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:47:36 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:02 taca Exp $
 
 DISTNAME=		ossl-0.1.4a
 PKGNAME=		${RUBY_PKGPREFIX}-openssl-0.1.4a
@@ -11,6 +11,7 @@ COMMENT=		OpenSSL interface module for Ruby
 
 CONFLICTS=		ruby-ossl-*
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_BUILDLINK3=		YES
 USE_RUBY_EXTCONF=	YES
diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index ebac025ed0c..a6b87780a9f 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/12/15 13:23:12 taca Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/28 14:08:02 taca Exp $
 #
 
 DISTNAME=	ruby-quota-0.5.1
 PKGNAME=	${RUBY_PKGPREFIX}-quota-0.5.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-quota/}
 
@@ -11,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/ruby-quota/
 COMMENT=	Quota interface for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
 
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index faa72ff38b8..e11e3b9bdf2 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/12/16 13:22:23 taca Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/28 14:08:02 taca Exp $
 # FreeBSD: ports/textproc/eruby/Makefile,v 1.9 2000/12/12 14:04:26 knu Exp
 
 DISTNAME=	eruby-${ERUBY_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -15,6 +15,7 @@ COMMENT=	Interprets Ruby code embedded in a text file
 CONFLICTS+=	ruby[1-9][0-9]-eruby-*
 
 USE_BUILDLINK3=		yes
+RUBY_HAS_ARCHLIB=	yes
 ERUBY_VERSION=		1.0.5
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${RUBY} configure.rb
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index c48f5e13c04..c17bcb890c3 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/28 04:51:38 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:02 taca Exp $
 #
 
 DISTNAME=	xmlparser-0.6.8
 PKGNAME=	${RUBY_PKGPREFIX}-xmlparser-0.6.8
+PKGREVISION=	1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -10,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.yoshidam.net/Ruby.html#xmlparser
 COMMENT=	expat interface module for Ruby
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 CONFIGURE_ARGS+=	--with-perl-enc-map
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 4b9fb84b0e2..e444cd0c3fb 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/12/17 01:53:00 taca Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/28 14:08:02 taca Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	ap-${RUBY_PKGPREFIX}-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -12,6 +13,7 @@ COMMENT=	Apache module that embeds Ruby interpreter within
 
 CONFLICTS+=		ap2-ruby*
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 APACHE_MODULE=		yes
diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile
index 81d16b69f69..6fb93bba353 100644
--- a/www/ap2-ruby/Makefile
+++ b/www/ap2-ruby/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/12/17 01:53:00 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/28 14:08:02 taca Exp $
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	ap2-${RUBY_PKGPREFIX}-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -11,6 +12,7 @@ COMMENT=	Embedded Ruby for Apache2 (development version)
 
 CONFLICTS+=		ap-ruby*
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 APACHE_MODULE=		yes
@@ -52,6 +54,6 @@ post-install:
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-eruby/buildlink3.mk"
 .include "../../textproc/ruby-rdtool/buildlink3.mk"
-.include "../../devel/apr/buildlink3.mk"
 .include "../../www/apache2/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-clearsilver/Makefile b/www/ruby-clearsilver/Makefile
index e7eb9c2c55c..152406edf29 100644
--- a/www/ruby-clearsilver/Makefile
+++ b/www/ruby-clearsilver/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2004/11/29 00:21:13 epg Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/28 14:08:02 taca Exp $
 
 PKGNAME=			${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION=			1
 
 .include "../../www/clearsilver/Makefile.common"
 
 DEPENDS+=			${CLEARSILVER_BASE}:../../www/clearsilver-base
 
+RUBY_HAS_ARCHLIB=		yes
 CONFIGURE_ARGS+=		--enable-ruby
 CONFIGURE_ARGS+=		--with-ruby=${RUBY}
 
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index cc288d68b45..551983637d8 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/12/28 23:18:22 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/28 14:08:02 taca Exp $
 
 DISTNAME=	FXRuby-1.0.29
 PKGNAME=	${RUBY_PKGPREFIX}-fox-1.0.29
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 ruby
 MASTER_SITES=	http://rubyforge.org/frs/download.php/983/ \
 		${MASTER_SITE_SOURCEFORGE:=fxruby/}
@@ -10,6 +10,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.fxruby.org/
 COMMENT=	Ruby interface to FOX GUI library
 
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 USE_X11=		yes
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 9a40eee22ee..494ad729bd3 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/11/28 05:57:21 taca Exp $
+# $NetBSD: Makefile,v 1.29 2005/01/28 14:08:02 taca Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-gtk-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-gnome/}
 
@@ -11,6 +12,7 @@ HOMEPAGE=	http://ruby-gnome.sourceforge.net/
 COMMENT=	Ruby interface to Gtk+ toolkits
 
 VERSION=		0.34
+RUBY_HAS_ARCHLIB=	yes
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
 USE_X11=		yes
diff --git a/x11/ruby16-tcltklib/Makefile b/x11/ruby16-tcltklib/Makefile
index 2226f70dd58..9794b519ba1 100644
--- a/x11/ruby16-tcltklib/Makefile
+++ b/x11/ruby16-tcltklib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:52:19 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:02 taca Exp $
 # FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -10,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby interface to Tcl/Tk libraries
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF=	yes
diff --git a/x11/ruby16-tk/Makefile b/x11/ruby16-tk/Makefile
index bc578e291c9..3624a3dcfc9 100644
--- a/x11/ruby16-tk/Makefile
+++ b/x11/ruby16-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:52:52 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/28 14:08:02 taca Exp $
 # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -12,6 +12,7 @@ COMMENT=	Ruby interface to the Tk widget set
 
 DEPENDS+=	${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/${RUBY_PKGPREFIX}-tcltklib
 
+RUBY_HAS_ARCHLIB=	yes
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_BUILDLINK3=		yes
 USE_RUBY_EXTCONF= 	yes
@@ -22,8 +23,9 @@ WRKSRC=			${RUBY_WRKSRC}/ext/tk
 REPLACE_RUBY=		sample/tkbiff.rb sample/tkbrowse.rb \
 			sample/tkdialog.rb sample/tkfrom.rb sample/tktimer.rb
 
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -exec rm -f {} \;
+pre-configure:
+	@cd ${WRKSRC}; \
+	${FIND} . \( -name '*.orig' -o -name '*.bak' \) -exec rm -f {} \;
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tk