CVS commit: pkgsrc/textproc/ruby-amrita

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

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

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

Log Message:
ruby-amarita: fix self-conflict

note the PLIST changed. please verify whether this installs in
a reproducible way...


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ruby-amrita/ALTERNATIVES
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/ruby-amrita/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ruby-amrita/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-amrita/Makefile
diff -u pkgsrc/textproc/ruby-amrita/Makefile:1.18 pkgsrc/textproc/ruby-amrita/Makefile:1.19
--- pkgsrc/textproc/ruby-amrita/Makefile:1.18   Sun Jan 26 17:32:18 2020
+++ pkgsrc/textproc/ruby-amrita/Makefile        Fri May 21 11:18:09 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:32:18 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2021/05/21 11:18:09 nia Exp $
 
 DISTNAME=      amrita-1.0.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc ruby www
 MASTER_SITES=  ${MASTER_SITE_OSDN:=amrita/10939/}
 
@@ -10,8 +10,6 @@ HOMEPAGE=     https://amrita.osdn.jp/
 COMMENT=       HTML/XHTML template library for Ruby
 LICENSE=       gnu-gpl-v2 OR ruby-license
 
-CONFLICTS+=    ruby[1-9][0-9]-amrita-*
-
 NO_BUILD=      yes
 DOCS=          ChangeLog README README_ja
 REPLACE_RUBY=  bin/ams bin/amshandler bin/amx
@@ -27,7 +25,7 @@ post-patch:
 
 post-install:
 .for f in ${REPLACE_RUBY}
-       ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
+       ${MV} ${DESTDIR}${PREFIX}/${f} ${DESTDIR}${PREFIX}/${f}${RUBY_SUFFIX}
 .endfor
 .for f in ${DOCS}
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/amrita

Index: pkgsrc/textproc/ruby-amrita/PLIST
diff -u pkgsrc/textproc/ruby-amrita/PLIST:1.5 pkgsrc/textproc/ruby-amrita/PLIST:1.6
--- pkgsrc/textproc/ruby-amrita/PLIST:1.5       Sun Jun 14 18:17:27 2009
+++ pkgsrc/textproc/ruby-amrita/PLIST   Fri May 21 11:18:09 2021
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:27 joerg Exp $
-bin/ams
-bin/amshandler
-bin/amx
+@comment $NetBSD: PLIST,v 1.6 2021/05/21 11:18:09 nia Exp $
+bin/ams${RUBY_SUFFIX}
+bin/amshandler${RUBY_SUFFIX}
+bin/amx${RUBY_SUFFIX}
 ${RUBY_VENDORLIB}/amrita/ams.rb
 ${RUBY_VENDORLIB}/amrita/amx.rb
 ${RUBY_VENDORLIB}/amrita/cgikit.rb
@@ -31,11 +31,7 @@ ${RUBY_DOC}/amrita/Tour_ja
 ${RUBY_DOC}/amrita/XML
 ${RUBY_DOC}/amrita/XML_ja
 ${RUBY_DOC}/amrita/amritadoc.rb
-${RUBY_DOC}/amrita/index.amx
-${RUBY_DOC}/amrita/index.rd
-${RUBY_DOC}/amrita/index.xml
-${RUBY_DOC}/amrita/index_ja.rd
-${RUBY_DOC}/amrita/index_ja.xml
+${RUBY_DOC}/amrita/html/classes/Amrita.html
 ${RUBY_DOC}/amrita/html/classes/Amrita/AmsHandler.html
 ${RUBY_DOC}/amrita/html/classes/Amrita/AmsTemplate.html
 ${RUBY_DOC}/amrita/html/classes/Amrita/AsIsFormatter.html
@@ -82,11 +78,10 @@ ${RUBY_DOC}/amrita/html/classes/Amrita/T
 ${RUBY_DOC}/amrita/html/classes/Amrita/TemplateFileWithCache.html
 ${RUBY_DOC}/amrita/html/classes/Amrita/TemplateText.html
 ${RUBY_DOC}/amrita/html/classes/Amrita/XMLParser.html
-${RUBY_DOC}/amrita/html/classes/Amrita.html
+${RUBY_DOC}/amrita/html/classes/Amx.html
 ${RUBY_DOC}/amrita/html/classes/Amx/AmxContext.html
 ${RUBY_DOC}/amrita/html/classes/Amx/Document.html
 ${RUBY_DOC}/amrita/html/classes/Amx/Template.html
-${RUBY_DOC}/amrita/html/classes/Amx.html
 ${RUBY_DOC}/amrita/html/classes/Array.html
 ${RUBY_DOC}/amrita/html/classes/CKAmritaElement.html
 ${RUBY_DOC}/amrita/html/classes/Integer.html
@@ -131,6 +126,11 @@ ${RUBY_DOC}/amrita/html/fr_file_index.ht
 ${RUBY_DOC}/amrita/html/fr_method_index.html
 ${RUBY_DOC}/amrita/html/index.html
 ${RUBY_DOC}/amrita/html/rdoc-style.css
+${RUBY_DOC}/amrita/index.amx
+${RUBY_DOC}/amrita/index.rd
+${RUBY_DOC}/amrita/index.xml
+${RUBY_DOC}/amrita/index_ja.rd
+${RUBY_DOC}/amrita/index_ja.xml
 ${RUBY_EG}/amrita/bbs/README
 ${RUBY_EG}/amrita/bbs/advertize_sample.html
 ${RUBY_EG}/amrita/bbs/bbs.rb

Added files:

Index: pkgsrc/textproc/ruby-amrita/ALTERNATIVES
diff -u /dev/null pkgsrc/textproc/ruby-amrita/ALTERNATIVES:1.1
--- /dev/null   Fri May 21 11:18:09 2021
+++ pkgsrc/textproc/ruby-amrita/ALTERNATIVES    Fri May 21 11:18:09 2021
@@ -0,0 +1,3 @@
+bin/ams @PREFIX@/bin/ams@RUBY_SUFFIX@
+bin/amshandler @PREFIX@/bin/amshandler@RUBY_SUFFIX@
+bin/amx @PREFIX@/bin/amx@RUBY_SUFFIX@