CVS commit: pkgsrc/x11/fltk13

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Mar 14 16:00:40 UTC 2025

Modified Files:
        pkgsrc/x11/fltk13: Makefile buildlink3.mk

Log Message:
x11/fltk13: Do not use namespaces of x11/fltk

- Declare "fltk13" package (this one) as successor for FLTK 1.3.x
- Declare conflict with FLTK >1.4.0 (from x11/fltk)
- Bump PKGREVISION

This should fix problems with caches of bulk builds.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/fltk13/buildlink3.mk

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

Modified files:

Index: pkgsrc/x11/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.50 pkgsrc/x11/fltk13/Makefile:1.51
--- pkgsrc/x11/fltk13/Makefile:1.50     Fri Feb  7 10:01:25 2025
+++ pkgsrc/x11/fltk13/Makefile  Fri Mar 14 16:00:40 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2025/02/07 10:01:25 micha Exp $
+# $NetBSD: Makefile,v 1.51 2025/03/14 16:00:40 micha Exp $
 
 DISTNAME=      fltk-1.3.11-source
-PKGNAME=       ${DISTNAME:S/-source//}
+PKGNAME=       ${DISTNAME:S/-source//:S/fltk/fltk13/}
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fltk/}
 GITHUB_PROJECT=        fltk
@@ -13,6 +14,9 @@ HOMEPAGE=     https://www.fltk.org/
 COMMENT=       Fast Light Tool Kit for graphical user interfaces
 LICENSE=       gnu-lgpl-v2
 
+SUPERSEDES+=   fltk>=1.3.0<1.4.0
+CONFLICTS+=    fltk-[0-9]*
+
 WRKSRC=                        ${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes

Index: pkgsrc/x11/fltk13/buildlink3.mk
diff -u pkgsrc/x11/fltk13/buildlink3.mk:1.20 pkgsrc/x11/fltk13/buildlink3.mk:1.21
--- pkgsrc/x11/fltk13/buildlink3.mk:1.20        Mon Jan 27 22:21:34 2025
+++ pkgsrc/x11/fltk13/buildlink3.mk     Fri Mar 14 16:00:40 2025
@@ -1,20 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.20 2025/01/27 22:21:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2025/03/14 16:00:40 micha Exp $
 
-BUILDLINK_TREE+=       fltk
+BUILDLINK_TREE+=       fltk13
 
-.if !defined(FLTK_BUILDLINK3_MK)
-FLTK_BUILDLINK3_MK:=
+.if !defined(FLTK13_BUILDLINK3_MK)
+FLTK13_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fltk+=   fltk>=1.3.0<1.4.0
-BUILDLINK_ABI_DEPENDS.fltk?=   fltk>=1.3.8nb3
-BUILDLINK_PKGSRCDIR.fltk?=     ../../x11/fltk13
-BUILDLINK_FILES.fltk+=         include/Fl/*
+BUILDLINK_API_DEPENDS.fltk13+= fltk13>=1.3.0<1.4.0
+BUILDLINK_ABI_DEPENDS.fltk13?= fltk13>=1.3.8nb3
+BUILDLINK_PKGSRCDIR.fltk13?=   ../../x11/fltk13
+BUILDLINK_FILES.fltk13+=       include/Fl/*
 
-pkgbase := fltk
+pkgbase := fltk13
 .include "../../mk/pkg-build-options.mk"
 
 # For "opengl" option
-.if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
+.if ${PKG_BUILD_OPTIONS.fltk13:Mopengl}
 .  if ${OPSYS} != "Darwin"
 .    include "../../graphics/MesaLib/buildlink3.mk"
 .    include "../../graphics/glu/buildlink3.mk"
@@ -34,6 +34,6 @@ pkgbase := fltk
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.endif # FLTK_BUILDLINK3_MK
+.endif # FLTK13_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -fltk
+BUILDLINK_TREE+=       -fltk13