CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 13 Feb 2023 11:26:30 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 13 11:26:30 UTC 2023

Modified Files:
        pkgsrc/net/transmission: Makefile Makefile.common PLIST distinfo
        pkgsrc/net/transmission-gtk: Makefile PLIST
        pkgsrc/net/transmission-qt: Makefile PLIST
Added Files:
        pkgsrc/net/transmission-qt: options.mk
        pkgsrc/net/transmission/patches: patch-CMakeLists.txt
            patch-libtransmission_CMakeLists.txt
Removed Files:
        pkgsrc/net/transmission/patches: patch-qt_qtr.pro

Log Message:
transmission*: update to 4.0.0

With two patches provided by Onno van der Linden.

## 4.0.0 beta 1

- Resource Efficiency - Use less memory, fewer CPU cycles
- Better Community - Pull requests welcomed and used
- Code Modernization - Rewritten in C++

### New Features

- Support for using BitTorrent v2 torrents and hybrid torrents. (Support for _creating_ v2 and hybrid torrents is slated for an upcoming release.)
- Users can now set "default" trackers that can be used to announce all public torrents.
- Newly-added seeds can start immediately and verify pieces on demand, instead of needing a full verify before seeding can begin.
- Added an option to omit potentially-identifying information (e.g. User-Agent and date created) when creating new torrents.
- The Web client has been rewritten and now supports mobile use.
- When creating new torrents, users can now specify the piece size.
- IPv6 blocklists are now supported.
- Beginning with 4.0.0-beta.1, Transmission releases now use semver versioning.
- Dozens of other new features -- too many to list here! We've been working on this for a year!

### Qt Client

- Support both Qt5 and Qt6

### GTK Client

- Ported to GTKMM

## 4.0.0 beta 2

### Highlights

* Added support for GTK 4.
* Lots of bugfixes!

## 4.0.0 beta 3

Bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/transmission/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/transmission/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/transmission/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/transmission/distinfo
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/transmission-gtk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/transmission-gtk/PLIST
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/transmission-qt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/transmission-qt/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/transmission-qt/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/transmission/patches/patch-CMakeLists.txt \
    pkgsrc/net/transmission/patches/patch-libtransmission_CMakeLists.txt
cvs rdiff -u -r1.7 -r0 pkgsrc/net/transmission/patches/patch-qt_qtr.pro

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

Modified files:

Index: pkgsrc/net/transmission/Makefile
diff -u pkgsrc/net/transmission/Makefile:1.32 pkgsrc/net/transmission/Makefile:1.33
--- pkgsrc/net/transmission/Makefile:1.32       Thu Jan  5 15:55:38 2023
+++ pkgsrc/net/transmission/Makefile    Mon Feb 13 11:26:29 2023
@@ -1,15 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2023/01/05 15:55:38 nia Exp $
+# $NetBSD: Makefile,v 1.33 2023/02/13 11:26:29 wiz Exp $
 
 CONFLICTS+=    Transmission-[0-9]*
 
-pre-configure:
-       touch ${WRKSRC}/po/Makefile
-
-CONFIGURE_ARGS+=       --disable-mac
-CONFIGURE_ARGS+=       --without-gtk
-
-PKGREVISION=   5
-
 RCD_SCRIPTS=           transmission
 
 BUILD_DEFS+=           VARBASE

Index: pkgsrc/net/transmission/Makefile.common
diff -u pkgsrc/net/transmission/Makefile.common:1.11 pkgsrc/net/transmission/Makefile.common:1.12
--- pkgsrc/net/transmission/Makefile.common:1.11        Wed Jul 22 13:36:52 2020
+++ pkgsrc/net/transmission/Makefile.common     Mon Feb 13 11:26:29 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.11 2020/07/22 13:36:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2023/02/13 11:26:29 wiz Exp $
 #
 # used by net/transmission/Makefile
 # used by net/transmission-gtk/Makefile
 # used by net/transmission-qt/Makefile
 
-VERSION=       3.00
+VERSION=       4.0.0
 DISTNAME=      transmission-${VERSION}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=transmission/}
