Date: Sun, 23 Aug 2009 13:41:44 GMT From: Wen Heping <wenheping@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/138101: [REPOCOPY]databases/ruby-dbi --> databases/rubygem-dbi Message-ID: <200908231341.n7NDfidL081329@www.freebsd.org> Resent-Message-ID: <200908231350.n7NDo4e9021251@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138101
>Category: ports
>Synopsis: [REPOCOPY]databases/ruby-dbi --> databases/rubygem-dbi
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 23 13:50:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Wen Heping
>Release: FreeBSD 8.0-Current
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Mar 22 22:12:06 CST 2009 root@fb8.wenjing.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
After databases/ruby-dbi update to 0.4.2,
now it use "USE_RUBYGEMS=yes" to build and install the package.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN ruby-dbi/Makefile ruby-dbi.new/Makefile
--- ruby-dbi/Makefile 2009-08-04 06:06:31.000000000 +0800
+++ ruby-dbi.new/Makefile 2009-08-23 21:35:15.000000000 +0800
@@ -5,45 +5,23 @@
# $FreeBSD: ports/databases/ruby-dbi/Makefile,v 1.19 2009/08/03 22:06:31 pgollucci Exp $
#
-PORTNAME= ${RUBY_DBI_PORTNAME}
-PORTVERSION= ${RUBY_DBI_PORTVERSION}
-CATEGORIES= databases ruby
-MASTER_SITES= ${RUBY_DBI_MASTER_SITES}
-MASTER_SITE_SUBDIR= ${RUBY_DBI_MASTER_SITE_SUBDIR}
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${RUBY_DBI_DISTNAME}
-DIST_SUBDIR= ruby
+PORTNAME= dbi
+PORTVERSION= 0.4.2
+PORTEPOCH= 1
+CATEGORIES= databases rubygems
+MASTER_SITES= RF
+MASTER_SITE_SUBDIR= ruby-dbi
MAINTAINER= ruby@FreeBSD.org
COMMENT= DBI-for-Ruby - a common interface for SQL-based databases
-RUN_DEPENDS= ${RUBY_SITELIBDIR}/aspectr.rb:${PORTSDIR}/devel/ruby-aspectr
+BUILD_DEPENDS= rubygem-deprecated>=2.0.0:${PORTSDIR}/devel/rubygem-deprecated
+RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_RUBY= yes
-USE_RUBY_SETUP= yes
+PLIST_FILES= bin/dbi
-WRKSRC= ${RUBY_DBI_WRKSRC}
-CONFIGURE_ARGS= --with=bin/commandline,${PORTNAME}
-
-DOCS_EN= README.1st doc/*
-
-.include "${.CURDIR}/Makefile.common"
-
-post-extract:
- ${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
-
-post-install:
- ${MKDIR} ${RUBY_SITEARCHLIBDIR}/${PORTNAME}
- ${MKDIR} ${RUBY_SITELIBDIR}/DBD
- ${MKDIR} ${RUBY_SITEARCHLIBDIR}/DBD
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${RUBY_MODEXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
- ${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
- ${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.endif
- @${CAT} ${PKGMESSAGE}
+USE_RUBY= yes
+USE_RUBYGEMS= yes
+RUBYGEM_AUTOPLIST= yes
.include <bsd.port.mk>
diff -urN ruby-dbi/Makefile.common ruby-dbi.new/Makefile.common
--- ruby-dbi/Makefile.common 2007-01-08 18:03:32.000000000 +0800
+++ ruby-dbi.new/Makefile.common 1970-01-01 08:00:00.000000000 +0800
@@ -1,21 +0,0 @@
-# $FreeBSD: ports/databases/ruby-dbi/Makefile.common,v 1.25 2007/01/08 10:03:32 clsung Exp $
-
-RUBY_DBI_PORTNAME= dbi
-# Don't forget to clear PORTREVISION's on update
-RUBY_DBI_VERSION= 0.1.1
-RUBY_DBI_PORTVERSION= ${RUBY_DBI_VERSION}
-RUBY_DBI_MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
-RUBY_DBI_MASTER_SITE_SUBDIR= ruby-${RUBY_DBI_PORTNAME}
-RUBY_DBI_DISTNAME= ${RUBY_DBI_PORTNAME}-${PORTVERSION}
-
-RUBY_DBI_PORTDIR= ${PORTSDIR}/databases/ruby-${RUBY_DBI_PORTNAME}
-
-RUBY_DBI_WRKSRC?= ${WRKDIR}/ruby-dbi
-
-MD5_FILE?= ${RUBY_DBI_PORTDIR}/distinfo
-
-.if ${PORTNAME} == dbi
-RUBY_MODNAME?= ${RUBY_DBI_PORTNAME}
-.else
-RUBY_MODNAME?= ${RUBY_DBI_PORTNAME}/${PORTNAME}
-.endif
diff -urN ruby-dbi/distinfo ruby-dbi.new/distinfo
--- ruby-dbi/distinfo 2007-01-08 18:03:32.000000000 +0800
+++ ruby-dbi.new/distinfo 2009-08-23 12:10:47.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (ruby/dbi-0.1.1.tar.gz) = 1077f898080bb0af1098ee4b5b54f8d1
-SHA256 (ruby/dbi-0.1.1.tar.gz) = f45a301a81dbc86aa3202f0f0b6eb63e4a3fdd0b622605135575a2000d581b0f
-SIZE (ruby/dbi-0.1.1.tar.gz) = 155533
+MD5 (rubygem/dbi-0.4.2.gem) = ca7a58f2823ab4392c9ec8fab943e5ef
+SHA256 (rubygem/dbi-0.4.2.gem) = 1dbb0d82e17f96d3c23beca5b8cbf04050e3ccfbfcf04d6ed783557d8c76b958
+SIZE (rubygem/dbi-0.4.2.gem) = 73216
diff -urN ruby-dbi/pkg-plist ruby-dbi.new/pkg-plist
--- ruby-dbi/pkg-plist 2006-05-22 06:38:06.000000000 +0800
+++ ruby-dbi.new/pkg-plist 1970-01-01 08:00:00.000000000 +0800
@@ -1,42 +0,0 @@
-@exec mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%/DBD
-@exec mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%/dbi
-@exec mkdir -p %D/%%RUBY_SITELIBDIR%%/DBD
-bin/sqlsh.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/frontbase/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/mysql/HISTORY
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/mysql/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/postgresql/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ChangeLog.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBD_SPEC.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBI_SPEC.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/rubyStyle.css
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBD_SPEC
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBI_SPEC
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.1st
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/frontbase
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/mysql
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/postgresql
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/persistence.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sqlsh.rb.new
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.pl
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_blob.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/trace_test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlgen.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmltest.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-@dirrm %%RUBY_SITEARCHLIBDIR%%/DBD
-@dirrm %%RUBY_SITEARCHLIBDIR%%/dbi
-%%RUBY_SITELIBDIR%%/dbi/columninfo.rb
-%%RUBY_SITELIBDIR%%/dbi/row.rb
-%%RUBY_SITELIBDIR%%/dbi/sql.rb
-%%RUBY_SITELIBDIR%%/dbi/trace.rb
-%%RUBY_SITELIBDIR%%/dbi/utils.rb
-%%RUBY_SITELIBDIR%%/dbi/version.rb
-%%RUBY_SITELIBDIR%%/dbi.rb
-@dirrm %%RUBY_SITELIBDIR%%/DBD
-@dirrm %%RUBY_SITELIBDIR%%/dbi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908231341.n7NDfidL081329>