CVS commit: pkgsrc/devel/apache-ant15

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Feb  8 23:47:00 UTC 2025

Modified Files:
        pkgsrc/devel/apache-ant15: Makefile

Log Message:
devel/apache-ant: add version to conflict pattern


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/apache-ant15/Makefile

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

Modified files:

Index: pkgsrc/devel/apache-ant15/Makefile
diff -u pkgsrc/devel/apache-ant15/Makefile:1.14 pkgsrc/devel/apache-ant15/Makefile:1.15
--- pkgsrc/devel/apache-ant15/Makefile:1.14     Fri Oct  4 19:11:21 2024
+++ pkgsrc/devel/apache-ant15/Makefile  Sat Feb  8 23:47:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/10/04 19:11:21 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2025/02/08 23:47:00 rillig Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -19,7 +19,7 @@ COMMENT=      Apache Project's Java-based mak
 DEPENDS+=      crimson>=1.1.3:../../textproc/crimson
 
 # Up to version 1.5.1 inclusive this was known as "jakarta-ant".
-CONFLICTS=     jakarta-ant*
+CONFLICTS=     jakarta-ant*-[0-9]*
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=      run