CVS commit: pkgsrc/textproc/ruby-bluecloth

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May 21 11:11:20 UTC 2021

Modified Files:
        pkgsrc/textproc/ruby-bluecloth: Makefile PLIST
Added Files:
        pkgsrc/textproc/ruby-bluecloth: ALTERNATIVES

Log Message:
py-bluecloth: remove self-conflict


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ruby-bluecloth/ALTERNATIVES
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/ruby-bluecloth/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/ruby-bluecloth/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ruby-bluecloth/Makefile
diff -u pkgsrc/textproc/ruby-bluecloth/Makefile:1.10 pkgsrc/textproc/ruby-bluecloth/Makefile:1.11
--- pkgsrc/textproc/ruby-bluecloth/Makefile:1.10        Mon Sep  4 18:08:29 2017
+++ pkgsrc/textproc/ruby-bluecloth/Makefile     Fri May 21 11:11:19 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/09/04 18:08:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2021/05/21 11:11:19 nia Exp $
 
 DISTNAME=      bluecloth-2.2.0
+PKGREVISION=   1
 CATEGORIES=    textproc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -8,9 +9,11 @@ MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Markdown library for Ruby
 LICENSE=       original-bsd
 
-CONFLICTS+=    ruby[1-9][0-9]-bluecloth-[0-9]*
-
 USE_GCC_RUNTIME=       yes
 
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/bluecloth \
+           ${DESTDIR}${PREFIX}/bin/bluecloth${RUBY_SUFFIX}
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ruby-bluecloth/PLIST
diff -u pkgsrc/textproc/ruby-bluecloth/PLIST:1.9 pkgsrc/textproc/ruby-bluecloth/PLIST:1.10
--- pkgsrc/textproc/ruby-bluecloth/PLIST:1.9    Sun Mar  8 15:17:20 2015
+++ pkgsrc/textproc/ruby-bluecloth/PLIST        Fri May 21 11:11:19 2021
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2015/03/08 15:17:20 taca Exp $
-bin/bluecloth
+@comment $NetBSD: PLIST,v 1.10 2021/05/21 11:11:19 nia Exp $
+bin/bluecloth${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_EXTSDIR}/bluecloth_ext.${RUBY_DLEXT}
 ${GEM_EXTSDIR}/gem.build_complete

Added files:

Index: pkgsrc/textproc/ruby-bluecloth/ALTERNATIVES
diff -u /dev/null pkgsrc/textproc/ruby-bluecloth/ALTERNATIVES:1.1
--- /dev/null   Fri May 21 11:11:20 2021
+++ pkgsrc/textproc/ruby-bluecloth/ALTERNATIVES Fri May 21 11:11:19 2021
@@ -0,0 +1 @@
+bin/bluecloth @PREFIX@/bin/bluecloth@RUBY_SUFFIX@