CVS commit: pkgsrc/x11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 21:48:47 UTC 2025

Modified Files:
        pkgsrc/x11/qt4-libs: Makefile
        pkgsrc/x11/qt4-tools: Makefile PLIST
        pkgsrc/x11/qt5-qtbase: Makefile
        pkgsrc/x11/qt6-qtbase: Makefile

Log Message:
*: remove Interix support


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/qt4-tools/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/qt4-tools/PLIST
cvs rdiff -u -r1.156 -r1.157 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/qt6-qtbase/Makefile

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

Modified files:

Index: pkgsrc/x11/qt4-libs/Makefile
diff -u pkgsrc/x11/qt4-libs/Makefile:1.163 pkgsrc/x11/qt4-libs/Makefile:1.164
--- pkgsrc/x11/qt4-libs/Makefile:1.163  Sat Apr 19 07:58:37 2025
+++ pkgsrc/x11/qt4-libs/Makefile        Mon Apr 21 21:48:46 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.163 2025/04/19 07:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.164 2025/04/21 21:48:46 wiz Exp $
 
 PKGNAME=       qt4-libs-${QTVERSION}
-PKGREVISION=   49
+PKGREVISION=   50
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"

Index: pkgsrc/x11/qt4-tools/Makefile
diff -u pkgsrc/x11/qt4-tools/Makefile:1.79 pkgsrc/x11/qt4-tools/Makefile:1.80
--- pkgsrc/x11/qt4-tools/Makefile:1.79  Sun Nov 12 13:24:23 2023
+++ pkgsrc/x11/qt4-tools/Makefile       Mon Apr 21 21:48:47 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2023/11/12 13:24:23 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2025/04/21 21:48:47 wiz Exp $
 
-PKGREVISION= 12
+PKGREVISION= 13
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-tools-${QTVERSION}

Index: pkgsrc/x11/qt4-tools/PLIST
diff -u pkgsrc/x11/qt4-tools/PLIST:1.37 pkgsrc/x11/qt4-tools/PLIST:1.38
--- pkgsrc/x11/qt4-tools/PLIST:1.37     Wed Mar 18 21:55:23 2020
+++ pkgsrc/x11/qt4-tools/PLIST  Mon Apr 21 21:48:47 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2020/03/18 21:55:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.38 2025/04/21 21:48:47 wiz Exp $
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
 lib/pkgconfig/QtDesignerComponents.pc
@@ -371,8 +371,6 @@ qt4/mkspecs/hpuxi-g++-64/qmake.conf
 qt4/mkspecs/hpuxi-g++-64/qplatformdefs.h
 qt4/mkspecs/hurd-g++/qmake.conf
 qt4/mkspecs/hurd-g++/qplatformdefs.h
-qt4/mkspecs/interix-g++/qmake.conf
-qt4/mkspecs/interix-g++/qplatformdefs.h
 qt4/mkspecs/irix-cc-64/qmake.conf
 qt4/mkspecs/irix-cc-64/qplatformdefs.h
 qt4/mkspecs/irix-cc/qmake.conf

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.156 pkgsrc/x11/qt5-qtbase/Makefile:1.157
--- pkgsrc/x11/qt5-qtbase/Makefile:1.156        Sat Apr 19 07:58:37 2025
+++ pkgsrc/x11/qt5-qtbase/Makefile      Mon Apr 21 21:48:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2025/04/19 07:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.157 2025/04/21 21:48:47 wiz Exp $
 
 DISTNAME=      qtbase-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -95,12 +95,6 @@ CONFIGURE_ARGS+=             -platform solaris-cc
 .    endif
 .  endif
 NETWORK_LIBS=                  -lsocket -lnsl
-.elif ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=               -platform interix-g++
-CFLAGS+=                       -I/usr/local/include/bind
-LDFLAGS+=                      -L/usr/local/lib/bind -lbind
-BUILDLINK_PASSTHRU_DIRS+=      /usr/local/include/bind /usr/local/lib/bind
-SYS_LIBS=                      -lbind -ldb -ldl
 .elif ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=               -platform freebsd-g++
 LDFLAGS+=                      -lexecinfo

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.47 pkgsrc/x11/qt6-qtbase/Makefile:1.48
--- pkgsrc/x11/qt6-qtbase/Makefile:1.47 Sat Apr 19 07:58:37 2025
+++ pkgsrc/x11/qt6-qtbase/Makefile      Mon Apr 21 21:48:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2025/04/19 07:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/04/21 21:48:47 wiz Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -69,13 +69,7 @@ PLIST_VARS+= egl egldevice x11
 
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=               -platform interix-g++
-CFLAGS+=                       -I/usr/local/include/bind
-LDFLAGS+=                      -L/usr/local/lib/bind -lbind
-BUILDLINK_PASSTHRU_DIRS+=      /usr/local/include/bind /usr/local/lib/bind
-SYS_LIBS=                      -lbind -ldb -ldl
-.elif ${OPSYS} == "DragonFly"
+.if ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=               -platform freebsd-g++
 LDFLAGS+=                      -lexecinfo
 .elif ${OPSYS} == "Darwin"