Fri May 21 16:40:03 2021 UTC ()
newfile: remove incorrect CONFLICTS


(nia)
diff -r1.23 -r1.24 pkgsrc/devel/newfile/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/devel/newfile/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/newfile/Makefile 2020/03/20 11:57:28 1.23
+++ pkgsrc/devel/newfile/Makefile 2021/05/21 16:40:02 1.24
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.23 2020/03/20 11:57:28 nia Exp $ 1# $NetBSD: Makefile,v 1.24 2021/05/21 16:40:02 nia Exp $
2# 2#
3 3
4DISTNAME= newfile-1.0.14 4DISTNAME= newfile-1.0.14
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newfile/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newfile/}
8 8
9MAINTAINER= flynn@energyhq.es.eu.org 9MAINTAINER= flynn@energyhq.es.eu.org
10HOMEPAGE= http://newfile.sourceforge.net/ 10HOMEPAGE= http://newfile.sourceforge.net/
11COMMENT= Tool for creating starter files in various languages 11COMMENT= Tool for creating starter files in various languages
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14CONFLICTS+= ruby[1-9][0-9]-newfile-* newfile-* 
15 
16NO_BUILD= yes 14NO_BUILD= yes
17GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
18REPLACE_RUBY= src/newfile.rb.in 16REPLACE_RUBY= src/newfile.rb.in
19USE_TOOLS+= ksh 17USE_TOOLS+= ksh
20 18
21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 19INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
22 20
23post-install: 21post-install:
24 ${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${DESTDIR}${PREFIX}/bin/newfile 22 ${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${DESTDIR}${PREFIX}/bin/newfile
25 ${INSTALL_DATA} ${WRKSRC}/src/fileproc.rb ${WRKSRC}/src/sytab.rb \ 23 ${INSTALL_DATA} ${WRKSRC}/src/fileproc.rb ${WRKSRC}/src/sytab.rb \
26 ${DESTDIR}${PREFIX}/share/newfile/ 24 ${DESTDIR}${PREFIX}/share/newfile/
27 ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ 25 ${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
28 26