On 2024/04/22 16:47, Rafael Sadowski wrote:
> On Sat Apr 20, 2024 at 11:17:47AM GMT, Stuart Henderson wrote:
> > On 2024/04/20 02:07, Kirill A. Korinsky wrote:
> > > ports@,
> > > 
> > > Let assume that I have a system without x11/qt5, and to install it I do
> > > something like this:
> > > 
> > >   ~ $ ls /usr/local/lib/qt5           
> > >   ls: /usr/local/lib/qt5: No such file or directory
> > >   ~ $ doas pkg_add -a py3-qt5         
> > >   quirks-7.18 signed on 2024-04-18T15:06:29Z
> > >   py3-qt5-5.15.9p1:py3-ply-3.11p6: ok
> > >   py3-qt5-5.15.9p1:pcaudiolib-1.2: ok
> > >   py3-qt5-5.15.9p1:espeak-1.51p2: ok
> > >   py3-qt5-5.15.9p1:libao-1.2.0p2: ok
> > >   py3-qt5-5.15.9p1:dotconf-1.3p0: ok
> > >   py3-qt5-5.15.9p1:py3-xdg-0.28p2: ok
> > >   py3-qt5-5.15.9p1:speech-dispatcher-0.11.5: ok
> > >   py3-qt5-5.15.9p1:qtbase-5.15.12pl151p0: ok
> > >   py3-qt5-5.15.9p1:libsigc++-2.12.1: ok
> > >   py3-qt5-5.15.9p1:glib2mm-2.66.7: ok
> > >   py3-qt5-5.15.9p1:gstreamer1mm-1.10.0p9: ok
> > >   py3-qt5-5.15.9p1:qtdeclarative-5.15.12pl31: ok
> > >   py3-qt5-5.15.9p1:qtmultimedia-5.15.12pl2: ok
> > >   py3-qt5-5.15.9p1:qtspeech-5.15.12pl1: ok
> > >   py3-qt5-5.15.9p1:hyphen-2.8.8p0: ok
> > >   py3-qt5-5.15.9p1:qtwebsockets-5.15.12pl2: ok
> > >   py3-qt5-5.15.9p1:qtwebchannel-5.15.12pl3: ok
> > >   py3-qt5-5.15.9p1:qtserialport-5.15.12: ok
> > >   py3-qt5-5.15.9p1:qtlocation-5.15.12pl6: ok
> > >   py3-qt5-5.15.9p1:qtsensors-5.15.12: ok
> > >   py3-qt5-5.15.9p1:libnotify-0.8.3: ok
> > >   py3-qt5-5.15.9p1:avahi-glib-0.8p2: ok
> > >   py3-qt5-5.15.9p1:glib2-networking-2.80.0: ok
> > >   py3-qt5-5.15.9p1:libpsl-0.21.1: ok
> > >   py3-qt5-5.15.9p1:libsoup3-3.4.4: ok
> > >   py3-qt5-5.15.9p1:geoclue2-2.7.1p0: ok
> > >   py3-qt5-5.15.9p1:qtwebkit-5.212.0alpha4p9v0: ok
> > >   py3-qt5-5.15.9p1:qtx11extras-5.15.12: ok
> > >   py3-qt5-5.15.9p1:qtxmlpatterns-5.15.12: ok
> > >   py3-qt5-5.15.9p1:py3-sip-6.7.11p0v0: ok
> > >   py3-qt5-5.15.9p1:py3-pyqt5_sip-12.12.2: ok
> > >   py3-qt5-5.15.9p1:qtconnectivity-5.15.12pl6: ok
> > >   py3-qt5-5.15.9p1:qtsvg-5.15.12pl6: ok
> > >   py3-qt5-5.15.9p1:llvm-16.0.6p24: ok
> > >   py3-qt5-5.15.9p1:qttools-5.15.12pl4: ok
> > >   py3-qt5-5.15.9p1:qtremoteobjects-5.15.12: ok
> > >   py3-qt5-5.15.9p1: ok
> > >   Running tags: ok
> > >   New and changed readme(s):
> > >           /usr/local/share/doc/pkg-readmes/llvm-16
> > >   ~ $
> > > 
> > > now, let remove it:
> > > 
> > >   ~ $ doas pkg_delete -a      
> > >   lcms2-2.16p0:py3-qt5-5.15.9p1: ok
> > >   lcms2-2.16p0:qtspeech-5.15.12pl1: ok
> > >   lcms2-2.16p0:qtmultimedia-5.15.12pl2: ok
> > >   lame-3.100p2:speech-dispatcher-0.11.5: ok
> > >   lame-3.100p2:espeak-1.51p2: ok
> > >   lame-3.100p2:pcaudiolib-1.2: ok
> > >   gsettings-desktop-schemas-46.0:qtwebkit-5.212.0alpha4p9v0: ok
> > >   gsettings-desktop-schemas-46.0:geoclue2-2.7.1p0: ok
> > >   gsettings-desktop-schemas-46.0:libsoup3-3.4.4: ok
> > >   gsettings-desktop-schemas-46.0:glib2-networking-2.80.0: ok
> > >   py3-pyqt5_sip-12.12.2: ok
> > >   qtx11extras-5.15.12: ok
> > >   qtwebchannel-5.15.12pl3: ok
> > >   avahi-glib-0.8p2: ok
> > >   libpsl-0.21.1: ok
> > >   qtbase-5.15.12pl151p0:qtsensors-5.15.12: ok
> > >   qtbase-5.15.12pl151p0:qtlocation-5.15.12pl6: ok
> > >   qtbase-5.15.12pl151p0:qtserialport-5.15.12: ok
> > >   qtbase-5.15.12pl151p0:qtwebsockets-5.15.12pl2: ok
> > >   qtbase-5.15.12pl151p0:qttools-5.15.12pl4: ok
> > >   qtbase-5.15.12pl151p0:qtxmlpatterns-5.15.12: ok
> > >   qtbase-5.15.12pl151p0:qtconnectivity-5.15.12pl6: ok
> > >   qtbase-5.15.12pl151p0:qtremoteobjects-5.15.12: ok
> > >   qtbase-5.15.12pl151p0:qtdeclarative-5.15.12pl31: ok
> > >   qtbase-5.15.12pl151p0:qtsvg-5.15.12pl6: ok
> > >   qtbase-5.15.12pl151p0: ok
> > >   glib2mm-2.66.7:gstreamer1mm-1.10.0p9: ok
> > >   glib2mm-2.66.7: ok
> > >   py3-ply-3.11p6:py3-sip-6.7.11p0v0: ok
> > >   py3-ply-3.11p6: ok
> > >   libsigc++-2.12.1: ok
> > >   libao-1.2.0p2: ok
> > >   dotconf-1.3p0: ok
> > >   llvm-16.0.6p24: ok
> > >   hyphen-2.8.8p0: ok
> > >   libnotify-0.8.3: ok
> > >   py3-xdg-0.28p2: ok
> > >   Running tags: ok
> > >   Read shared items: ok
> > >   --- -geoclue2-2.7.1p0 -------------------
> > >   You should also run /usr/sbin/userdel _geoclue
> > >   You should also run /usr/sbin/groupdel _geoclue
> > >   --- -py3-xdg-0.28p2 -------------------
> > >   Error deleting directory /usr/local/lib/qt5/examples: Directory not 
> > > empty
> > >   Error deleting directory /usr/local/lib/qt5: Directory not empty
> > >   ~ $
> > > 
> > > as you see, it left /usr/local/lib/qt5:
> > > 
> > >   ~ $ find /usr/local/lib/qt5
> > >   /usr/local/lib/qt5
> > >   /usr/local/lib/qt5/examples
> > >   /usr/local/lib/qt5/examples/bluetooth
> > >   /usr/local/lib/qt5/examples/bluetooth/btscanner
> > >   /usr/local/lib/qt5/examples/bluetooth/heartrate-game
> > >   /usr/local/lib/qt5/examples/bluetooth/heartrate-server
> > >   /usr/local/lib/qt5/examples/bluetooth/lowenergyscanner
> > >   /usr/local/lib/qt5/examples/remoteobjects
> > >   /usr/local/lib/qt5/examples/remoteobjects/ssl
> > >   /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver
> > >   /usr/local/lib/qt5/examples/remoteobjects/ssl/sslserver/cert
> > >   /usr/local/lib/qt5/examples/remoteobjects/websockets
> > >   /usr/local/lib/qt5/examples/remoteobjects/websockets/common
> > >   /usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert
> > >   ~ $ 
> > > 
> > > -- 
> > > wbr, Kirill
> > > 
> > 
> > Some files are in PLISTs which don't include the parent directory, for
> > example the readme here is in ,-main but the dir is in ,-examples.
> > 
> > qtremoteobjects-5.15.12:x11/qt5/qtremoteobjects,-main:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/readme
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/cert.qrc
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/client.crt
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/client.key
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/rootCA.key
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/rootCA.pem
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/rootCA.srl
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/server.crt
> > qtremoteobjects-examples-5.15.12:x11/qt5/qtremoteobjects,-examples:/usr/local/lib/qt5/examples/remoteobjects/websockets/common/cert/server.key
> > 
> > In this case the readme should probably move to the examples subpackage
> > with the appropriate @conflict adding.
> > 
> 
> Here is a fix for all x11/qt5 ports...
> 
> 
> diff --git a/x11/qt5/qt3d/Makefile b/x11/qt5/qt3d/Makefile
> index 2e2b38c9571..77a86aa4b07 100644
> --- a/x11/qt5/qt3d/Makefile
> +++ b/x11/qt5/qt3d/Makefile
> @@ -1,5 +1,6 @@
>  QT5NAME =            Qt3D
>  COMMENT-main =               Qt5 components for 3D graphics
> +REVISION-main =              0
>  
>  MULTI_PACKAGES =     -main -examples
>  
> diff --git a/x11/qt5/qt3d/pkg/PLIST-main b/x11/qt5/qt3d/pkg/PLIST-main
> index 9d04f2a3ee0..01f23117863 100644
> --- a/x11/qt5/qt3d/pkg/PLIST-main
> +++ b/x11/qt5/qt3d/pkg/PLIST-main
> @@ -1278,7 +1278,6 @@ 
> lib/qt5/cmake/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
>  lib/qt5/cmake/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
>  lib/qt5/cmake/Qt53DRender/Qt53DRender_OpenGLRendererPlugin.cmake
>  lib/qt5/cmake/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
> -lib/qt5/examples/
>  lib/qt5/libQt53DAnimation.la
>  lib/qt5/libQt53DAnimation.prl
>  @lib lib/qt5/libQt53DAnimation.so.${LIBQt53DAnimation_VERSION}

