Fri May 21 12:20:24 2021 UTC ()
ruby-vapor: remove self-conflict


(nia)
diff -r0 -r1.1 pkgsrc/databases/ruby-vapor/ALTERNATIVES
diff -r1.29 -r1.30 pkgsrc/databases/ruby-vapor/Makefile
diff -r1.6 -r1.7 pkgsrc/databases/ruby-vapor/PLIST
File Added: pkgsrc/databases/ruby-vapor/ALTERNATIVES
bin/vaporadmin @PREFIX@/bin/vaporadmin@RUBY_SUFFIX@
cvs diff -r1.29 -r1.30 pkgsrc/databases/ruby-vapor/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ruby-vapor/Makefile 2019/11/02 15:38:11 1.29
+++ pkgsrc/databases/ruby-vapor/Makefile 2021/05/21 12:20:24 1.30
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.29 2019/11/02 15:38:11 rillig Exp $ 1# $NetBSD: Makefile,v 1.30 2021/05/21 12:20:24 nia Exp $
2 2
3DISTNAME= vapor-0.81 3DISTNAME= vapor-0.81
4PKGREVISION= 10 4PKGREVISION= 11
5CATEGORIES= databases ruby 5CATEGORIES= databases ruby
6MASTER_SITES= # http://rubyforge.org/frs/download.php/215/ 6MASTER_SITES= # http://rubyforge.org/frs/download.php/215/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= # http://vapor.rubyforge.org/ 9HOMEPAGE= # http://vapor.rubyforge.org/
10COMMENT= Ruby transparent persistence to postgresql 10COMMENT= Ruby transparent persistence to postgresql
11LICENSE= gnu-gpl-v2 OR ruby-license 11LICENSE= gnu-gpl-v2 OR ruby-license
12 12
13CONFLICTS+= ruby[1-9][0-9]-vapor-* 
14 
15DEPENDS+= ${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg 13DEPENDS+= ${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg
16 14
17USE_TOOLS= pax 15USE_TOOLS= pax
18USE_RUBY_SETUP= yes 16USE_RUBY_SETUP= yes
19RUBY_SETUP= install.rb 17RUBY_SETUP= install.rb
20REPLACE_RUBY= doc/examples/university/createperson \ 18REPLACE_RUBY= doc/examples/university/createperson \
21 doc/examples/university/createuni \ 19 doc/examples/university/createuni \
22 doc/examples/university/employment \ 20 doc/examples/university/employment \
23 doc/examples/university/enroll 21 doc/examples/university/enroll
24 22
25CONFIGURE_ARGS+= --site-ruby-common=${PREFIX}/${RUBY_VENDORLIB_BASE} \ 23CONFIGURE_ARGS+= --site-ruby-common=${PREFIX}/${RUBY_VENDORLIB_BASE} \
26 --site-ruby=${PREFIX}/${RUBY_VENDORLIB} \ 24 --site-ruby=${PREFIX}/${RUBY_VENDORLIB} \
27 --so-dir==${PREFIX}/${RUBY_VENDORARCHLIB} 25 --so-dir==${PREFIX}/${RUBY_VENDORARCHLIB}
28 26
29 27
30INSTALLATION_DIRS= ${RUBY_DOC}/vapor ${RUBY_EG} 28INSTALLATION_DIRS= ${RUBY_DOC}/vapor ${RUBY_EG}
31 29
32post-install: 30post-install:
 31 cd ${DESTDIR}${PREFIX}/bin && ${MV} vaporadmin vaporadmin${RUBY_SUFFIX}
33 cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor 32 cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor
34 ${LN} -s ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor ${DESTDIR}${PREFIX}/${RUBY_EG}/vapor 33 ${LN} -s ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor ${DESTDIR}${PREFIX}/${RUBY_EG}/vapor
35 34
36.include "../../lang/ruby/modules.mk" 35.include "../../lang/ruby/modules.mk"
37.include "../../mk/pgsql.buildlink3.mk" 36.include "../../mk/pgsql.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/databases/ruby-vapor/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/ruby-vapor/PLIST 2009/06/14 17:43:26 1.6
+++ pkgsrc/databases/ruby-vapor/PLIST 2021/05/21 12:20:24 1.7
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:26 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2021/05/21 12:20:24 nia Exp $
2bin/vaporadmin 2bin/vaporadmin${RUBY_SUFFIX}
3${RUBY_VENDORLIB}/vapor.rb 3${RUBY_VENDORLIB}/vapor.rb
4${RUBY_VENDORLIB}/vapor/persistencemgr.rb 4${RUBY_VENDORLIB}/vapor/persistencemgr.rb
5${RUBY_VENDORLIB}/vapor/queryparser.y 5${RUBY_VENDORLIB}/vapor/queryparser.y
6${RUBY_VENDORLIB}/vapor/extent.rb 6${RUBY_VENDORLIB}/vapor/extent.rb
7${RUBY_VENDORLIB}/vapor/repositorymgr.rb 7${RUBY_VENDORLIB}/vapor/repositorymgr.rb
8${RUBY_VENDORLIB}/vapor/transaction.rb 8${RUBY_VENDORLIB}/vapor/transaction.rb
9${RUBY_VENDORLIB}/vapor/queryparser.rb 9${RUBY_VENDORLIB}/vapor/queryparser.rb
10${RUBY_VENDORLIB}/vapor/oidgenerator.rb 10${RUBY_VENDORLIB}/vapor/oidgenerator.rb
11${RUBY_VENDORLIB}/vapor/exceptions.rb 11${RUBY_VENDORLIB}/vapor/exceptions.rb
12${RUBY_VENDORLIB}/vapor/utils.rb 12${RUBY_VENDORLIB}/vapor/utils.rb
13${RUBY_VENDORLIB}/vapor/tuplemgr.rb 13${RUBY_VENDORLIB}/vapor/tuplemgr.rb
14${RUBY_VENDORLIB}/vapor/persistable.rb 14${RUBY_VENDORLIB}/vapor/persistable.rb
15${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/BackendInconsistentError.html 15${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/BackendInconsistentError.html