pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/fltk11: Do not use namespaces of x11/fltk



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Mar 14 18:05:41 2025 +0100
Changeset:	05f48e803de2e42161cfcdc5df6f5844c937f533

Modified Files:
	fltk11/Makefile
	fltk11/buildlink3.mk

Log Message:
wip/fltk11: 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

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=05f48e803de2e42161cfcdc5df6f5844c937f533

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

diffstat:
 fltk11/Makefile      |  7 +++++--
 fltk11/buildlink3.mk | 18 +++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diffs:
diff --git a/fltk11/Makefile b/fltk11/Makefile
index fe1ade91af..c7b3083f92 100644
--- a/fltk11/Makefile
+++ b/fltk11/Makefile
@@ -1,14 +1,17 @@
 # $NetBSD$
 
 DISTNAME=	fltk-1.1.10-source
-PKGNAME=	${DISTNAME:S/-source//}
+PKGNAME=	${DISTNAME:S/-source//:S/fltk/fltk11/}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/
 MASTER_SITES+=	ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
 EXTRACT_SUFX=	.tar.bz2
 
+SUPERSEDES+=	fltk<1.3.0
+CONFLICTS+=	fltk-[0-9]*
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces (old 1.1 branch)
diff --git a/fltk11/buildlink3.mk b/fltk11/buildlink3.mk
index a26b4283df..27bb006fb3 100644
--- a/fltk11/buildlink3.mk
+++ b/fltk11/buildlink3.mk
@@ -1,14 +1,14 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	fltk
+BUILDLINK_TREE+=	fltk11
 
-.if !defined(FLTK_BUILDLINK3_MK)
-FLTK_BUILDLINK3_MK:=
+.if !defined(FLTK11_BUILDLINK3_MK)
+FLTK11_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1<1.3
-BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.1.10nb7<1.3
-BUILDLINK_PKGSRCDIR.fltk?=	../../wip/fltk11
-BUILDLINK_FILES.fltk+=		include/Fl/*
+BUILDLINK_API_DEPENDS.fltk11+=	fltk11>=1.1.5rc1<1.3
+BUILDLINK_ABI_DEPENDS.fltk11?=	fltk11>=1.1.10nb7<1.3
+BUILDLINK_PKGSRCDIR.fltk11?=	../../wip/fltk11
+BUILDLINK_FILES.fltk11+=	include/Fl/*
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
@@ -16,6 +16,6 @@ BUILDLINK_FILES.fltk+=		include/Fl/*
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.endif # FLTK_BUILDLINK3_MK
+.endif # FLTK11_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-fltk
+BUILDLINK_TREE+=	-fltk11


Home | Main Index | Thread Index | Old Index