Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_161692595578130"
MIME-Version: 1.0
Date: Sun, 28 Mar 2021 10:05:55 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/ruby-ronn
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210328100555.A7242FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_161692595578130
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Mar 28 10:05:55 UTC 2021

Modified Files:
	pkgsrc/devel/ruby-ronn: Makefile PLIST
Added Files:
	pkgsrc/devel/ruby-ronn: ALTERNATIVES

Log Message:
ruby-ronn: Avoid self-conflict; added ALTERNATIVES support.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ruby-ronn/ALTERNATIVES
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ruby-ronn/Makefile \
    pkgsrc/devel/ruby-ronn/PLIST

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


--_----------=_161692595578130
Content-Disposition: inline
Content-Length: 2734
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/ruby-ronn/Makefile
diff -u pkgsrc/devel/ruby-ronn/Makefile:1.1 pkgsrc/devel/ruby-ronn/Makefile:1.2
--- pkgsrc/devel/ruby-ronn/Makefile:1.1	Mon Aug 21 13:26:14 2017
+++ pkgsrc/devel/ruby-ronn/Makefile	Sun Mar 28 10:05:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/21 13:26:14 nils Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/28 10:05:55 nia Exp $
 
 DISTNAME=		ronn-0.7.3
 PKGNAME=		${RUBY_PKGPREFIX}-${DISTNAME}
@@ -17,9 +17,21 @@ RUBYGEM_OPTIONS+=	--format-executable
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man7
 
+post-build:
+	${SED} -e 's/ronn(1)/ronn${RUBY_SUFFIX}(1)/g' \
+	    -e 's/ronn\\-format(7)/ronn\-format${RUBY_SUFFIX}(7)/g' \
+	    ${WRKSRC}/man/ronn.1 > \
+	    ${WRKDIR}/ronn${RUBY_SUFFIX}.1
+	${SED} -e 's/ronn(1)/ronn${RUBY_SUFFIX}(1)/g' \
+	    -e 's/ronn\\-format(7)/ronn\-format${RUBY_SUFFIX}(7)/g' \
+	    ${WRKSRC}/man/ronn-format.7 > \
+	    ${WRKDIR}/ronn-format${RUBY_SUFFIX}.7
+
 post-install:
-	${LN} -sf ${PREFIX}/${GEM_LIBDIR}/man/ronn.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ronn.1
-	${LN} -sf ${PREFIX}/${GEM_LIBDIR}/man/ronn-format.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/ronn-format.7
+	${INSTALL_MAN} ${WRKDIR}/ronn${RUBY_SUFFIX}.1 \
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ronn${RUBY_SUFFIX}.1
+	${INSTALL_MAN} ${WRKDIR}/ronn-format${RUBY_SUFFIX}.7 \
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/ronn-format${RUBY_SUFFIX}.7
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/ruby-ronn/PLIST
diff -u pkgsrc/devel/ruby-ronn/PLIST:1.1 pkgsrc/devel/ruby-ronn/PLIST:1.2
--- pkgsrc/devel/ruby-ronn/PLIST:1.1	Mon Aug 21 13:26:14 2017
+++ pkgsrc/devel/ruby-ronn/PLIST	Sun Mar 28 10:05:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/21 13:26:14 nils Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/03/28 10:05:55 nia Exp $
 bin/ronn${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/AUTHORS
@@ -68,6 +68,5 @@ ${GEM_LIBDIR}/test/titleless_document.ro
 ${GEM_LIBDIR}/test/underline_spacing_test.roff
 ${GEM_LIBDIR}/test/underline_spacing_test.ronn
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
-man/man1/ronn.1
-man/man7/ronn-format.7
-@pkgdir lib/ruby/gems/2.0.0/build_info
+man/man1/ronn${RUBY_SUFFIX}.1
+man/man7/ronn-format${RUBY_SUFFIX}.7

Added files:

Index: pkgsrc/devel/ruby-ronn/ALTERNATIVES
diff -u /dev/null pkgsrc/devel/ruby-ronn/ALTERNATIVES:1.1
--- /dev/null	Sun Mar 28 10:05:55 2021
+++ pkgsrc/devel/ruby-ronn/ALTERNATIVES	Sun Mar 28 10:05:55 2021
@@ -0,0 +1,3 @@
+bin/ronn @PREFIX@/bin/ronn@RUBY_SUFFIX@
+@PKGMANDIR@/man1/ronn.1 @PREFIX@/@PKGMANDIR@/man1/ronn@RUBY_SUFFIX@.1
+@PKGMANDIR@/man7/ronn-format.7 @PREFIX@/@PKGMANDIR@/man7/ronn-format@RUBY_SUFFIX@.7


--_----------=_161692595578130--