That lib/qt5/examples/ needs adding to PLIST-examples. Same with
qtwebchannel I think. (No need for @conflict in this case where only
the directory moves).

> diff --git a/x11/qt5/qtconnectivity/Makefile b/x11/qt5/qtconnectivity/Makefile
> index d23703bf206..13d28dfc113 100644
> --- a/x11/qt5/qtconnectivity/Makefile
> +++ b/x11/qt5/qtconnectivity/Makefile
> @@ -3,6 +3,7 @@ COMMENT-main =        Bluetooth and NFC support for Qt5
>  
>  KDE_COMMIT =         70020cb64f71dcf2fd65a8a167cb785d2127e159
>  KDE_VERSION =                6
> +REVISION=            0
>  
>  SHARED_LIBS +=  Qt5Bluetooth          3.0 # 5.9
>  SHARED_LIBS +=  Qt5Nfc                3.0 # 5.9
> diff --git a/x11/qt5/qtconnectivity/pkg/PLIST-examples 
> b/x11/qt5/qtconnectivity/pkg/PLIST-examples
> index 7aba7070e71..244027f2998 100644
> --- a/x11/qt5/qtconnectivity/pkg/PLIST-examples
> +++ b/x11/qt5/qtconnectivity/pkg/PLIST-examples
> @@ -40,6 +40,7 @@ lib/qt5/examples/bluetooth/btfiletransfer/remoteselector.cpp
>  lib/qt5/examples/bluetooth/btfiletransfer/remoteselector.h
>  lib/qt5/examples/bluetooth/btfiletransfer/remoteselector.ui
>  lib/qt5/examples/bluetooth/btscanner/
> +lib/qt5/examples/bluetooth/btscanner/Info.plist
>  lib/qt5/examples/bluetooth/btscanner/btscanner.pro
>  lib/qt5/examples/bluetooth/btscanner/device.cpp
>  lib/qt5/examples/bluetooth/btscanner/device.h
> @@ -71,6 +72,7 @@ lib/qt5/examples/bluetooth/chat/images/default.png
>  lib/qt5/examples/bluetooth/chat/images/lineedit-bg.png
>  lib/qt5/examples/bluetooth/chat/qmlchat.cpp
>  lib/qt5/examples/bluetooth/heartrate-game/
> +lib/qt5/examples/bluetooth/heartrate-game/Info.plist
>  lib/qt5/examples/bluetooth/heartrate-game/README.md
>  lib/qt5/examples/bluetooth/heartrate-game/bluetoothbaseclass.cpp
>  lib/qt5/examples/bluetooth/heartrate-game/bluetoothbaseclass.h
> @@ -94,8 +96,8 @@ lib/qt5/examples/bluetooth/heartrate-game/heartrate-game.pro
>  lib/qt5/examples/bluetooth/heartrate-game/heartrate-global.h
>  lib/qt5/examples/bluetooth/heartrate-game/images.qrc
>  lib/qt5/examples/bluetooth/heartrate-game/main.cpp
> -lib/qt5/examples/bluetooth/heartrate-game/qml/
>  lib/qt5/examples/bluetooth/heartrate-game/qml.qrc
> +lib/qt5/examples/bluetooth/heartrate-game/qml/
>  lib/qt5/examples/bluetooth/heartrate-game/qml/App.qml
>  lib/qt5/examples/bluetooth/heartrate-game/qml/BluetoothAlarmDialog.qml
>  lib/qt5/examples/bluetooth/heartrate-game/qml/BottomLine.qml
> @@ -115,12 +117,14 @@ 
> lib/qt5/examples/bluetooth/heartrate-game/qml/images/logo.png
>  lib/qt5/examples/bluetooth/heartrate-game/qml/main.qml
>  lib/qt5/examples/bluetooth/heartrate-game/qml/qmldir
>  lib/qt5/examples/bluetooth/heartrate-server/
> +lib/qt5/examples/bluetooth/heartrate-server/Info.plist
>  lib/qt5/examples/bluetooth/heartrate-server/doc/
>  lib/qt5/examples/bluetooth/heartrate-server/doc/src/
>  lib/qt5/examples/bluetooth/heartrate-server/doc/src/heartrate-server.qdoc
>  lib/qt5/examples/bluetooth/heartrate-server/heartrate-server.pro
>  lib/qt5/examples/bluetooth/heartrate-server/main.cpp
>  lib/qt5/examples/bluetooth/lowenergyscanner/
> +lib/qt5/examples/bluetooth/lowenergyscanner/Info.plist
>  lib/qt5/examples/bluetooth/lowenergyscanner/assets/
>  lib/qt5/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml
>  lib/qt5/examples/bluetooth/lowenergyscanner/assets/Dialog.qml
> @@ -198,6 +202,8 @@ lib/qt5/examples/bluetooth/scanner/qmlscanner.cpp
>  lib/qt5/examples/bluetooth/scanner/scanner.pro
>  lib/qt5/examples/bluetooth/scanner/scanner.qml
>  lib/qt5/examples/bluetooth/scanner/scanner.qrc
> +lib/qt5/examples/bluetooth/shared/
> +lib/qt5/examples/bluetooth/shared/Info.qmake.macos.plist
>  lib/qt5/examples/nfc/
>  lib/qt5/examples/nfc/annotatedurl/
>  lib/qt5/examples/nfc/annotatedurl/annotatedurl.cpp
> diff --git a/x11/qt5/qtconnectivity/pkg/PLIST-main 
> b/x11/qt5/qtconnectivity/pkg/PLIST-main
> index 83288266c5b..5a27756bde7 100644
> --- a/x11/qt5/qtconnectivity/pkg/PLIST-main
> +++ b/x11/qt5/qtconnectivity/pkg/PLIST-main
> @@ -1,4 +1,5 @@
>  @conflict qt5-<5.6
> +@conflict qtconnectivity-examples-<5.15.12pl6p0
>  include/X11/qt5/QtBluetooth/
>  include/X11/qt5/QtBluetooth/${VERSION}/
>  include/X11/qt5/QtBluetooth/${VERSION}/QtBluetooth/
> @@ -234,12 +235,6 @@ 
> lib/qt5/cmake/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake
>  lib/qt5/cmake/Qt5Nfc/
>  lib/qt5/cmake/Qt5Nfc/Qt5NfcConfig.cmake
>  lib/qt5/cmake/Qt5Nfc/Qt5NfcConfigVersion.cmake
> -lib/qt5/examples/bluetooth/btscanner/Info.plist
> -lib/qt5/examples/bluetooth/heartrate-game/Info.plist
> -lib/qt5/examples/bluetooth/heartrate-server/Info.plist
> -lib/qt5/examples/bluetooth/lowenergyscanner/Info.plist
> -lib/qt5/examples/bluetooth/shared/
> -lib/qt5/examples/bluetooth/shared/Info.qmake.macos.plist
>  lib/qt5/libQt5Bluetooth.la
>  lib/qt5/libQt5Bluetooth.prl
>  @lib lib/qt5/libQt5Bluetooth.so.${LIBQt5Bluetooth_VERSION}

