Update ruby-jdbc-mysql and ruby-jdbc-postgres to the latest versions.
Among other things the new ruby-jdbc-postgres version can handle the new
literal bytea format used by default in PostgreSQL 9.0.
While here, add the version to SUBST_VARS to reduce PLIST churn in the
future.
Tested on i386, builds fine on amd64 too. Looking for OKs.
Jeremy
Index: databases/ruby-jdbc-mysql/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-mysql/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- databases/ruby-jdbc-mysql/Makefile 9 Dec 2010 20:11:28 -0000 1.1.1.1
+++ databases/ruby-jdbc-mysql/Makefile 20 Jan 2011 02:39:00 -0000
@@ -2,7 +2,8 @@
COMMENT = access a MySQL database from JRuby
-DISTNAME = jdbc-mysql-5.0.4
+V = 5.1.13
+DISTNAME = jdbc-mysql-${V}
CATEGORIES = databases
# MIT
@@ -14,6 +15,7 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ruby
FLAVOR = jruby
+SUBST_VARS = DISTNAME V
CONFIGURE_STYLE = ruby gem
.include <bsd.port.mk>
Index: databases/ruby-jdbc-mysql/distinfo
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-mysql/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- databases/ruby-jdbc-mysql/distinfo 9 Dec 2010 20:11:28 -0000 1.1.1.1
+++ databases/ruby-jdbc-mysql/distinfo 20 Jan 2011 02:35:03 -0000
@@ -1,5 +1,5 @@
-MD5 (jdbc-mysql-5.0.4.gem) = U1njAwgZF9WdXECMRC0EHg==
-RMD160 (jdbc-mysql-5.0.4.gem) = Llch9S54QV2QhcT4j4ufgLZpNVs=
-SHA1 (jdbc-mysql-5.0.4.gem) = 7ePz2sdqdHZRIEpzy9nJxT92bk8=
-SHA256 (jdbc-mysql-5.0.4.gem) = WFwgl2jA6SkUjN457P0uYClyWhUcyhiPvldsPsjK1Yk=
-SIZE (jdbc-mysql-5.0.4.gem) = 482304
+MD5 (jdbc-mysql-5.1.13.gem) = YDgi+xncl5nq6H/ZpqI/lQ==
+RMD160 (jdbc-mysql-5.1.13.gem) = HG7y0OIhu7AsHPIyn5Ll5zqDPfU=
+SHA1 (jdbc-mysql-5.1.13.gem) = /IZZ8SjtYcvOCDzwWFZHE+ZVd+0=
+SHA256 (jdbc-mysql-5.1.13.gem) = yu0jZ0Os6aioJGfGqKYTW7Z9b5NKaVkem4tyQWpchEE=
+SIZE (jdbc-mysql-5.1.13.gem) = 740864
Index: databases/ruby-jdbc-mysql/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-mysql/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- databases/ruby-jdbc-mysql/pkg/PLIST 9 Dec 2010 20:11:28 -0000 1.1.1.1
+++ databases/ruby-jdbc-mysql/pkg/PLIST 20 Jan 2011 02:39:34 -0000
@@ -8,5 +8,5 @@ ${GEM_LIB}/gems/${DISTNAME}/Rakefile
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/jdbc/
${GEM_LIB}/gems/${DISTNAME}/lib/jdbc/mysql.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/mysql-connector-java-5.0.4-bin.jar
+${GEM_LIB}/gems/${DISTNAME}/lib/mysql-connector-java-${V}.jar
${GEM_LIB}/specifications/${DISTNAME}.gemspec
Index: databases/ruby-jdbc-postgres/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-postgres/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- databases/ruby-jdbc-postgres/Makefile 9 Dec 2010 20:12:06 -0000
1.1.1.1
+++ databases/ruby-jdbc-postgres/Makefile 20 Jan 2011 02:40:16 -0000
@@ -2,8 +2,8 @@
COMMENT = access a PostgreSQL database from JRuby
-DISTNAME = ${PKGNAME}-java
-PKGNAME = jdbc-postgres-8.4.702
+V = 9.0-801
+DISTNAME = jdbc-postgres-${V:S/-/./}
CATEGORIES = databases
# MIT
@@ -15,6 +15,7 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ruby
FLAVOR = jruby
+SUBST_VARS = DISTNAME V
CONFIGURE_STYLE = ruby gem
.include <bsd.port.mk>
Index: databases/ruby-jdbc-postgres/distinfo
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-postgres/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- databases/ruby-jdbc-postgres/distinfo 9 Dec 2010 20:12:06 -0000
1.1.1.1
+++ databases/ruby-jdbc-postgres/distinfo 20 Jan 2011 02:32:07 -0000
@@ -1,5 +1,5 @@
-MD5 (jdbc-postgres-8.4.702-java.gem) = AHGMuRrn9/tHGI2uOooIIA==
-RMD160 (jdbc-postgres-8.4.702-java.gem) = LVU5k2FlLHD5yhKuf6RUdPb8ZqI=
-SHA1 (jdbc-postgres-8.4.702-java.gem) = uq2GJjJiHLScHMSkqbuhMY9BA9o=
-SHA256 (jdbc-postgres-8.4.702-java.gem) =
1vhkGJm5MSe6Bh+7AxBT2QhskkrjGlp0sVoMrQT0GQk=
-SIZE (jdbc-postgres-8.4.702-java.gem) = 992256
+MD5 (jdbc-postgres-9.0.801.gem) = ex87EFw56fODt/7jnfdNbw==
+RMD160 (jdbc-postgres-9.0.801.gem) = 4kDe1hS5uQv/DqXNiXkY2lKdWHo=
+SHA1 (jdbc-postgres-9.0.801.gem) = MZYwubqKgZ0oOrMV74e9t7Nulzk=
+SHA256 (jdbc-postgres-9.0.801.gem) =
DogQfg+gCUde77f9vcOU1SMsGh3GQVAd0IysNXvug80=
+SIZE (jdbc-postgres-9.0.801.gem) = 998400
Index: databases/ruby-jdbc-postgres/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/ruby-jdbc-postgres/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- databases/ruby-jdbc-postgres/pkg/PLIST 9 Dec 2010 20:12:06 -0000
1.1.1.1
+++ databases/ruby-jdbc-postgres/pkg/PLIST 11 Mar 2011 21:14:16 -0000
@@ -9,6 +9,6 @@ ${GEM_LIB}/gems/${DISTNAME}/Rakefile
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/jdbc/
${GEM_LIB}/gems/${DISTNAME}/lib/jdbc/postgres.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/postgresql-8.4-702.jdbc3.jar
-${GEM_LIB}/gems/${DISTNAME}/lib/postgresql-8.4-702.jdbc4.jar
+${GEM_LIB}/gems/${DISTNAME}/lib/postgresql-${V}.jdbc3.jar
+${GEM_LIB}/gems/${DISTNAME}/lib/postgresql-${V}.jdbc4.jar
${GEM_LIB}/specifications/${DISTNAME}.gemspec