@@ -14,36 +14,27 @@ GITHUB_RELEASE=     ${PKGVERSION_NOREV}
 MAINTAINER=    wiz%NetBSD.org@localhost
 HOMEPAGE=      http://www.transmissionbt.com/
 COMMENT?=      Free, lightweight BitTorrent client
+# optionally, gnu-gpl-v3 instead of gnu-gpl-v2
+LICENSE=       gnu-gpl-v2 AND mit
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config intltool msgfmt
-EXTRACT_USING=         bsdtar
-
-# optionally, gnu-gpl-v3 instead of gnu-gpl-v2
-LICENSE=               gnu-gpl-v2 AND mit
 
 PATCHDIR=              ${.CURDIR}/../../net/transmission/patches
 DISTINFO_FILE=         ${.CURDIR}/../../net/transmission/distinfo
 
-GNU_CONFIGURE=         yes
-LDFLAGS+=              ${BUILDLINK_LDADD.getopt} ${BUILDLINK_LDADD.gettext}
-
 .include "../../mk/bsd.prefs.mk"
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
-CPPFLAGS+=             -DBSD
-.endif
 .if ${OPSYS} == "Darwin"
 LDFLAGS+=              -framework CoreFoundation
 .endif
 
-ALL_ENV+=      LIBEVENT_CFLAGS=-I${BUILDLINK_PREFIX.libevent}/include
-ALL_ENV+=      LIBEVENT_LIBS="-L${BUILDLINK_PREFIX.libevent}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libevent}/lib -levent"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=2.0.10
 .include "../../devel/libevent/buildlink3.mk"
-ALL_ENV+=      OPENSSL_CFLAGS="-I${SSLBASE}/include"
-ALL_ENV+=      OPENSSL_LIBS="-L${SSLBASE}/lib -lcrypto -lssl"
-.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../devel/libdeflate/buildlink3.mk"
+.include "../../net/miniupnpc/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../www/libpsl/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/net/transmission/PLIST
diff -u pkgsrc/net/transmission/PLIST:1.4 pkgsrc/net/transmission/PLIST:1.5
--- pkgsrc/net/transmission/PLIST:1.4   Mon Jul 13 13:01:01 2020
+++ pkgsrc/net/transmission/PLIST       Mon Feb 13 11:26:29 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/07/13 13:01:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/02/13 11:26:29 wiz Exp $
 bin/transmission-create
 bin/transmission-daemon
 bin/transmission-edit
@@ -9,70 +9,43 @@ man/man1/transmission-daemon.1
 man/man1/transmission-edit.1
 man/man1/transmission-remote.1
 man/man1/transmission-show.1
