From owner-svn-ports-all@FreeBSD.ORG Sun Apr 5 18:25:57 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82D479A2; Sun, 5 Apr 2015 18:25:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EBA7C31; Sun, 5 Apr 2015 18:25:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t35IPvcX079310; Sun, 5 Apr 2015 18:25:57 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t35IPu27079308; Sun, 5 Apr 2015 18:25:56 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504051825.t35IPu27079308@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 5 Apr 2015 18:25:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383341 - in head/databases/ruby-rdbc1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2015 18:25:57 -0000 Author: sunpoet Date: Sun Apr 5 18:25:56 2015 New Revision: 383341 URL: https://svnweb.freebsd.org/changeset/ports/383341 Log: - Use USES=dos2unix and remove CRLF in patch file - Use USES=tar:tgz - Use COPYTREE_SHARE instead of CP -R - Simplify Makefile - Bump PORTREVISION for package change Modified: head/databases/ruby-rdbc1/Makefile head/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb (contents, props changed) Modified: head/databases/ruby-rdbc1/Makefile ============================================================================== --- head/databases/ruby-rdbc1/Makefile Sun Apr 5 18:25:51 2015 (r383340) +++ head/databases/ruby-rdbc1/Makefile Sun Apr 5 18:25:56 2015 (r383341) @@ -3,13 +3,12 @@ PORTNAME= rdbc1 PORTVERSION= 001103 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases ruby MASTER_SITES= http://homepage3.nifty.com/guion/SOFT/RDBC/ \ ftp://ftp.dinoex.de/pub/approved/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}_${PORTVERSION} -EXTRACT_SUFX= .tgz DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org @@ -18,25 +17,22 @@ COMMENT= Ruby Database Connectivity RUN_DEPENDS= rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg USE_RUBY= yes +USES= dos2unix tar:tgz + +DOS2UNIX_FILES= ora_rdbc1.rb pg_rdbc1.rb rdbc1.rb sample/test1.rb WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes OPTIONS_DEFINE= DOCS EXAMPLES -.include - do-install: ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/*.rb ${STAGEDIR}${RUBY_SITELIBDIR}/ -.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja + cd ${WRKSRC}/doc/en/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_MODDOCDIR}/ + cd ${WRKSRC}/doc/ja/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_MODDOCDIR}/ja/ ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja - ${CP} -R ${WRKSRC}/doc/en/* ${STAGEDIR}${RUBY_MODDOCDIR}/ - ${CP} -R ${WRKSRC}/doc/ja/* ${STAGEDIR}${RUBY_MODDOCDIR}/ja/ -.endif .include Modified: head/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb ============================================================================== --- head/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb Sun Apr 5 18:25:51 2015 (r383340) +++ head/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb Sun Apr 5 18:25:56 2015 (r383341) @@ -1,11 +1,11 @@ --- pg_rdbc1.rb.orig Fri May 26 03:24:12 2000 +++ pg_rdbc1.rb Mon Mar 19 17:44:34 2001 @@ -11,7 +11,7 @@ - require "rdbc1.rb" - - module PG_RDBC1 -- require "../postgres/postgres.so" -+ require "postgres" - include RDBC1 - - # Driver Creator will inherite me. + require "rdbc1.rb" + + module PG_RDBC1 +- require "../postgres/postgres.so" ++ require "postgres" + include RDBC1 + + # Driver Creator will inherite me.