CVS commit: pkgsrc/databases/ruby-vapor

["Nia Alarie" <nia%netbsd.org@localhost>]

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.

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@