-share/transmission/web/LICENSE
-share/transmission/web/images/favicon.ico
-share/transmission/web/images/favicon.png
-share/transmission/web/images/webclip-icon.png
-share/transmission/web/index.html
-share/transmission/web/javascript/common.js
-share/transmission/web/javascript/dialog.js
-share/transmission/web/javascript/file-row.js
-share/transmission/web/javascript/formatter.js
-share/transmission/web/javascript/inspector.js
-share/transmission/web/javascript/jquery/jquery-migrate.min.js
-share/transmission/web/javascript/jquery/jquery-ui.min.js
-share/transmission/web/javascript/jquery/jquery.min.js
-share/transmission/web/javascript/jquery/jquery.transmenu.min.js
-share/transmission/web/javascript/jquery/jquery.ui-contextmenu.min.js
-share/transmission/web/javascript/jquery/json2.min.js
-share/transmission/web/javascript/main.js
-share/transmission/web/javascript/notifications.js
-share/transmission/web/javascript/polyfill.js
-share/transmission/web/javascript/prefs-dialog.js
-share/transmission/web/javascript/remote.js
-share/transmission/web/javascript/torrent-row.js
-share/transmission/web/javascript/torrent.js
-share/transmission/web/javascript/transmission.js
-share/transmission/web/style/jqueryui/images/ui-bg_flat_0_aaaaaa_40x100.png
-share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png
-share/transmission/web/style/jqueryui/images/ui-bg_glass_55_fbf9ee_1x400.png
-share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
-share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png
-share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png
-share/transmission/web/style/jqueryui/images/ui-bg_glass_95_fef1ec_1x400.png
-share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png
-share/transmission/web/style/jqueryui/images/ui-icons_2e83ff_256x240.png
-share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png
-share/transmission/web/style/jqueryui/images/ui-icons_888888_256x240.png
-share/transmission/web/style/jqueryui/images/ui-icons_cd0a0a_256x240.png
-share/transmission/web/style/jqueryui/jquery-ui.min.css
-share/transmission/web/style/transmission/common.css
-share/transmission/web/style/transmission/images/arrow-down.png
-share/transmission/web/style/transmission/images/arrow-up.png
-share/transmission/web/style/transmission/images/blue-turtle.png
-share/transmission/web/style/transmission/images/buttons/torrent_buttons.png
-share/transmission/web/style/transmission/images/compact.png
-share/transmission/web/style/transmission/images/file-priority-high.png
-share/transmission/web/style/transmission/images/file-priority-low.png
-share/transmission/web/style/transmission/images/file-priority-normal.png
-share/transmission/web/style/transmission/images/filter_bar.png
-share/transmission/web/style/transmission/images/filter_icon.png
-share/transmission/web/style/transmission/images/inspector-files.png
-share/transmission/web/style/transmission/images/inspector-info.png
-share/transmission/web/style/transmission/images/inspector-peers.png
-share/transmission/web/style/transmission/images/inspector-trackers.png
-share/transmission/web/style/transmission/images/lock_icon.png
-share/transmission/web/style/transmission/images/logo.png
-share/transmission/web/style/transmission/images/progress.png
-share/transmission/web/style/transmission/images/settings.png
-share/transmission/web/style/transmission/images/toolbar-close.png
-share/transmission/web/style/transmission/images/toolbar-folder.png
-share/transmission/web/style/transmission/images/toolbar-info.png
-share/transmission/web/style/transmission/images/toolbar-pause-all.png
-share/transmission/web/style/transmission/images/toolbar-pause.png
-share/transmission/web/style/transmission/images/toolbar-start-all.png
-share/transmission/web/style/transmission/images/toolbar-start.png
-share/transmission/web/style/transmission/images/turtle.png
-share/transmission/web/style/transmission/images/wrench.png
-share/transmission/web/style/transmission/mobile.css
+share/doc/transmission/AUTHORS
+share/doc/transmission/COPYING
+share/doc/transmission/README.md
+share/doc/transmission/news/news-2.42-and-older.md
+share/doc/transmission/news/news-2.50.md
+share/doc/transmission/news/news-2.51.md
+share/doc/transmission/news/news-2.52.md
+share/doc/transmission/news/news-2.60.md
+share/doc/transmission/news/news-2.61.md
+share/doc/transmission/news/news-2.70.md
+share/doc/transmission/news/news-2.71.md
+share/doc/transmission/news/news-2.72.md
+share/doc/transmission/news/news-2.73.md
+share/doc/transmission/news/news-2.74.md
+share/doc/transmission/news/news-2.75.md
+share/doc/transmission/news/news-2.76.md
+share/doc/transmission/news/news-2.77.md
+share/doc/transmission/news/news-2.80.md
+share/doc/transmission/news/news-2.81.md
+share/doc/transmission/news/news-2.82.md
+share/doc/transmission/news/news-2.83.md
+share/doc/transmission/news/news-2.84.md
+share/doc/transmission/news/news-2.90.md
+share/doc/transmission/news/news-2.91.md
+share/doc/transmission/news/news-2.92.md
+share/doc/transmission/news/news-2.93.md
+share/doc/transmission/news/news-2.94.md
+share/doc/transmission/news/news-3.00.md
+share/doc/transmission/news/news-${PKGVERSION}-beta-1.md
+share/doc/transmission/news/news-${PKGVERSION}-beta-2.md
+share/doc/transmission/news/news-${PKGVERSION}-beta-3.md
+share/doc/transmission/news/news-${PKGVERSION}.md
+share/doc/transmission/rpc-spec.md
+share/doc/transmission/send-email-when-torrent-done.sh
+share/transmission/public_html/images/favicon.ico
+share/transmission/public_html/images/favicon.png
+share/transmission/public_html/images/webclip-icon.png
+share/transmission/public_html/index.html
+share/transmission/public_html/transmission-app.js
+share/transmission/public_html/transmission-app.js.LICENSE.txt

