@@ -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 @@
 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 @@
 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
 

@@ -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