Page MenuHomeFreeBSD
Files F132993742

D14643.id40139.diff
No OneTemporary
Actions

D14643.id40139.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10194,3 +10194,4 @@
www/yii||2018-03-08|Has expired: Unmaintained, all www files wrongly belongs to www user
www/phpmp||2018-03-08|Has expired: Unmaintained, all www files wrongly belongs to www user
www/lionwiki||2018-03-08|Has expired: Unmaintained, all www files wrongly belongs to www user
+devel/libdbusmenu-qt5|devel/libdbusmenu-qt@qt5|2018-03-10|Moved to a flavoured version
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1341,7 +1341,6 @@
SUBDIR += libdatrie
SUBDIR += libdbusmenu
SUBDIR += libdbusmenu-qt
- SUBDIR += libdbusmenu-qt5
SUBDIR += libddoc
SUBDIR += libdevq
SUBDIR += libdfui
Index: devel/kf5-knotifications/Makefile
===================================================================
--- devel/kf5-knotifications/Makefile
+++ devel/kf5-knotifications/Makefile
@@ -2,12 +2,13 @@
PORTNAME= knotifications
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 abstraction for system notifications
-LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt5
+LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5
USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
USE_KDE= codecs config coreaddons ecm windowsystem
Index: devel/libdbusmenu-qt/Makefile
===================================================================
--- devel/libdbusmenu-qt/Makefile
+++ devel/libdbusmenu-qt/Makefile
@@ -3,9 +3,10 @@
PORTNAME= libdbusmenu-qt
PORTVERSION= ${MAJOR_VER}.${SNAPSHOT_VER:S/.//g}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://archive.ubuntu.com/ubuntu/pool/main/libd/${PORTNAME}/
+PKGNAMESUFFIX= ${FLAVOR:C/qt//}
DISTNAME= ${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig
MAINTAINER= kde@FreeBSD.org
@@ -13,35 +14,41 @@
LICENSE= LGPL20
-MAJOR_VER= 0.9.3
-SNAPSHOT_VER= 16.04.20160218
+FLAVORS= qt4 qt5
+FLAVOR?= ${FLAVORS:[1]}
-WRKSRC= ${WRKDIR}/${PORTNAME}-${MAJOR_VER}+${SNAPSHOT_VER}
+. if ${FLAVOR} == qt4
+USE_QT4= corelib dbus gui \
+ moc_build qmake_build rcc_build uic_build
+CMAKE_ON= USE_QT4
+CMAKE_OFF= USE_QT5
+QTVER_SUFFIX= # empty
+. else
+USE_QT5= core dbus gui widgets \
+ buildtools_build qmake_build
+CMAKE_ON= USE_QT5
+CMAKE_OFF= USE_QT4
+QTVER_SUFFIX= 5
+. endif
-.if empty(PKGNAMESUFFIX)
-USE_QT4= corelib dbus gui moc_build qmake_build rcc_build uic_build
-CMAKE_ARGS= -DUSE_QT4:BOOL=TRUE -DUSE_QT5:BOOL=FALSE
-.else
-USE_QT5= buildtools_build core dbus gui qmake_build widgets
-CMAKE_ARGS= -DUSE_QT4:BOOL=FALSE -DUSE_QT5:BOOL=TRUE
-.endif
-
USES= compiler:c++11-lib cmake:outsource
-
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOXYGEN
OPTIONS_SUB= YES
DOXYGEN_DESC= Build documentation (requires doxygen)
-DOXYGEN_CMAKE_ON= -DWITH_DOC:BOOL=TRUE
-DOXYGEN_CMAKE_OFF= -DWITH_DOC:BOOL=FALSE
+DOXYGEN_CMAKE_BOOL= WITH_DOC
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
-.if defined(PACKAGE_BUILDING)
+. if defined(PACKAGE_BUILDING)
OPTIONS_DEFAULT+= DOXYGEN
-.endif
+. endif
-PLIST_SUB= QTVER_SUFFIX="${PKGNAMESUFFIX}"
+MAJOR_VER= 0.9.3
+SNAPSHOT_VER= 16.04.20160218
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${MAJOR_VER}+${SNAPSHOT_VER}
+PLIST_SUB= QTVER_SUFFIX="${QTVER_SUFFIX}"
post-patch:
@${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \
Index: devel/libdbusmenu-qt5/Makefile
===================================================================
--- devel/libdbusmenu-qt5/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Tobias Berner <tcberner@gmail.com>
-# $FreeBSD$
-
-PORTNAME= libdbusmenu-qt
-PORTREVISION= 0
-PKGNAMESUFFIX= 5
-
-COMMENT= Qt5 implementation of the DBusMenu protocol
-
-MASTERDIR= ${.CURDIR:H}/libdbusmenu-qt
-
-.include "${MASTERDIR}/Makefile"
Index: irc/quassel/Makefile
===================================================================
--- irc/quassel/Makefile
+++ irc/quassel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= quassel
PORTVERSION= 0.12.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= irc
MASTER_SITES= http://www.quassel-irc.org/pub/
@@ -34,7 +34,7 @@
CLIENT_DESC= Quassel client (for use with core)
CLIENT_CMAKE_BOOL= WANT_QTCLIENT
CLIENT_USE= qt5=dbus,gui,phonon4,webkit,widgets
-CLIENT_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt5
+CLIENT_LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5
CORE_DESC= Quassel core server (for use with client)
CORE_CMAKE_BOOL= WANT_CORE
Index: x11/kde-workspace-kde4/Makefile
===================================================================
--- x11/kde-workspace-kde4/Makefile
+++ x11/kde-workspace-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -18,7 +18,7 @@
libqalculate.so:math/libqalculate \
libprison.so:graphics/prison \
libboost_thread.so:devel/boost-libs \
- libdbusmenu-qt.so:devel/libdbusmenu-qt \
+ libdbusmenu-qt.so:devel/libdbusmenu-qt@qt4 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
Index: x11/kdelibs-kde4/Makefile
===================================================================
--- x11/kdelibs-kde4/Makefile
+++ x11/kdelibs-kde4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -18,7 +19,7 @@
libhal.so:sysutils/hal \
libqca.so:devel/qca \
libpolkit-qt-core-1.so:sysutils/polkit-qt \
- libdbusmenu-qt.so:devel/libdbusmenu-qt \
+ libdbusmenu-qt.so:devel/libdbusmenu-qt@qt4 \
libstreams.so:deskutils/libstreams
BUILD_DEPENDS= docbook-xml>0:textproc/docbook-xml \

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 22, 9:52 PM (20 m, 45 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24069380
Default Alt Text
D14643.id40139.diff (5 KB)

Event Timeline