Received: by mail.netbsd.org (Postfix, from userid 605) id B2B5884CFC; Fri, 21 May 2021 12:20:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EDDF784CED for ; Fri, 21 May 2021 12:20:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id rkCitZNDDekp for ; Fri, 21 May 2021 12:20:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 690F584C13 for ; Fri, 21 May 2021 12:20:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 61933FA95; Fri, 21 May 2021 12:20:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1621599624189610" MIME-Version: 1.0 Date: Fri, 21 May 2021 12:20:24 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/databases/ruby-vapor To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210521122024.61933FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1621599624189610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri May 21 12:20:24 UTC 2021 Modified Files: pkgsrc/databases/ruby-vapor: Makefile PLIST Added Files: pkgsrc/databases/ruby-vapor: ALTERNATIVES Log Message: ruby-vapor: remove self-conflict To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/databases/ruby-vapor/ALTERNATIVES cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/ruby-vapor/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/ruby-vapor/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1621599624189610 Content-Disposition: inline Content-Length: 2064 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/ruby-vapor/Makefile diff -u pkgsrc/databases/ruby-vapor/Makefile:1.29 pkgsrc/databases/ruby-vapor/Makefile:1.30 --- pkgsrc/databases/ruby-vapor/Makefile:1.29 Sat Nov 2 15:38:11 2019 +++ pkgsrc/databases/ruby-vapor/Makefile Fri May 21 12:20:24 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:11 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2021/05/21 12:20:24 nia Exp $ DISTNAME= vapor-0.81 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= databases ruby MASTER_SITES= # http://rubyforge.org/frs/download.php/215/ @@ -10,8 +10,6 @@ HOMEPAGE= # http://vapor.rubyforge.org/ COMMENT= Ruby transparent persistence to postgresql LICENSE= gnu-gpl-v2 OR ruby-license -CONFLICTS+= ruby[1-9][0-9]-vapor-* - DEPENDS+= ${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg USE_TOOLS= pax @@ -30,6 +28,7 @@ CONFIGURE_ARGS+= --site-ruby-common=${PR INSTALLATION_DIRS= ${RUBY_DOC}/vapor ${RUBY_EG} post-install: + cd ${DESTDIR}${PREFIX}/bin && ${MV} vaporadmin vaporadmin${RUBY_SUFFIX} cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor ${LN} -s ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor ${DESTDIR}${PREFIX}/${RUBY_EG}/vapor Index: pkgsrc/databases/ruby-vapor/PLIST diff -u pkgsrc/databases/ruby-vapor/PLIST:1.6 pkgsrc/databases/ruby-vapor/PLIST:1.7 --- pkgsrc/databases/ruby-vapor/PLIST:1.6 Sun Jun 14 17:43:26 2009 +++ pkgsrc/databases/ruby-vapor/PLIST Fri May 21 12:20:24 2021 @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:26 joerg Exp $ -bin/vaporadmin +@comment $NetBSD: PLIST,v 1.7 2021/05/21 12:20:24 nia Exp $ +bin/vaporadmin${RUBY_SUFFIX} ${RUBY_VENDORLIB}/vapor.rb ${RUBY_VENDORLIB}/vapor/persistencemgr.rb ${RUBY_VENDORLIB}/vapor/queryparser.y Added files: Index: pkgsrc/databases/ruby-vapor/ALTERNATIVES diff -u /dev/null pkgsrc/databases/ruby-vapor/ALTERNATIVES:1.1 --- /dev/null Fri May 21 12:20:24 2021 +++ pkgsrc/databases/ruby-vapor/ALTERNATIVES Fri May 21 12:20:24 2021 @@ -0,0 +1 @@ +bin/vaporadmin @PREFIX@/bin/vaporadmin@RUBY_SUFFIX@ --_----------=_1621599624189610--