diff options
| author | nia <nia@pkgsrc.org> | 2021-05-21 12:20:24 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-05-21 12:20:24 +0000 |
| commit | f8e145719e4b565821667a1279178477b28f2893 (patch) | |
| tree | ce346bedf5f9336610801bf46c65fa23bc65681a | |
| parent | f6b6d75476e241640843a67c9ffd95aaa61170e2 (diff) | |
| download | pkgsrc-f8e145719e4b565821667a1279178477b28f2893.tar.gz | |
ruby-vapor: remove self-conflict
| -rw-r--r-- | databases/ruby-vapor/ALTERNATIVES | 1 | ||||
| -rw-r--r-- | databases/ruby-vapor/Makefile | 7 | ||||
| -rw-r--r-- | databases/ruby-vapor/PLIST | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/databases/ruby-vapor/ALTERNATIVES b/databases/ruby-vapor/ALTERNATIVES new file mode 100644 index 00000000000..fe709f804f1 --- /dev/null +++ b/databases/ruby-vapor/ALTERNATIVES @@ -0,0 +1 @@ +bin/vaporadmin @PREFIX@/bin/vaporadmin@RUBY_SUFFIX@ diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile index 63c6ffbcb7f..e87f2e3ef99 100644 --- a/databases/ruby-vapor/Makefile +++ b/databases/ruby-vapor/Makefile @@ -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=${PREFIX}/${RUBY_VENDORLIB_BASE} \ 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 diff --git a/databases/ruby-vapor/PLIST b/databases/ruby-vapor/PLIST index 03a68f8b6e9..7c8cc743c30 100644 --- a/databases/ruby-vapor/PLIST +++ b/databases/ruby-vapor/PLIST @@ -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 |