Simple diff to remove qt4 from dbusmenu.
- Remove and add quirk for dbusmenu-qt (Qt4).
- Set PKGNAME to dbusmenu-qt5
- Set conflict and pkgpath.
- bump all consumers
OK, Comments?
Rafael Sadowski
Index: devel/kf5/knotifications/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/knotifications/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/kf5/knotifications/Makefile 23 Mar 2020 18:01:09 -0000 1.13
+++ devel/kf5/knotifications/Makefile 11 Jul 2020 11:49:19 -0000
@@ -2,6 +2,7 @@
COMMENT = KDE desktop notifications framework
DISTNAME = knotifications-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5Notifications 5.0
@@ -13,7 +14,7 @@ LIB_DEPENDS = audio/libcanberra \
devel/kf5/kconfig>=${MODKF5_VERSION} \
devel/kf5/kcoreaddons>=${MODKF5_VERSION} \
devel/kf5/kwindowsystem>=${MODKF5_VERSION} \
- x11/dbusmenu-qt,qt5 \
+ x11/dbusmenu-qt \
x11/qt5/qtx11extras
PORTHOME = ${WRKDIR}
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.991
diff -u -p -r1.991 Makefile
--- devel/quirks/Makefile 10 Jul 2020 03:34:59 -0000 1.991
+++ devel/quirks/Makefile 11 Jul 2020 11:49:23 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.383
+PKGNAME = quirks-3.384
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1009
diff -u -p -r1.1009 Quirks.pm
--- devel/quirks/files/Quirks.pm 10 Jul 2020 03:35:00 -0000 1.1009
+++ devel/quirks/files/Quirks.pm 11 Jul 2020 11:49:23 -0000
@@ -1760,6 +1760,7 @@ my $obsolete_reason = {
'sisctrl' => 6,
'vteplugin' => 0,
'p5-Net-GPSD' => 5,
+ 'dbusmenu-qt' => 5,
};
# reasons for obsolete packages
Index: x11/dbusmenu-qt/Makefile
===================================================================
RCS file: /cvs/ports/x11/dbusmenu-qt/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- x11/dbusmenu-qt/Makefile 19 Feb 2020 05:58:26 -0000 1.14
+++ x11/dbusmenu-qt/Makefile 11 Jul 2020 11:49:46 -0000
@@ -3,49 +3,30 @@
COMMENT = D-Bus menu implementation for Qt
V = 0.9.3
DISTNAME = libdbusmenu-qt_${V}+16.04.20160218
-PKGNAME = ${PKGSTEM}-${V}
-FULLPKGNAME = ${PKGNAME}
+PKGNAME = dbusmenu-qt5-${V}
CATEGORIES = x11 devel
HOMEPAGE = https://launchpad.net/libdbusmenu-qt/
-MAINTAINER = KDE porting team <[email protected]>
-REVISION = 5
+REVISION = 6
-SHARED_LIBS = dbusmenu-qt 1.0 # 2.7
SHARED_LIBS += dbusmenu-qt5 1.0 # 2.7
# LGPLv2
PERMIT_PACKAGE = Yes
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Widgets
+WANTLIB += m
+
MASTER_SITES = http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/
EXTRACT_SUFX = .orig.tar.gz
-MODULES = devel/cmake
-
-FLAVORS = qt5
-FLAVOR ?=
-
-# XXX run update-plist with qt5 FLAVOR, or it'll go crazy
+MODULES = devel/cmake \
+ x11/qt5
-WANTLIB += ${COMPILER_LIBCXX}
-
-.if ${FLAVOR:Mqt5}
-MODULES += x11/qt5
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Widgets m
CONFIGURE_ARGS= -DUSE_QT4=OFF \
-DUSE_QT5=ON \
+ -DWITH_DOC=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_QJSON=ON
-PKGSTEM = dbusmenu-qt5
-.else
-MODULES += x11/qt4
-COMPILER = base-clang ports-gcc
-WANTLIB += QtDBus QtGui m
-CONFIGURE_ARGS= -DUSE_QT4=Yes -DUSE_QT5=No
-PKGSTEM = dbusmenu-qt
-BUILD_DEPENDS = devel/qjson
-TEST_DEPENDS = devel/qjson
-.endif
-CONFIGURE_ARGS += -DWITH_DOC=OFF
# XXX "!icon.isNull()" failed tests are normal, they do mean that
# mentioned icon is not installed; e.g., these are the test bugs.
@@ -53,7 +34,5 @@ TEST_TARGET = check
TEST_IS_INTERACTIVE = X11
WRKDIST = ${WRKDIR}/${DISTNAME:C/_/-/}
-
-SUBST_VARS = PKGSTEM
.include <bsd.port.mk>
Index: x11/dbusmenu-qt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dbusmenu-qt/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- x11/dbusmenu-qt/pkg/PLIST 19 Dec 2016 11:55:56 -0000 1.5
+++ x11/dbusmenu-qt/pkg/PLIST 11 Jul 2020 11:49:46 -0000
@@ -1,13 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2016/12/19 11:55:56 zhuk Exp $
-include/${PKGSTEM}/
-include/${PKGSTEM}/dbusmenu_export.h
-include/${PKGSTEM}/dbusmenu_version.h
-include/${PKGSTEM}/dbusmenuexporter.h
-include/${PKGSTEM}/dbusmenuimporter.h
-lib/cmake/${PKGSTEM}/
-lib/cmake/${PKGSTEM}/${PKGSTEM}-config-version.cmake
-lib/cmake/${PKGSTEM}/${PKGSTEM}-config.cmake
-lib/cmake/${PKGSTEM}/${PKGSTEM}-targets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/${PKGSTEM}/${PKGSTEM}-targets.cmake
-@lib lib/lib${PKGSTEM}.so.${LIB${PKGSTEM}_VERSION}
-lib/pkgconfig/${PKGSTEM}.pc
+@conflict dbusmenu-qt-*
+@pkgpath x11/dbusmenu-qt,qt5
+include/dbusmenu-qt5/
+include/dbusmenu-qt5/dbusmenu_export.h
+include/dbusmenu-qt5/dbusmenu_version.h
+include/dbusmenu-qt5/dbusmenuexporter.h
+include/dbusmenu-qt5/dbusmenuimporter.h
+lib/cmake/
+lib/cmake/dbusmenu-qt5/
+lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config-version.cmake
+lib/cmake/dbusmenu-qt5/dbusmenu-qt5-config.cmake
+lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/dbusmenu-qt5/dbusmenu-qt5-targets.cmake
+@lib lib/libdbusmenu-qt5.so.${LIBdbusmenu-qt5_VERSION}
+lib/pkgconfig/dbusmenu-qt5.pc
Index: x11/lxqt/panel/Makefile
===================================================================
RCS file: /cvs/ports/x11/lxqt/panel/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- x11/lxqt/panel/Makefile 5 May 2019 17:09:07 -0000 1.3
+++ x11/lxqt/panel/Makefile 11 Jul 2020 11:49:49 -0000
@@ -6,7 +6,7 @@ VERSION = 0.13.0
NAME = lxqt-panel
DISTNAME = ${NAME}-${VERSION}
-REVISION = 1
+REVISION = 2
WANTLIB += ${COMPILER_LIBCXX} ICE KF5Solid KF5WindowSystem Qt5Core
WANTLIB += Qt5DBus Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras Qt5Xdg
@@ -20,7 +20,7 @@ LIB_DEPENDS += x11/lxqt/liblxqt \
x11/lxqt/libsysstat \
sysutils/libstatgrab \
devel/kf5/solid \
- x11/dbusmenu-qt,qt5
+ x11/dbusmenu-qt
BUILD_DEPENDS += x11/lxqt/build-tools
Index: x11/lxqt/qtplugin/Makefile
===================================================================
RCS file: /cvs/ports/x11/lxqt/qtplugin/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- x11/lxqt/qtplugin/Makefile 5 May 2019 17:09:08 -0000 1.3
+++ x11/lxqt/qtplugin/Makefile 11 Jul 2020 11:49:49 -0000
@@ -6,7 +6,7 @@ VERSION = 0.13.0
NAME = lxqt-qtplugin
DISTNAME = ${NAME}-${VERSION}
-REVISION = 1
+REVISION = 2
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Svg Qt5Widgets
WANTLIB += Qt5X11Extras Qt5XdgIconLoader dbusmenu-qt5 exif fm
@@ -16,7 +16,7 @@ WANTLIB += m menu-cache xcb
LIB_DEPENDS += x11/qt5/qtx11extras \
x11/lxqt/libqtxdg \
x11/lxqt/libfm-qt \
- x11/dbusmenu-qt,qt5
+ x11/dbusmenu-qt
BUILD_DEPENDS += x11/lxqt/build-tools
