diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 525cb64cfdf..678a3cead3a 100755
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/26 14:10:40 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		ruby interface to Berkeley DB
 DISTNAME=		bdb-0.6.2
-PKGNAME=		ruby-${DISTNAME}
+PKGNAME=		ruby-${DISTNAME}p0
 CATEGORIES=		databases ruby
 
 HOMEPAGE=		http://moulon.inra.fr/ruby/bdb.html
diff --git a/databases/ruby-ldap/Makefile b/databases/ruby-ldap/Makefile
index e654529d9f7..9796242783c 100644
--- a/databases/ruby-ldap/Makefile
+++ b/databases/ruby-ldap/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/15 20:34:03 simon Exp $
+# $OpenBSD: Makefile,v 1.6 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	Ruby interface to some common LDAP libraries
 
 DISTNAME=	ruby-ldap-0.9.7
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	databases
 
 HOMEPAGE=	http://ruby-ldap.sourceforge.net/
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 02d5efddd23..0249cb04dfd 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/02/02 14:06:05 bernd Exp $
+# $OpenBSD: Makefile,v 1.2 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	access a MySQL database from Ruby
 
 VERSION=	2.7.4
 DISTNAME=	mysql-ruby-${VERSION}
-PKGNAME=	ruby-mysql-${VERSION}
+PKGNAME=	ruby-mysql-${VERSION}p0
 CATEGORIES=	databases
 
 HOMEPAGE=	http://tmtm.org/mysql/ruby/
diff --git a/devel/ruby-ncurses/Makefile b/devel/ruby-ncurses/Makefile
index 43fbd5c80aa..3fcb21a2bc7 100644
--- a/devel/ruby-ncurses/Makefile
+++ b/devel/ruby-ncurses/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/12/17 20:11:53 bernd Exp $
+# $OpenBSD: Makefile,v 1.17 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		Ruby interface to ncurses
 
 VERSION=		1.1
 DISTNAME=		ncurses-ruby-${VERSION}
-PKGNAME=		ruby-ncurses-${VERSION}
+PKGNAME=		ruby-ncurses-${VERSION}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://ncurses-ruby.berlios.de/
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 2c6d3847df6..1269f70617c 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2008/01/04 18:38:51 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2008/02/22 19:16:49 naddy Exp $
 
 COMMENT-main=	subversion revision control system
 COMMENT-perl=	perl interface to subversion
@@ -12,7 +12,7 @@ PKGNAME=	${DISTNAME}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-perl=	p5-SVN-${VERSION}
 PKGNAME-python=	py-subversion-${VERSION}p1
-PKGNAME-ruby=	ruby-subversion-${VERSION}p0
+PKGNAME-ruby=	ruby-subversion-${VERSION}p1
 PKGNAME-ap2=	ap2-subversion-${VERSION}
 
 SO_VERSION=	1.0
diff --git a/graphics/ruby-gdk-imlib/Makefile b/graphics/ruby-gdk-imlib/Makefile
index 2fd389cc2f7..f63f2dc34bb 100644
--- a/graphics/ruby-gdk-imlib/Makefile
+++ b/graphics/ruby-gdk-imlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	Ruby binding to Gdk-imlib
 
 VERSION=	0.34
 DISTNAME=	ruby-gnome-all-${VERSION}
-PKGNAME=	ruby-gdk-imlib-${VERSION}p6
+PKGNAME=	ruby-gdk-imlib-${VERSION}p7
 CATEGORIES=	graphics devel
 
 HOMEPAGE=	http://ruby-gnome.sourceforge.net/
diff --git a/graphics/ruby-gdk-pixbuf/Makefile b/graphics/ruby-gdk-pixbuf/Makefile
index 2371e243a5f..63f0bd55eae 100644
--- a/graphics/ruby-gdk-pixbuf/Makefile
+++ b/graphics/ruby-gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	Ruby binding to Gdk-pixbuf
 
 VERSION=	0.34
 DISTNAME=	ruby-gnome-all-${VERSION}
