Thu Feb 10 10:49:43 2022 UTC ()
Remove conflict flag


(pin)
diff -r1.15 -r1.16 pkgsrc/misc/ja-less/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/misc/ja-less/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/ja-less/Makefile 2022/02/10 07:45:23 1.15
+++ pkgsrc/misc/ja-less/Makefile 2022/02/10 10:49:42 1.16
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: Makefile,v 1.15 2022/02/10 07:45:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2022/02/10 10:49:42 pin Exp $
2 2
3DISTNAME= less-382 3DISTNAME= less-382
4PKGNAME= ja-${DISTNAME}.262.03 4PKGNAME= ja-${DISTNAME}.262.03
5CATEGORIES= japanese misc 5CATEGORIES= japanese misc
6MASTER_SITES= ${MASTER_SITE_GNU:=less/} 6MASTER_SITES= ${MASTER_SITE_GNU:=less/}
7 7
8PATCH_SITES= http://ryo-on.users.sourceforge.net/distrib/ja-less/ 8PATCH_SITES= http://ryo-on.users.sourceforge.net/distrib/ja-less/
9PATCHFILES= less-382-iso258.patch.gz 9PATCHFILES= less-382-iso258.patch.gz
10PATCHFILES+= less-382-iso258-259.patch.gz 10PATCHFILES+= less-382-iso258-259.patch.gz
11PATCHFILES+= less-382-iso259-260.patch.gz 11PATCHFILES+= less-382-iso259-260.patch.gz
12PATCHFILES+= less-382-iso260-261.patch.gz 12PATCHFILES+= less-382-iso260-261.patch.gz
13PATCHFILES+= less-382-iso261-262.patch.gz 13PATCHFILES+= less-382-iso261-262.patch.gz
14PATCHFILES+= less-382-iso262.ext03.patch.gz 14PATCHFILES+= less-382-iso262.ext03.patch.gz
15PATCH_DIST_STRIP= -p1 15PATCH_DIST_STRIP= -p1
16 16
17MAINTAINER= komine@cc.meisei-u.ac.jp 17MAINTAINER= komine@cc.meisei-u.ac.jp
18# HOMEPAGE is gone. 18# HOMEPAGE is gone.
19#HOMEPAGE= http://www25.big.jp/~jam/less/ 19#HOMEPAGE= http://www25.big.jp/~jam/less/
20COMMENT= Less + zcat + ISO-2022 + UTF-8 - a pager similar to more and pg 20COMMENT= Less + zcat + ISO-2022 + UTF-8 - a pager similar to more and pg
21 21
22CONFLICTS+= jless-[0-9]* 
23 
24GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
25 23
26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
27 25
28SUBST_CLASSES+= cfgdir 26SUBST_CLASSES+= cfgdir
29SUBST_STAGE.cfgdir= post-configure 27SUBST_STAGE.cfgdir= post-configure
30SUBST_FILES.cfgdir= less.nro 28SUBST_FILES.cfgdir= less.nro
31SUBST_SED.cfgdir= -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|' 29SUBST_SED.cfgdir= -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|'
32 30
33.include "../../mk/termcap.buildlink3.mk" 31.include "../../mk/termcap.buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"