Index: pkgsrc/net/transmission/distinfo
diff -u pkgsrc/net/transmission/distinfo:1.20 pkgsrc/net/transmission/distinfo:1.21
--- pkgsrc/net/transmission/distinfo:1.20       Tue Oct 26 11:07:04 2021
+++ pkgsrc/net/transmission/distinfo    Mon Feb 13 11:26:29 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:07:04 nia Exp $
+$NetBSD: distinfo,v 1.21 2023/02/13 11:26:29 wiz Exp $
 
-BLAKE2s (transmission-3.00.tar.xz) = d37b06271ba55efbff653a0d8d75c0fbd98049ad81562015fd82e9bc7c1f9e07
-SHA512 (transmission-3.00.tar.xz) = eeaf7fe46797326190008776a7fa641b6341c806b0f1684c2e7326c1284832a320440013e42a37acda9fd0ee5dca695f215d6263c8acb39188c5d9a836104a61
-Size (transmission-3.00.tar.xz) = 3329220 bytes
-SHA1 (patch-qt_qtr.pro) = e29629fada5bbb34e3b05b47092dba655b9d8265
+BLAKE2s (transmission-4.0.0.tar.xz) = 4b701562e5b72b5eb60b203c3f682135404feed2083cb04801a42818361eae39
+SHA512 (transmission-4.0.0.tar.xz) = 79945af73fe7226dddadba7cc039516f2f878e05a9cf6c6d799b636b8298e2b2fa25c4426789bd41ef4d2b00d75a3c1c115c1676b4d2a9f09a1526456dceb3f8
+Size (transmission-4.0.0.tar.xz) = 10351556 bytes
+SHA1 (patch-CMakeLists.txt) = 47bd6556d05dcf1f8ef357b7e8cb8e6b32bdeef3
+SHA1 (patch-libtransmission_CMakeLists.txt) = d1a96bc56744d7ebba0200a9ab7b767fd5a45136

Index: pkgsrc/net/transmission-gtk/Makefile
diff -u pkgsrc/net/transmission-gtk/Makefile:1.54 pkgsrc/net/transmission-gtk/Makefile:1.55
--- pkgsrc/net/transmission-gtk/Makefile:1.54   Sun Jan 29 21:17:31 2023
+++ pkgsrc/net/transmission-gtk/Makefile        Mon Feb 13 11:26:29 2023
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.54 2023/01/29 21:17:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2023/02/13 11:26:29 wiz Exp $
 
 PKGNAME=       transmission-gtk-${VERSION}
-PKGREVISION=   8
 COMMENT=       Free, lightweight BitTorrent client (GTK version)
 
-INSTALL_ENV+=          INSTALL_ROOT=${DESTDIR}${PREFIX}
-
-CONFIGURE_ARGS+=       --disable-cli
-CONFIGURE_ARGS+=       --disable-daemon
-CONFIGURE_ARGS+=       --disable-mac
-CONFIGURE_ARGS+=       --with-gtk
-
 CONFLICTS+=            Transmission-gui-[0-9]*
 
 .include "../../net/transmission/Makefile.common"
 
