pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

FLTK 1.4 transition: Switch development and test packages to x11/fltk

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 31 13:39:35 2025 +0100
Changeset:	1ebc002f92aec8cd0c238d35c8be243d6b97f3f4

Modified Files:
	dillo-devel/Makefile
	dillo-devel/README
	ede21/Makefile
	edelib21/Makefile
	eureka-devel/options.mk
	fl_logbook/Makefile
	fldiff/Makefile
	flnews-devel/Makefile
	flpsed/Makefile
	flwm/Makefile
	htmldoc-x11/Makefile
	pinentry-fltk/Makefile
	spiralloops/Makefile
	spiralsynth/Makefile
	tigervnc/Makefile
	tuxpaint-config/Makefile
	xpp/Makefile
	zynaddsubfx/Makefile

Log Message:
FLTK 1.4 transition: Switch development and test packages to x11/fltk

Package x11/fltk now provides FLTK 1.4.

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

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

diffstat:
 dillo-devel/Makefile     | 2 +-
 dillo-devel/README       | 2 +-
 ede21/Makefile           | 2 +-
 edelib21/Makefile        | 2 +-
 eureka-devel/options.mk  | 6 +++---
 fl_logbook/Makefile      | 2 +-
 fldiff/Makefile          | 2 +-
 flnews-devel/Makefile    | 2 +-
 flpsed/Makefile          | 2 +-
 flwm/Makefile            | 2 +-
 htmldoc-x11/Makefile     | 2 +-
 pinentry-fltk/Makefile   | 2 +-
 spiralloops/Makefile     | 2 +-
 spiralsynth/Makefile     | 2 +-
 tigervnc/Makefile        | 2 +-
 tuxpaint-config/Makefile | 2 +-
 xpp/Makefile             | 2 +-
 zynaddsubfx/Makefile     | 2 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

diffs:
diff --git a/dillo-devel/Makefile b/dillo-devel/Makefile
index 909672861a..61d499bc37 100644
--- a/dillo-devel/Makefile
+++ b/dillo-devel/Makefile
@@ -48,6 +48,6 @@ pre-configure:
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/dillo-devel/README b/dillo-devel/README
index dbe1e0ba68..cff5915511 100644
--- a/dillo-devel/README
+++ b/dillo-devel/README
@@ -1,4 +1,4 @@
-This package is patched to use wip/fltk14-devel.
+This package is patched to use FLTK 1.4.
 
 If FLTK 1.4 is compiled with the pango option, glyph substitution is supported
 on X11 platform.
diff --git a/ede21/Makefile b/ede21/Makefile
index 0efb3cff10..3c05944379 100644
--- a/ede21/Makefile
+++ b/ede21/Makefile
@@ -30,7 +30,7 @@ do-install:
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../wip/edelib/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 
diff --git a/edelib21/Makefile b/edelib21/Makefile
index ee14c5262c..5fc8322bd4 100644
--- a/edelib21/Makefile
+++ b/edelib21/Makefile
@@ -51,6 +51,6 @@ do-install:
 
 .include "../../lang/python/application.mk"
 .include "../../mk/fam.buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
index c2ae2029e5..f0df3f1d64 100644
--- a/eureka-devel/options.mk
+++ b/eureka-devel/options.mk
@@ -6,10 +6,10 @@ PKG_SUGGESTED_OPTIONS=	opengl xdg-utils
 
 .include "../../mk/bsd.options.mk"
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 # Add missing include path for FLTK (eureka does not use fltk-config)
-.if empty(PKG_OPTIONS.fltk14-devel:Mcairo)
+.if empty(PKG_OPTIONS.fltk:Mcairo)
 CXXFLAGS=	-I"${PREFIX}/include/cairo"
 .endif
 
@@ -17,7 +17,7 @@ CXXFLAGS=	-I"${PREFIX}/include/cairo"
 # If FLTK is compiled without opengl option, it is always disabled here too.
 # If FLTK is compiled with opengl option, disabling it here allows to force
 # usage of the software renderer (recommended without hardware acceleration).