Conflicts are the wrong way round. The new -examples subpackage needs
to list @conflict with the old version of the -main subpackage.
Same for other ports.

> diff --git a/x11/qt5/qtpurchasing/Makefile b/x11/qt5/qtpurchasing/Makefile
> index fc696837daf..41ab5c0c9d7 100644
> --- a/x11/qt5/qtpurchasing/Makefile
> +++ b/x11/qt5/qtpurchasing/Makefile
> @@ -1,5 +1,6 @@
>  QT5NAME =            QtPurchasing
>  COMMENT-main =               in-app purchases in Qt5 and Qt5 Quick 
> applications
> +REVISION =           0
>  
>  MULTI_PACKAGES =     -main -examples
>  
> diff --git a/x11/qt5/qtpurchasing/pkg/PLIST-examples 
> b/x11/qt5/qtpurchasing/pkg/PLIST-examples
> index c91f1a284a9..efdf7eb3717 100644
> --- a/x11/qt5/qtpurchasing/pkg/PLIST-examples
> +++ b/x11/qt5/qtpurchasing/pkg/PLIST-examples
> @@ -2,6 +2,8 @@ lib/qt5/examples/
>  lib/qt5/examples/purchasing/
>  lib/qt5/examples/purchasing/purchasing.pro
>  lib/qt5/examples/purchasing/qthangman/
> +lib/qt5/examples/purchasing/qthangman/android/
> +lib/qt5/examples/purchasing/qthangman/android/build.gradle
>  lib/qt5/examples/purchasing/qthangman/doc/
>  lib/qt5/examples/purchasing/qthangman/doc/images/
>  lib/qt5/examples/purchasing/qthangman/doc/images/qthangman-example.png
> diff --git a/x11/qt5/qtpurchasing/pkg/PLIST-main 
> b/x11/qt5/qtpurchasing/pkg/PLIST-main
> index 5132129d1c6..ca331c52563 100644
> --- a/x11/qt5/qtpurchasing/pkg/PLIST-main
> +++ b/x11/qt5/qtpurchasing/pkg/PLIST-main
> @@ -1,3 +1,4 @@
> +@conflict qtpurchasing-examples-<5.15.12p0
>  include/X11/qt5/QtPurchasing/
>  include/X11/qt5/QtPurchasing/${VERSION}/
>  include/X11/qt5/QtPurchasing/${VERSION}/QtPurchasing/
> @@ -30,8 +31,6 @@ lib/pkgconfig/Qt5Purchasing.pc
>  lib/qt5/cmake/Qt5Purchasing/
>  lib/qt5/cmake/Qt5Purchasing/Qt5PurchasingConfig.cmake
>  lib/qt5/cmake/Qt5Purchasing/Qt5PurchasingConfigVersion.cmake
> -lib/qt5/examples/purchasing/qthangman/android/
> -lib/qt5/examples/purchasing/qthangman/android/build.gradle
>  lib/qt5/libQt5Purchasing.la
>  lib/qt5/libQt5Purchasing.prl
>  @lib lib/qt5/libQt5Purchasing.so.${LIBQt5Purchasing_VERSION}
> diff --git a/x11/qt5/qtremoteobjects/Makefile 
> b/x11/qt5/qtremoteobjects/Makefile
> index e53c80f2735..95785960cdd 100644
> --- a/x11/qt5/qtremoteobjects/Makefile
> +++ b/x11/qt5/qtremoteobjects/Makefile
> @@ -1,5 +1,6 @@
>  QT5NAME =            QtRemoteObjects
>  COMMENT-main =               inter-process communication using Qt5 objects
> +REVISION=            0
>  
>  MULTI_PACKAGES =     -main -examples
>  
> diff --git a/x11/qt5/qtremoteobjects/pkg/PLIST-examples 
> b/x11/qt5/qtremoteobjects/pkg/PLIST-examples
> index 5f40b82b4f8..77e7a789952 100644
> --- a/x11/qt5/qtremoteobjects/pkg/PLIST-examples
> +++ b/x11/qt5/qtremoteobjects/pkg/PLIST-examples
> @@ -84,6 +84,7 @@ 
> lib/qt5/examples/remoteobjects/ssl/sslcppclient/sslcppclient.pro
>  lib/qt5/examples/remoteobjects/ssl/sslcppclient/timemodel.rep
>  lib/qt5/examples/remoteobjects/ssl/sslserver/
>  lib/qt5/examples/remoteobjects/ssl/sslserver/cert/
> +lib/qt5/examples/remoteobjects/ssl/sslserver/cert/readme
>  lib/qt5/examples/remoteobjects/ssl/sslserver/cert/cert.qrc
>  lib/qt5/examples/remoteobjects/ssl/sslserver/cert/client.crt
>  lib/qt5/examples/remoteobjects/ssl/sslserver/cert/client.key
> @@ -102,6 +103,7 @@ lib/qt5/examples/remoteobjects/timemodel.rep
>  lib/qt5/examples/remoteobjects/websockets/
>  lib/qt5/examples/remoteobjects/websockets/common/
>  lib/qt5/examples/remoteobjects/websockets/common/cert/
> +lib/qt5/examples/remoteobjects/websockets/common/cert/readme
>  lib/qt5/examples/remoteobjects/websockets/common/cert/cert.qrc
>  lib/qt5/examples/remoteobjects/websockets/common/cert/client.crt
>  lib/qt5/examples/remoteobjects/websockets/common/cert/client.key
> diff --git a/x11/qt5/qtremoteobjects/pkg/PLIST-main 
> b/x11/qt5/qtremoteobjects/pkg/PLIST-main
> index 7a53f930052..cbb8ed60836 100644
> --- a/x11/qt5/qtremoteobjects/pkg/PLIST-main
> +++ b/x11/qt5/qtremoteobjects/pkg/PLIST-main
> @@ -1,3 +1,4 @@
> +@conflict qtremoteobjects-examples-<5.15.12p0
>  include/X11/qt5/QtRemoteObjects/
>  include/X11/qt5/QtRemoteObjects/${VERSION}/
>  include/X11/qt5/QtRemoteObjects/${VERSION}/QtRemoteObjects/
> @@ -75,8 +76,6 @@ lib/qt5/cmake/Qt5RemoteObjects/Qt5RemoteObjectsMacros.cmake
>  lib/qt5/cmake/Qt5RepParser/
>  lib/qt5/cmake/Qt5RepParser/Qt5RepParserConfig.cmake
>  lib/qt5/cmake/Qt5RepParser/Qt5RepParserConfigVersion.cmake
> -lib/qt5/examples/remoteobjects/ssl/sslserver/cert/readme
> -lib/qt5/examples/remoteobjects/websockets/common/cert/readme
>  lib/qt5/libQt5RemoteObjects.la
>  lib/qt5/libQt5RemoteObjects.prl
>  @lib lib/qt5/libQt5RemoteObjects.so.${LIBQt5RemoteObjects_VERSION}
> diff --git a/x11/qt5/qtwebchannel/Makefile b/x11/qt5/qtwebchannel/Makefile
> index 1716d74b862..ef5d135a879 100644
> --- a/x11/qt5/qtwebchannel/Makefile
> +++ b/x11/qt5/qtwebchannel/Makefile
> @@ -3,6 +3,7 @@ COMMENT-main =                Qt5 seamless HTML/JavaScript 
> integration
>  
>  KDE_COMMIT =         6d2f0c3a36d9b2cdcd759a464c608365a0afda98
>  KDE_VERSION =                3
> +REVISION-main =              0
>  
>  SHARED_LIBS +=  Qt5WebChannel            2.1 # 5.9
>  
> diff --git a/x11/qt5/qtwebchannel/pkg/PLIST-main 
> b/x11/qt5/qtwebchannel/pkg/PLIST-main
> index 403ef452d56..633094814f3 100644
> --- a/x11/qt5/qtwebchannel/pkg/PLIST-main
> +++ b/x11/qt5/qtwebchannel/pkg/PLIST-main
> @@ -23,7 +23,6 @@ lib/pkgconfig/Qt5WebChannel.pc
>  lib/qt5/cmake/Qt5WebChannel/
>  lib/qt5/cmake/Qt5WebChannel/Qt5WebChannelConfig.cmake
>  lib/qt5/cmake/Qt5WebChannel/Qt5WebChannelConfigVersion.cmake
> -lib/qt5/examples/
>  lib/qt5/libQt5WebChannel.la
>  lib/qt5/libQt5WebChannel.prl
>  @lib lib/qt5/libQt5WebChannel.so.${LIBQt5WebChannel_VERSION}
> 

Reply via email to