-post-build:
-       cd ${WRKSRC}/gtk && ${SETENV} ${MAKE_ENV} make
-       cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} make
-
-do-install:
-       cd ${WRKSRC}/gtk && ${SETENV} ${INSTALL_ENV} make install
-       cd ${WRKSRC}/po && ${SETENV} ${INSTALL_ENV} make install
+CMAKE_ARGS+=   -DENABLE_DAEMON=OFF
+CMAKE_ARGS+=   -DENABLE_GTK=ON
+CMAKE_ARGS+=   -DENABLE_QT=OFF
+CMAKE_ARGS+=   -DENABLE_MAC=OFF
+CMAKE_ARGS+=   -DENABLE_WEB=OFF
+CMAKE_ARGS+=   -DENABLE_UTILS=OFF
+CMAKE_ARGS+=   -DENABLE_CLI=OFF
+CMAKE_ARGS+=   -DINSTALL_DOC=OFF
+CMAKE_ARGS+=   -DENABLE_TESTS=OFF
+
+post-install:
+       ${RM} -R ${DESTDIR}${PREFIX}/share/transmission/public_html
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+# XXX: this doesn't work - builtin 0.16.1 is accepted
+BUILDLINK_API_DEPENDS.gettext+=        gettext-lib>=0.19.7
+.include "../../devel/gettext-lib/buildlink3.mk"
+# XXX: so force new gettext-tools, giving us new gettext-lib
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../x11/gtkmm4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/transmission-gtk/PLIST
diff -u pkgsrc/net/transmission-gtk/PLIST:1.2 pkgsrc/net/transmission-gtk/PLIST:1.3
--- pkgsrc/net/transmission-gtk/PLIST:1.2       Mon Jul 13 13:01:01 2020
+++ pkgsrc/net/transmission-gtk/PLIST   Mon Feb 13 11:26:29 2023
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2020/07/13 13:01:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/02/13 11:26:29 wiz Exp $
 bin/transmission-gtk
-man/man1/transmission-gtk.1
-share/appdata/transmission-gtk.appdata.xml
 share/applications/transmission-gtk.desktop
 share/icons/hicolor/scalable/apps/transmission-devel.svg
 share/icons/hicolor/scalable/apps/transmission.svg
@@ -13,7 +11,6 @@ share/locale/az/LC_MESSAGES/transmission
 share/locale/be/LC_MESSAGES/transmission-gtk.mo
 share/locale/bg/LC_MESSAGES/transmission-gtk.mo
 share/locale/bn/LC_MESSAGES/transmission-gtk.mo
-share/locale/bo/LC_MESSAGES/transmission-gtk.mo
 share/locale/br/LC_MESSAGES/transmission-gtk.mo
 share/locale/bs/LC_MESSAGES/transmission-gtk.mo
 share/locale/ca/LC_MESSAGES/transmission-gtk.mo
@@ -65,16 +62,14 @@ share/locale/ml/LC_MESSAGES/transmission
 share/locale/mr/LC_MESSAGES/transmission-gtk.mo
 share/locale/ms/LC_MESSAGES/transmission-gtk.mo
 share/locale/mt/LC_MESSAGES/transmission-gtk.mo
-share/locale/my/LC_MESSAGES/transmission-gtk.mo
 share/locale/nb/LC_MESSAGES/transmission-gtk.mo
-share/locale/nds/LC_MESSAGES/transmission-gtk.mo
 share/locale/nl/LC_MESSAGES/transmission-gtk.mo
 share/locale/nn/LC_MESSAGES/transmission-gtk.mo
 share/locale/oc/LC_MESSAGES/transmission-gtk.mo
-share/locale/pa/LC_MESSAGES/transmission-gtk.mo
 share/locale/pl/LC_MESSAGES/transmission-gtk.mo
 share/locale/pt/LC_MESSAGES/transmission-gtk.mo
 share/locale/pt_BR/LC_MESSAGES/transmission-gtk.mo
+share/locale/pt_PT/LC_MESSAGES/transmission-gtk.mo
 share/locale/ro/LC_MESSAGES/transmission-gtk.mo
 share/locale/ru/LC_MESSAGES/transmission-gtk.mo
 share/locale/si/LC_MESSAGES/transmission-gtk.mo
@@ -83,11 +78,9 @@ share/locale/sl/LC_MESSAGES/transmission
 share/locale/sq/LC_MESSAGES/transmission-gtk.mo
 share/locale/sr/LC_MESSAGES/transmission-gtk.mo
 share/locale/sv/LC_MESSAGES/transmission-gtk.mo