-.if empty(PKG_OPTIONS.fltk14-devel:Mopengl) || empty(PKG_OPTIONS:Mopengl)
+.if empty(PKG_OPTIONS.fltk:Mopengl) || empty(PKG_OPTIONS:Mopengl)
 CMAKE_CONFIGURE_ARGS+=	-DENABLE_OPENGL=off
 .endif
 # xdg-utils: Create dependency for xdg-utils (Portland project)
diff --git a/fl_logbook/Makefile b/fl_logbook/Makefile
index 990c3c3bb7..c3cefb2a73 100644
--- a/fl_logbook/Makefile
+++ b/fl_logbook/Makefile
@@ -20,6 +20,6 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fl_logbook ${DESTDIR}${PREFIX}/bin
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../..x11/fltk/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fldiff/Makefile b/fldiff/Makefile
index 0ecb1e8d9f..208e42bf80 100644
--- a/fldiff/Makefile
+++ b/fldiff/Makefile
@@ -18,5 +18,5 @@ MAKE_FLAGS+=	BUILDROOT=${DESTDIR:Q}
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/flnews-devel/Makefile b/flnews-devel/Makefile
index 2dedea6c97..ee2ab81bbd 100644
--- a/flnews-devel/Makefile
+++ b/flnews-devel/Makefile
@@ -87,6 +87,6 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 # FLTK must be compiled with multithreading support
 # FLTK version 1.4 is supported (should be compiled with pango support)
 #.include "../../x11/fltk13/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/flpsed/Makefile b/flpsed/Makefile
index 6aa0b208bc..92c2fac411 100644
--- a/flpsed/Makefile
+++ b/flpsed/Makefile
@@ -20,7 +20,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/flpsed
 
 # FLTK version 1.4 is supported too
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/flwm/Makefile b/flwm/Makefile
index b5897710b5..8e2b080afc 100644
--- a/flwm/Makefile
+++ b/flwm/Makefile
@@ -18,5 +18,5 @@ GNU_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/htmldoc-x11/Makefile b/htmldoc-x11/Makefile
index e1b1ca806f..f0bdc0562b 100644
--- a/htmldoc-x11/Makefile
+++ b/htmldoc-x11/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	htmldoc-x11-${VERSION}
 
 CONFIGURE_ARGS+=	--with-gui
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../wip/htmldoc/Makefile.common"
 
diff --git a/pinentry-fltk/Makefile b/pinentry-fltk/Makefile
index e04637062a..c6b3e75db6 100644
--- a/pinentry-fltk/Makefile
+++ b/pinentry-fltk/Makefile
@@ -27,5 +27,5 @@ USE_TOOLS+=	aztoconf automake autoreconf
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -fi
 
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/spiralloops/Makefile b/spiralloops/Makefile
index 5ac648f6e5..a414121e82 100644
--- a/spiralloops/Makefile
+++ b/spiralloops/Makefile
@@ -31,6 +31,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/oss.buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/spiralsynth/Makefile b/spiralsynth/Makefile
index 61ff5d83f5..05648eec9e 100644
--- a/spiralsynth/Makefile
+++ b/spiralsynth/Makefile
@@ -30,6 +30,6 @@ do-install:
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
index 93c328cf02..00582f1016 100644
--- a/tigervnc/Makefile
+++ b/tigervnc/Makefile
@@ -141,7 +141,7 @@ pre-configure:
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
diff --git a/tuxpaint-config/Makefile b/tuxpaint-config/Makefile
index 77b753e40d..c71bf6b23e 100644
--- a/tuxpaint-config/Makefile
+++ b/tuxpaint-config/Makefile
@@ -23,7 +23,7 @@ INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../textproc/libunibreak/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 
diff --git a/xpp/Makefile b/xpp/Makefile
index 3bcc471a9a..72d34a5f81 100644
--- a/xpp/Makefile
+++ b/xpp/Makefile
@@ -28,6 +28,6 @@ post-install:
 
 .include "../../print/cups-base/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/zynaddsubfx/Makefile b/zynaddsubfx/Makefile
index ca4aeee8cd..ed3f4bb5a0 100644
--- a/zynaddsubfx/Makefile
+++ b/zynaddsubfx/Makefile
@@ -51,7 +51,7 @@ post-install:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../textproc/mxml/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Home | Main Index | Thread Index | Old Index