-PKGNAME=	ruby-gdk-pixbuf-${VERSION}p6
+PKGNAME=	ruby-gdk-pixbuf-${VERSION}p7
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://ruby-gnome.sourceforge.net/
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index b09ea2db24f..38a82ae07d7 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2007/12/27 18:32:32 bernd Exp $
+# $OpenBSD: Makefile,v 1.58 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -11,10 +11,10 @@ VERSION=		1.8.6
 PATCHLEVEL=		111
 DISTNAME=		ruby-${VERSION}-p${PATCHLEVEL}
 SHARED_LIBS=		ruby 1.86
-PKGNAME-main=		ruby-${VERSION}.${PATCHLEVEL}
-PKGNAME-iconv=		ruby-iconv-${VERSION}.${PATCHLEVEL}
-PKGNAME-gdbm=		ruby-gdbm-${VERSION}.${PATCHLEVEL}
-PKGNAME-tk=		ruby-tk-${VERSION}.${PATCHLEVEL}
+PKGNAME-main=		ruby-${VERSION}.${PATCHLEVEL}p0
+PKGNAME-iconv=		ruby-iconv-${VERSION}.${PATCHLEVEL}p0
+PKGNAME-gdbm=		ruby-gdbm-${VERSION}.${PATCHLEVEL}p0
+PKGNAME-tk=		ruby-tk-${VERSION}.${PATCHLEVEL}p0
 
 CATEGORIES=		lang
 
diff --git a/net/ruby-pcap/Makefile b/net/ruby-pcap/Makefile
index eab7747e041..516987a43c1 100644
--- a/net/ruby-pcap/Makefile
+++ b/net/ruby-pcap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2007/09/15 22:36:59 merdely Exp $
+# $OpenBSD: Makefile,v 1.23 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		Ruby interface to LBL Packet Capture library
 
 VERSION=		0.6
 DISTNAME=		ruby-pcap-${VERSION}
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.goto.info.waseda.ac.jp/~fukusima/ruby/pcap-e.html
diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile
index b4c4139e3f4..23702ade50d 100644
--- a/textproc/eruby/Makefile
+++ b/textproc/eruby/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 20:59:38 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		interprets Ruby code embedded in a text file
 
 DISTNAME=		eruby-1.0.5
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		textproc	
 
 SHARED_LIBS=		eruby 1.05
diff --git a/textproc/gonzui/Makefile b/textproc/gonzui/Makefile
index 644b2a50180..3a086a7cb2f 100755
--- a/textproc/gonzui/Makefile
+++ b/textproc/gonzui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/15 20:59:38 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ NOT_FOR_ARCHS=		mips64
 
 COMMENT=		source code search engine
 DISTNAME=		gonzui-1.2
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		textproc www
 
 HOMEPAGE=		http://gonzui.sourceforge.net/
diff --git a/textproc/ruby-hyperestraier/Makefile b/textproc/ruby-hyperestraier/Makefile
index 48dc4eefc20..bc18597d2c5 100644
--- a/textproc/ruby-hyperestraier/Makefile
+++ b/textproc/ruby-hyperestraier/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2008/01/12 15:16:07 bernd Exp $
+# $OpenBSD: Makefile,v 1.8 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		Ruby interface to hyperestraier
 
 DISTNAME=		hyperestraier-1.4.13
-PKGNAME=		ruby-hyperestraier-1.0.0p4
+PKGNAME=		ruby-hyperestraier-1.0.0p5
 CATEGORIES=		textproc
 
 HOMEPAGE=		http://hyperestraier.sourceforge.net/
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 90730692be1..bd3e51c389d 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2007/09/15 20:04:24 merdely Exp $
+# $OpenBSD: Makefile,v 1.28 2008/02/22 19:16:49 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		Ruby extension library for GTK Toolkit
 
 VERSION=		0.34
 DISTNAME=		ruby-gtk-${VERSION}
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 CATEGORIES=		x11 devel
 
 HOMEPAGE=		http://ruby-gnome.sourceforge.net