-share/locale/sw/LC_MESSAGES/transmission-gtk.mo
 share/locale/ta/LC_MESSAGES/transmission-gtk.mo
 share/locale/te/LC_MESSAGES/transmission-gtk.mo
 share/locale/th/LC_MESSAGES/transmission-gtk.mo
-share/locale/tl/LC_MESSAGES/transmission-gtk.mo
 share/locale/tr/LC_MESSAGES/transmission-gtk.mo
 share/locale/ug/LC_MESSAGES/transmission-gtk.mo
 share/locale/uk/LC_MESSAGES/transmission-gtk.mo
@@ -97,4 +90,4 @@ share/locale/vi/LC_MESSAGES/transmission
 share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo
 share/locale/zh_HK/LC_MESSAGES/transmission-gtk.mo
 share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo
-share/pixmaps/transmission.png
+share/metainfo/transmission-gtk.metainfo.xml

Index: pkgsrc/net/transmission-qt/Makefile
diff -u pkgsrc/net/transmission-qt/Makefile:1.65 pkgsrc/net/transmission-qt/Makefile:1.66
--- pkgsrc/net/transmission-qt/Makefile:1.65    Sun Jan 29 21:17:31 2023
+++ pkgsrc/net/transmission-qt/Makefile Mon Feb 13 11:26:29 2023
@@ -1,38 +1,29 @@
-# $NetBSD: Makefile,v 1.65 2023/01/29 21:17:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.66 2023/02/13 11:26:29 wiz Exp $
 
 PKGNAME=       transmission-qt-${VERSION}
-PKGREVISION=   10
 COMMENT=       Free, lightweight BitTorrent client (QT version)
 
-MAKE_ENV+=             QTDIR=${QTDIR}
+CMAKE_ARGS+=   -DENABLE_DAEMON=OFF
+CMAKE_ARGS+=   -DENABLE_GTK=OFF
+CMAKE_ARGS+=   -DENABLE_QT=ON
+CMAKE_ARGS+=   -DENABLE_MAC=OFF
+CMAKE_ARGS+=   -DENABLE_WEB=OFF
+CMAKE_ARGS+=   -DENABLE_UTILS=OFF
+CMAKE_ARGS+=   -DENABLE_CLI=OFF
+CMAKE_ARGS+=   -DINSTALL_DOC=OFF
+CMAKE_ARGS+=   -DENABLE_TESTS=OFF
 
 GCC_REQD+=             7
 
-MAKE_ENV.NetBSD+=      SUBLIBS=-lquota
-
-INSTALL_ENV+=          INSTALL_ROOT=${DESTDIR}${PREFIX}
-
-CONFIGURE_ARGS+=       --disable-cli
-CONFIGURE_ARGS+=       --disable-daemon
-CONFIGURE_ARGS+=       --disable-mac
-CONFIGURE_ARGS+=       --without-gtk
-
 CONFLICTS+=            Transmission-gui-[0-9]*
 
 INSTALLATION_DIRS=     share/applications
 
-.include "../../net/transmission/Makefile.common"
-
-post-build:
-       cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake qtr.pro
-       cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} make
-
-do-install:
-       cd ${WRKSRC}/qt && ${SETENV} ${INSTALL_ENV} make install
-
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/transmission-qt.desktop             \
        ${DESTDIR}${PREFIX}/share/applications/transmission-qt.desktop
+       ${RM} -R ${DESTDIR}${PREFIX}/share/transmission/public_html
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "options.mk"
+.include "../../net/transmission/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/transmission-qt/PLIST
diff -u pkgsrc/net/transmission-qt/PLIST:1.2 pkgsrc/net/transmission-qt/PLIST:1.3
--- pkgsrc/net/transmission-qt/PLIST:1.2        Fri Jun 17 15:48:24 2016
+++ pkgsrc/net/transmission-qt/PLIST    Mon Feb 13 11:26:29 2023
@@ -1,4 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/17 15:48:24 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/02/13 11:26:29 wiz Exp $
 bin/transmission-qt
