Do The Right Thing. (R)

Overall changes:
	Use tabs instead of sequential spaces.
	Note Author as well as WWW in DESCR.
	Do not install examples when NOPORTDOCS.
	Make RUBY, RUBY_VER and RUBY_ARCH variables overridable.

ruby-date2:
	share/doc/ruby/date2/examples/ -> share/examples/ruby/date2/cal.rb

textproc/ruby-html-parser:
databases/ruby-mysql:
devel/ruby-optparse:
devel/ruby-property:
	Install modules under lib/ruby/site_ruby/${RUBY_VER}/ instead
	of lib/ruby/site_ruby/ or lib/ruby/${RUBY_VER}/

textproc/ruby-rdtool:
	Install documents in .rd format too.
	Format optparse's rd file. (Since ruby-rdtool depends on
	optparse, it cannot be done during optparse's build
	process.  So ruby-rdtool should take care of that when it is
	installed. :)

8 files changed, 42 insertions, 40 deletions

diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 3013ac962659..cd437db4238a 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:    ruby-gtk
-# Date created:         19 April 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
+# New ports collection makefile for:	ruby-gtk
+# Date created:		19 April 1999
+# Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
@@ -21,9 +21,9 @@ USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/gtk-${PORTVERSION}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY=		${LOCALBASE}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY?=		${LOCALBASE}/bin/ruby
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 .if defined(WITHOUT_IMLIB)
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +37,7 @@ do-configure:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/gtk
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/browser
@@ -45,7 +46,6 @@ post-install:
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/gdkimlib
 	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${PREFIX}/share/examples/ruby/gtk/gdkimlib
 .endif
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ruby/gtk/ja
 	${INSTALL_DATA} ${WRKSRC}/doc/api/* ${PREFIX}/share/doc/ruby/gtk
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${PREFIX}/share/doc/ruby/gtk/ja
diff --git a/x11-toolkits/ruby-gtk/pkg-descr b/x11-toolkits/ruby-gtk/pkg-descr
index dc5832044f86..b8e22fef3f47 100644
--- a/x11-toolkits/ruby-gtk/pkg-descr
+++ b/x11-toolkits/ruby-gtk/pkg-descr
@@ -1,6 +1,7 @@
 Ruby extension module to use Gtk+.
 
-WWW: http://www.ruby-lang.org/gtk/
+Author:	Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp>
+WWW:	http://www.ruby-lang.org/gtk/
 
 - Yasuhiro Fukuma
 yasuf@bsdclub.org
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 3013ac962659..cd437db4238a 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:    ruby-gtk
-# Date created:         19 April 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
+# New ports collection makefile for:	ruby-gtk
+# Date created:		19 April 1999
+# Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
@@ -21,9 +21,9 @@ USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/gtk-${PORTVERSION}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY=		${LOCALBASE}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY?=		${LOCALBASE}/bin/ruby
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 .if defined(WITHOUT_IMLIB)
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -37,6 +37,7 @@ do-configure:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/gtk
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/browser
@@ -45,7 +46,6 @@ post-install:
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/gdkimlib
 	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${PREFIX}/share/examples/ruby/gtk/gdkimlib
 .endif
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ruby/gtk/ja
 	${INSTALL_DATA} ${WRKSRC}/doc/api/* ${PREFIX}/share/doc/ruby/gtk
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${PREFIX}/share/doc/ruby/gtk/ja
diff --git a/x11-toolkits/ruby-gtk2/pkg-descr b/x11-toolkits/ruby-gtk2/pkg-descr
index dc5832044f86..b8e22fef3f47 100644
--- a/x11-toolkits/ruby-gtk2/pkg-descr
+++ b/x11-toolkits/ruby-gtk2/pkg-descr
@@ -1,6 +1,7 @@
 Ruby extension module to use Gtk+.
 
-WWW: http://www.ruby-lang.org/gtk/
+Author:	Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp>
+WWW:	http://www.ruby-lang.org/gtk/
 
 - Yasuhiro Fukuma
 yasuf@bsdclub.org
diff --git a/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile
index 942ecb62decf..01b287ae53aa 100644
--- a/x11-toolkits/ruby-qt/Makefile
+++ b/x11-toolkits/ruby-qt/Makefile
@@ -24,9 +24,9 @@ INSTALL_TARGET=	site-install
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY=		${LOCALBASE}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY?=		${LOCALBASE}/bin/ruby
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 QTLIBDIR=	${X11BASE}/lib
 QTINCDIR=	${X11BASE}/include/X11/qt
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index 942ecb62decf..01b287ae53aa 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -24,9 +24,9 @@ INSTALL_TARGET=	site-install
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY=		${LOCALBASE}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY?=		${LOCALBASE}/bin/ruby
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 QTLIBDIR=	${X11BASE}/lib
 QTINCDIR=	${X11BASE}/include/X11/qt
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index f446dcb28322..f54523d19575 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:    rubytk
-# Date created:         15 March 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
+# New ports collection makefile for:	rubytk
+# Date created:		15 March 1999
+# Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
@@ -36,8 +36,8 @@ PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
 BRANCH_NAME=	1.4
 
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 DOCDIR=		${PREFIX}/share/doc/ruby
 EXAMPLESDIR=	${PREFIX}/share/examples/ruby
@@ -62,7 +62,7 @@ TK_LIB=		tk${TK_VERSION}${TCL_JP}
 TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
-RUBY=		${LOCALBASE}/bin/ruby
+RUBY?=		${LOCALBASE}/bin/ruby
 EXTS=		tcltklib tk
 
 do-configure:
@@ -81,14 +81,14 @@ do-install:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Installing in ${dir}..."
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}/${dir}
 	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir}
+.endif
 .endfor
-
-post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}/tcltklib/demo
 	${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}/tcltklib
 	${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib
 .endif
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index f446dcb28322..f54523d19575 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -1,6 +1,6 @@
-# New ports collection makefile for:    rubytk
-# Date created:         15 March 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
+# New ports collection makefile for:	rubytk
+# Date created:		15 March 1999
+# Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
@@ -36,8 +36,8 @@ PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
 BRANCH_NAME=	1.4
 
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+RUBY_VER?=	1.4
+RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 DOCDIR=		${PREFIX}/share/doc/ruby
 EXAMPLESDIR=	${PREFIX}/share/examples/ruby
@@ -62,7 +62,7 @@ TK_LIB=		tk${TK_VERSION}${TCL_JP}
 TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
-RUBY=		${LOCALBASE}/bin/ruby
+RUBY?=		${LOCALBASE}/bin/ruby
 EXTS=		tcltklib tk
 
 do-configure:
@@ -81,14 +81,14 @@ do-install:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Installing in ${dir}..."
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}/${dir}
 	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir}
+.endif
 .endfor
-
-post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}/tcltklib/demo
 	${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}/tcltklib
 	${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib
 .endif