Clean up DEINSTALL/INSTALL scripts.

* Remove setting PREFIX.
* Remove executing exit on last line.

Bump PKGREVISION.

9 files changed, 13 insertions, 22 deletions

diff --git a/lang/ruby18-base/DEINSTALL b/lang/ruby18-base/DEINSTALL
index b02f4ae3e85..dff309d9bd8 100644
--- a/lang/ruby18-base/DEINSTALL
+++ b/lang/ruby18-base/DEINSTALL
@@ -1,6 +1,5 @@
-# $NetBSD: DEINSTALL,v 1.2 2007/01/28 15:15:58 taca Exp $
+# $NetBSD: DEINSTALL,v 1.3 2011/11/13 15:44:58 taca Exp $
 
-PREFIX="@PREFIX@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
 
@@ -9,4 +8,3 @@ DEINSTALL)
 	rm -f ${rid}
 	;;
 esac
-exit
diff --git a/lang/ruby18-base/INSTALL b/lang/ruby18-base/INSTALL
index 748e3b265e6..c01bdcba1d4 100644
--- a/lang/ruby18-base/INSTALL
+++ b/lang/ruby18-base/INSTALL
@@ -1,7 +1,6 @@
-# $NetBSD: INSTALL,v 1.3 2007/04/06 14:47:51 taca Exp $
+# $NetBSD: INSTALL,v 1.4 2011/11/13 15:44:58 taca Exp $
 
 DATE="@DATE@"
-PREFIX="@PREFIX@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
 
@@ -12,4 +11,3 @@ POST-INSTALL)
 	fi
 	;;
 esac
-exit
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 651870e62b9..88248f822ac 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2011/11/08 15:20:36 taca Exp $
+# $NetBSD: Makefile,v 1.67 2011/11/13 15:44:58 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby19-base/DEINSTALL b/lang/ruby19-base/DEINSTALL
index 2025793f811..969809a141e 100644
--- a/lang/ruby19-base/DEINSTALL
+++ b/lang/ruby19-base/DEINSTALL
@@ -1,6 +1,5 @@
-# $NetBSD: DEINSTALL,v 1.3 2011/11/08 15:22:45 taca Exp $
+# $NetBSD: DEINSTALL,v 1.4 2011/11/13 15:45:24 taca Exp $
 
-PREFIX="@PREFIX@"
 RUBY_GEM_BASE="${PREFIX}/@RUBY_GEM_BASE@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 
@@ -13,4 +12,3 @@ POST-DEINSTALL)
 	${RMDIR} ${RUBY_GEM_BASE} 2>/dev/null
 	;;
 esac
-exit
diff --git a/lang/ruby19-base/INSTALL b/lang/ruby19-base/INSTALL
index 45776aca658..5643c346316 100644
--- a/lang/ruby19-base/INSTALL
+++ b/lang/ruby19-base/INSTALL
@@ -1,6 +1,5 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $
+# $NetBSD: INSTALL,v 1.2 2011/11/13 15:45:24 taca Exp $
 
-DATE="@DATE@"
 PREFIX="@PREFIX@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
@@ -12,4 +11,3 @@ POST-INSTALL)
 	fi
 	;;
 esac
-exit
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile
index 61c71349599..d6bd1a12d16 100644
--- a/lang/ruby19-base/Makefile
+++ b/lang/ruby19-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2011/11/08 15:22:45 taca Exp $
+# $NetBSD: Makefile,v 1.18 2011/11/13 15:45:24 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=
diff --git a/lang/ruby193-base/DEINSTALL b/lang/ruby193-base/DEINSTALL
index 72184ecde00..aee805ecbf9 100644
--- a/lang/ruby193-base/DEINSTALL
+++ b/lang/ruby193-base/DEINSTALL
@@ -1,6 +1,5 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2011/11/13 15:45:49 taca Exp $
 
-PREFIX="@PREFIX@"
 RUBY_GEM_BASE="${PREFIX}/@RUBY_GEM_BASE@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 
@@ -13,4 +12,3 @@ POST-DEINSTALL)
 	${RMDIR} ${RUBY_GEM_BASE} 2>/dev/null || true
 	;;
 esac
-exit
diff --git a/lang/ruby193-base/INSTALL b/lang/ruby193-base/INSTALL
index d5e1919122d..8007f2d06e4 100644
--- a/lang/ruby193-base/INSTALL
+++ b/lang/ruby193-base/INSTALL
@@ -1,7 +1,6 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+# $NetBSD: INSTALL,v 1.2 2011/11/13 15:45:49 taca Exp $
 
 DATE="@DATE@"
-PREFIX="@PREFIX@"
 RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
 
@@ -12,4 +11,4 @@ POST-INSTALL)
 	fi
 	;;
 esac
-exit
+
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index dab31b1b0f0..4e0da35076b 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/11/13 15:45:49 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=