-man/man1/transmission-qt.1
 share/applications/transmission-qt.desktop
+share/transmission/translations/transmission_af.qm
+share/transmission/translations/transmission_ca.qm
+share/transmission/translations/transmission_da.qm
+share/transmission/translations/transmission_de.qm
+share/transmission/translations/transmission_el.qm
+share/transmission/translations/transmission_en.qm
+share/transmission/translations/transmission_es.qm
+share/transmission/translations/transmission_eu.qm
+share/transmission/translations/transmission_fi.qm
+share/transmission/translations/transmission_fr.qm
+share/transmission/translations/transmission_hu.qm
+share/transmission/translations/transmission_id.qm
+share/transmission/translations/transmission_it_IT.qm
+share/transmission/translations/transmission_ja.qm
+share/transmission/translations/transmission_ka.qm
+share/transmission/translations/transmission_kk.qm
+share/transmission/translations/transmission_ko.qm
+share/transmission/translations/transmission_lt.qm
+share/transmission/translations/transmission_nb.qm
+share/transmission/translations/transmission_nl.qm
+share/transmission/translations/transmission_pl.qm
+share/transmission/translations/transmission_pt.qm
+share/transmission/translations/transmission_pt_BR.qm
+share/transmission/translations/transmission_pt_PT.qm
+share/transmission/translations/transmission_ru.qm
+share/transmission/translations/transmission_sl.qm
+share/transmission/translations/transmission_sv.qm
+share/transmission/translations/transmission_tr.qm
+share/transmission/translations/transmission_uk.qm
+share/transmission/translations/transmission_zh_CN.qm

Added files:

Index: pkgsrc/net/transmission-qt/options.mk
diff -u /dev/null pkgsrc/net/transmission-qt/options.mk:1.1
--- /dev/null   Mon Feb 13 11:26:30 2023
+++ pkgsrc/net/transmission-qt/options.mk       Mon Feb 13 11:26:29 2023
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2023/02/13 11:26:29 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.transmission-qt
+PKG_OPTIONS_REQUIRED_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         qt6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt5)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt6)
+.include "../../devel/qt6-qttools/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif

Index: pkgsrc/net/transmission/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/transmission/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Feb 13 11:26:30 2023
+++ pkgsrc/net/transmission/patches/patch-CMakeLists.txt        Mon Feb 13 11:26:29 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2023/02/13 11:26:29 wiz Exp $
+
+Detect and use libquota.
+
+--- CMakeLists.txt.orig        2023-02-07 23:39:47.000000000 +0000
++++ CMakeLists.txt
+@@ -695,6 +695,11 @@ if(HAVE_LIBM)
+     set(LIBM_LIBRARY m)
+ endif()
+ 
++check_library_exists(quota quotacursor_skipidtype "" HAVE_LIBQUOTA)
++if(HAVE_LIBQUOTA)
++    set(LIBQUOTA_LIBRARY quota)
++endif()
++
+ set(TR_NETWORK_LIBRARIES)
+ if(WIN32)
+     list(APPEND TR_NETWORK_LIBRARIES iphlpapi ws2_32)
Index: pkgsrc/net/transmission/patches/patch-libtransmission_CMakeLists.txt
diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_CMakeLists.txt:1.1
--- /dev/null   Mon Feb 13 11:26:30 2023
+++ pkgsrc/net/transmission/patches/patch-libtransmission_CMakeLists.txt        Mon Feb 13 11:26:29 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-libtransmission_CMakeLists.txt,v 1.1 2023/02/13 11:26:29 wiz Exp $
+
+Detect and use libquota.
+
+--- libtransmission/CMakeLists.txt.orig        2023-02-01 03:51:15.000000000 +0000
++++ libtransmission/CMakeLists.txt
+@@ -279,6 +279,7 @@ target_link_libraries(${TR_NAME}
+         libb64::libb64
+         ${LIBINTL_LIBRARY}
+         ${LIBM_LIBRARY}
++        ${LIBQUOTA_LIBRARY}
+         ${TR_NETWORK_LIBRARIES}
+         jsonsl
+         utf8::cpp

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index