subject:"\[UPDATE\] net\/transmission"

Re: update: net/transmission 4.0.6

2024-06-21 Thread Josh Grosse

Ping in regards to https://marc.info/?l=openbsd-ports=171828585031997=2

On Thu, Jun 13, 2024 at 09:40:14AM -0400, Josh Grosse wrote:
> This is a bugfix release that includes the previously patches
> that Brad cherry picked for libfmt 10.
> 
> Tested on amd64.  The -gtk and -qt binaries have no apparent
> regressions; the -daemon binary will still loop with libcurl if
> run in a different rdomain than zero; but this is an existing
> unresolved issue.

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 08397883eaf..76ce9054e43 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -2,16 +2,17 @@ COMMENT-main=   BitTorrent command line and daemon 
> client
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt=  BitTorrent client with Qt interface
>  
> -VER= 4.0.5
> +VER= 4.0.6
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
>  PKGNAME-qt=  transmission-qt-${VER}
> -REVISION=0
>  CATEGORIES=  net
>  HOMEPAGE=https://transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
>  
> +DEBUG_PACKAGES=${BUILD_PACKAGES}
> +
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
>  
> @@ -45,7 +46,7 @@ WANTLIB-qt +=   Qt6Widgets
>  MODULES +=   devel/cmake \
>   textproc/intltool
>  
> -BUILD_DEPENDS-common +=  devel/fmt
> +BUILD_DEPENDS += devel/fmt
>  
>  LIB_DEPENDS-common +=archivers/libdeflate \
>   net/curl \
> diff --git a/net/transmission/distinfo b/net/transmission/distinfo
> index 644e3f51975..2f5dac89a78 100644
> --- a/net/transmission/distinfo
> +++ b/net/transmission/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-4.0.5.tar.xz) = 
> /Wj/EUpHkgAEPDDH5p26TBky9682ykxbXS7ctYZuY1c=
> -SIZE (transmission-4.0.5.tar.xz) = 9745756
> +SHA256 (transmission-4.0.6.tar.xz) = 
> Kjj+bYojmRaAtpHCd6M1+Idb3sorl8aya1mLycewxF8=
> +SIZE (transmission-4.0.6.tar.xz) = 11908296
> diff --git a/net/transmission/patches/patch-gtk_Application_cc 
> b/net/transmission/patches/patch-gtk_Application_cc
> deleted file mode 100644
> index 8a6d7516424..000
> --- a/net/transmission/patches/patch-gtk_Application_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: gtk/Application.cc
>  gtk/Application.cc.orig
> -+++ gtk/Application.cc
> -@@ -395,7 +395,7 @@ void register_magnet_link_handler()
> - _("Couldn't register Transmission as a {content_type} handler: 
> {error} ({error_code})"),
> - fmt::arg("content_type", content_type),
> - fmt::arg("error", e.what()),
> --fmt::arg("error_code", e.code(;
> -+fmt::arg("error_code", static_cast(e.code();
> - }
> - }
> - 
> diff --git a/net/transmission/patches/patch-gtk_DetailsDialog_cc 
> b/net/transmission/patches/patch-gtk_DetailsDialog_cc
> deleted file mode 100644
> index c906d17f90d..000
> --- a/net/transmission/patches/patch-gtk_DetailsDialog_cc
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -fix: missing #include in DetailsDialog.cc
> -9b0be18cb5ae4c43c62ffaa6d7304f66332a5505
> -
> -Index: gtk/DetailsDialog.cc
>  gtk/DetailsDialog.cc.orig
> -+++ gtk/DetailsDialog.cc
> -@@ -68,6 +68,7 @@
> - #include 
> - #else
> - #include 
> -+#include 
> - #endif
> - 
> - using namespace std::literals;
> diff --git a/net/transmission/patches/patch-libtransmission_file-posix_cc 
> b/net/transmission/patches/patch-libtransmission_file-posix_cc
> deleted file mode 100644
> index 6f876bfcb8f..000
> --- a/net/transmission/patches/patch-libtransmission_file-posix_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: libtransmission/file-posix.cc
>  libtransmission/file-posix.cc.orig
> -+++ libtransmission/file-posix.cc
> -@@ -560,7 +560,7 @@ tr_sys_file_t tr_sys_file_get_std(tr_std_sys_file_t st
> - break;
> - 
> - default:
> --TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file 
> {:d}"), std_file));
> -+TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file 
> {:d}"), static_cast(std_file)));
> - tr_error_set_from_errno(error, EINVAL);
> - }
> - 
> diff --git a/net/transmission/patches/patch-libtransmission_variant-json_cc 
> b/net/transmission/patches/patch-libtransmission_variant-json_cc
> deleted file mode 100644
> index 2796e46bd41..000
> --- a/net/transmission/patches/patch-libtransmission_variant-json_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: libtransmission/variant-json.cc
>  libtransmission/variant-json.cc.orig
> -+++ libtransmission/variant-json.cc
> -@@ -99,7 +99,7 @@ void error_handler(jsonsl_t jsn, jsonsl_error_t error,
> - fmt::arg("position", jsn->pos),
> -

update: net/transmission 4.0.6

2024-06-13 Thread Josh Grosse

This is a bugfix release that includes the previously patches
that Brad cherry picked for libfmt 10.

Tested on amd64.  The -gtk and -qt binaries have no apparent
regressions; the -daemon binary will still loop with libcurl if
run in a different rdomain than zero; but this is an existing
unresolved issue.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 08397883eaf..76ce9054e43 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,16 +2,17 @@ COMMENT-main= BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.5
+VER=   4.0.6
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  0
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
 
+DEBUG_PACKAGES=${BUILD_PACKAGES}
+
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
@@ -45,7 +46,7 @@ WANTLIB-qt += Qt6Widgets
 MODULES += devel/cmake \
textproc/intltool
 
-BUILD_DEPENDS-common +=devel/fmt
+BUILD_DEPENDS +=   devel/fmt
 
 LIB_DEPENDS-common +=  archivers/libdeflate \
net/curl \
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 644e3f51975..2f5dac89a78 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.5.tar.xz) = 
/Wj/EUpHkgAEPDDH5p26TBky9682ykxbXS7ctYZuY1c=
-SIZE (transmission-4.0.5.tar.xz) = 9745756
+SHA256 (transmission-4.0.6.tar.xz) = 
Kjj+bYojmRaAtpHCd6M1+Idb3sorl8aya1mLycewxF8=
+SIZE (transmission-4.0.6.tar.xz) = 11908296
diff --git a/net/transmission/patches/patch-gtk_Application_cc 
b/net/transmission/patches/patch-gtk_Application_cc
deleted file mode 100644
index 8a6d7516424..000
--- a/net/transmission/patches/patch-gtk_Application_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-deps: bump libfmt to v10.0.0
-fd583ac878806546c3780eab939fdabd9e94c3de
-
-Index: gtk/Application.cc
 gtk/Application.cc.orig
-+++ gtk/Application.cc
-@@ -395,7 +395,7 @@ void register_magnet_link_handler()
- _("Couldn't register Transmission as a {content_type} handler: 
{error} ({error_code})"),
- fmt::arg("content_type", content_type),
- fmt::arg("error", e.what()),
--fmt::arg("error_code", e.code(;
-+fmt::arg("error_code", static_cast(e.code();
- }
- }
- 
diff --git a/net/transmission/patches/patch-gtk_DetailsDialog_cc 
b/net/transmission/patches/patch-gtk_DetailsDialog_cc
deleted file mode 100644
index c906d17f90d..000
--- a/net/transmission/patches/patch-gtk_DetailsDialog_cc
+++ /dev/null
@@ -1,14 +0,0 @@
-fix: missing #include in DetailsDialog.cc
-9b0be18cb5ae4c43c62ffaa6d7304f66332a5505
-
-Index: gtk/DetailsDialog.cc
 gtk/DetailsDialog.cc.orig
-+++ gtk/DetailsDialog.cc
-@@ -68,6 +68,7 @@
- #include 
- #else
- #include 
-+#include 
- #endif
- 
- using namespace std::literals;
diff --git a/net/transmission/patches/patch-libtransmission_file-posix_cc 
b/net/transmission/patches/patch-libtransmission_file-posix_cc
deleted file mode 100644
index 6f876bfcb8f..000
--- a/net/transmission/patches/patch-libtransmission_file-posix_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-deps: bump libfmt to v10.0.0
-fd583ac878806546c3780eab939fdabd9e94c3de
-
-Index: libtransmission/file-posix.cc
 libtransmission/file-posix.cc.orig
-+++ libtransmission/file-posix.cc
-@@ -560,7 +560,7 @@ tr_sys_file_t tr_sys_file_get_std(tr_std_sys_file_t st
- break;
- 
- default:
--TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file 
{:d}"), std_file));
-+TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file 
{:d}"), static_cast(std_file)));
- tr_error_set_from_errno(error, EINVAL);
- }
- 
diff --git a/net/transmission/patches/patch-libtransmission_variant-json_cc 
b/net/transmission/patches/patch-libtransmission_variant-json_cc
deleted file mode 100644
index 2796e46bd41..000
--- a/net/transmission/patches/patch-libtransmission_variant-json_cc
+++ /dev/null
@@ -1,15 +0,0 @@
-deps: bump libfmt to v10.0.0
-fd583ac878806546c3780eab939fdabd9e94c3de
-
-Index: libtransmission/variant-json.cc
 libtransmission/variant-json.cc.orig
-+++ libtransmission/variant-json.cc
-@@ -99,7 +99,7 @@ void error_handler(jsonsl_t jsn, jsonsl_error_t error,
- fmt::arg("position", jsn->pos),
- fmt::arg("text", std::string_view{ buf, std::min(size_t{ 16U }, 
data->size - jsn->pos) }),
- fmt::arg("error", jsonsl_strerror(error)),
--fmt::arg("error_code", error)));
-+fmt::arg("error_code", static_cast(error;
- }
- 
- int error_callback(jsonsl_t jsn, jsonsl_error_t error, struct 
jsonsl_state_st* state, jsonsl_char_t* at)
diff --git

[update] net/transmission 4.0.5

2023-12-15 Thread Josh Grosse

Attached is a minor update from 4.0.4 to 4.0.5, described
upstream as a bug fix release.

The gtk, qt, and web clients (this last with transmission-daemon)
have been lightly tested on amd64.  The change log follows.

-

Highlights

* Fixed 4.0.0 bug where the IP address field in UDP announces were not
  encoded in network byte order. [BEP-15]. (#6132)

* Fixed a bug that incorrectly escaped JSON strings in some locales.
  (#6005, #6133)

* Fixed 4.0.4 decreased download speeds for people who set a low upload
  bandwidth limit. (#6134)

All Platforms

* Fixed bug that prevented editing trackers on magnet links. (#5957)

* Fixed HTTP tracker announces and scrapes sometimes failing after
  adding a torrent file by HTTPS URL. (#5969)

* In RPC responses, change the default sort order of torrents to match
  Transmission 3.00. (#5604)

* Fixed tr_sys_path_copy() behavior on some Synology Devices. (#5974)

Qt Client

* Fix: only append .added suffix to watchdir files. (#5705)

GTK Client

* Fixed crash when opening torrent file from "Recently used" section in
  GTK 4. (#6131, #6142)
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index e10eef5ef99..b2b5f3ff3dd 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.4
+VER=   4.0.5
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 77eb8ce..644e3f51975 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.4.tar.xz) = 
Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
-SIZE (transmission-4.0.4.tar.xz) = 9755152
+SHA256 (transmission-4.0.5.tar.xz) = 
/Wj/EUpHkgAEPDDH5p26TBky9682ykxbXS7ctYZuY1c=
+SIZE (transmission-4.0.5.tar.xz) = 9745756
diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
index 65d196e2731..fa3fe3bf428 100644
--- a/net/transmission/pkg/PLIST-main
+++ b/net/transmission/pkg/PLIST-main
@@ -60,6 +60,7 @@ share/doc/transmission/news/news-4.0.1.md
 share/doc/transmission/news/news-4.0.2.md
 share/doc/transmission/news/news-4.0.3.md
 share/doc/transmission/news/news-4.0.4.md
+share/doc/transmission/news/news-4.0.5.md
 share/doc/transmission/rpc-spec.md
 share/doc/transmission/send-email-when-torrent-done.sh
 @comment XXX update-plist(1) really wants this here, but -main is CLI only
@@ -76,7 +77,8 @@ 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.css
 share/transmission/public_html/transmission-app.js
-share/transmission/public_html/transmission-app.js.LICENSE.txt
+share/transmission/public_html/transmission-app.js.LEGAL.txt
 @comment XXX update-plist(1) really wants this here, but -main is CLI only
 @comment @tag gtk-update-icon-cache %D/share/icons/hicolor

Re: [update] net/transmission 4.0.4

2023-09-23 Thread Klemens Nanni

On Sat, Sep 23, 2023 at 11:36:27AM -0400, Josh Grosse wrote:
> ping.
> 
> On Mon, Sep 18, 2023 at 08:42:01PM -0400, Josh Grosse wrote:
> > This is an update from 4.0.3 to 4.0.4.  Lightly tested
> > the -gtk, -qt, and -daemon binaries on amd64.

Thanks, after syncing PLIST.

Re: [update] net/transmission 4.0.4

2023-09-23 Thread Josh Grosse

ping.

On Mon, Sep 18, 2023 at 08:42:01PM -0400, Josh Grosse wrote:
> This is an update from 4.0.3 to 4.0.4.  Lightly tested
> the -gtk, -qt, and -daemon binaries on amd64.
> 

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index ce94928b0ad..d5070c72809 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -2,7 +2,7 @@ COMMENT-main= BitTorrent command line and daemon client
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt=  BitTorrent client with Qt interface
>  
> -VER= 4.0.3
> +VER= 4.0.4
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
> @@ -10,9 +10,6 @@ PKGNAME-qt= transmission-qt-${VER}
>  CATEGORIES=  net
>  HOMEPAGE=https://transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
> -REVISION-gtk=1
> -REVISION-main=   1
> -REVISION-qt= 1
>  
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
> diff --git a/net/transmission/distinfo b/net/transmission/distinfo
> index 438c9be7cc0..77eb8ce 100644
> --- a/net/transmission/distinfo
> +++ b/net/transmission/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-4.0.3.tar.xz) = 
> trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
> -SIZE (transmission-4.0.3.tar.xz) = 10062044
> +SHA256 (transmission-4.0.4.tar.xz) = 
> Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
> +SIZE (transmission-4.0.4.tar.xz) = 9755152
> diff --git a/net/transmission/patches/patch-cli_cli_cc 
> b/net/transmission/patches/patch-cli_cli_cc
> deleted file mode 100644
> index dd129a87d74..000
> --- a/net/transmission/patches/patch-cli_cli_cc
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -PR 5424 - fix from upstream
> -Index: cli/cli.cc
>  cli/cli.cc.orig
> -+++ cli/cli.cc
> -@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
> - 
> - tr_ctorSetPaused(ctor, TR_FORCE, false);
> - 
> --if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
> tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
> -+if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
> torrentPath, nullptr) :
> -+  
> tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
> - {
> - // all good
> - }

[update] net/transmission 4.0.4

2023-09-18 Thread Josh Grosse

This is an update from 4.0.3 to 4.0.4.  Lightly tested
the -gtk, -qt, and -daemon binaries on amd64.

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index ce94928b0ad..d5070c72809 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.3
+VER=   4.0.4
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -10,9 +10,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  1
-REVISION-main= 1
-REVISION-qt=   1
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 438c9be7cc0..77eb8ce 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.3.tar.xz) = 
trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
-SIZE (transmission-4.0.3.tar.xz) = 10062044
+SHA256 (transmission-4.0.4.tar.xz) = 
Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
+SIZE (transmission-4.0.4.tar.xz) = 9755152
diff --git a/net/transmission/patches/patch-cli_cli_cc 
b/net/transmission/patches/patch-cli_cli_cc
deleted file mode 100644
index dd129a87d74..000
--- a/net/transmission/patches/patch-cli_cli_cc
+++ /dev/null
@@ -1,14 +0,0 @@
-PR 5424 - fix from upstream
-Index: cli/cli.cc
 cli/cli.cc.orig
-+++ cli/cli.cc
-@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
- 
- tr_ctorSetPaused(ctor, TR_FORCE, false);
- 
--if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
-+if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
torrentPath, nullptr) :
-+  
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
- {
- // all good
- }

Re: [update] net/transmission 4.0.3

2023-04-23 Thread Andre Smagin

On Fri, 21 Apr 2023 08:49:12 -0400
Josh Grosse  wrote:

> Attached is an update for net/transmission from 4.0.2 to 4.0.3.
> 
> 4.0.3 is a minor bugfix release.
> 
> This diff includes a new patch from upstream for their PR #5424
> to fix a problem reported to ports@ by Raf Czlonka yesterday:
> 
>  https://marc.info/?t=16819898542=1=2
> 
> The patch has been tested by both Raf and by me.

Hello.

Thank you for updating the transmission port. I've been using 4.0.3
without the cli patch for a week or so (I bumped it up locally to 4.0.3
when 4.0.2 port was committed), now running this version for 24 hours.
Tested stand-alone with qt interface and daemon with web gui. No issues
so far, works better than version 3 in my opinion. Would love to see
it committed.

-- 
Andre Smagin

[update] net/transmission 4.0.3

2023-04-21 Thread Josh Grosse

Attached is an update for net/transmission from 4.0.2 to 4.0.3.

4.0.3 is a minor bugfix release.

This diff includes a new patch from upstream for their PR #5424
to fix a problem reported to ports@ by Raf Czlonka yesterday:

 https://marc.info/?t=16819898542=1=2

The patch has been tested by both Raf and by me.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 6cd2ce7db45..a90da8abdc3 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.2
+VER=   4.0.3
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index ec566e87c0f..438c9be7cc0 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.2.tar.xz) = 
Ob96EEpyKAWp3Aic2q/+M7+QuCIwp+p/NAyuWfAKLug=
-SIZE (transmission-4.0.2.tar.xz) = 10055708
+SHA256 (transmission-4.0.3.tar.xz) = 
trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
+SIZE (transmission-4.0.3.tar.xz) = 10062044
diff --git a/net/transmission/patches/patch-cli_cli_cc 
b/net/transmission/patches/patch-cli_cli_cc
new file mode 100644
index 000..dd129a87d74
--- /dev/null
+++ b/net/transmission/patches/patch-cli_cli_cc
@@ -0,0 +1,14 @@
+PR 5424 - fix from upstream
+Index: cli/cli.cc
+--- cli/cli.cc.orig
 cli/cli.cc
+@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
+ 
+ tr_ctorSetPaused(ctor, TR_FORCE, false);
+ 
+-if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
++if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
torrentPath, nullptr) :
++  
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
+ {
+ // all good
+ }
diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
index 383529f755a..29e2f7d32e0 100644
--- a/net/transmission/pkg/PLIST-main
+++ b/net/transmission/pkg/PLIST-main
@@ -58,6 +58,7 @@ share/doc/transmission/news/news-4.0.0-beta-3.md
 share/doc/transmission/news/news-4.0.0.md
 share/doc/transmission/news/news-4.0.1.md
 share/doc/transmission/news/news-4.0.2.md
+share/doc/transmission/news/news-4.0.3.md
 share/doc/transmission/rpc-spec.md
 share/doc/transmission/send-email-when-torrent-done.sh
 @comment XXX update-plist(1) really wants this here, but -main is CLI only

Re: [update] net/transmission 4.0.2

2023-04-15 Thread Klemens Nanni

On Tue, Apr 11, 2023 at 06:57:49PM -0400, Josh Grosse wrote:
> diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
> index 622eb4cdf94..cb16269a77d 100644
> --- a/net/transmission/pkg/PLIST-main
> +++ b/net/transmission/pkg/PLIST-main
> @@ -22,81 +22,50 @@
>  @man man/man1/transmission-remote.1
>  @man man/man1/transmission-show.1
>  @comment share/applications/

update-plist(1) kept moving entries like share/icons/, etc. from -gtk and -qt.
In the end all just prefixed them all with "@comment " to stop it and have
`make update-plist' no longer yield anything.

This seems like a bug in update-plist(1)... which I won't be hunting down.

Re: [update] net/transmission 4.0.2

2023-04-14 Thread Klemens Nanni

On Sat, Apr 15, 2023 at 01:09:22AM +0300, Kirill Bychkov wrote:
> On Wed, April 12, 2023 01:57, Josh Grosse wrote:
> > On Wed, Apr 12, 2023 at 12:18:47AM +0300, Kirill Bychkov wrote:
> >> On Fri, April 7, 2023 14:35, Josh Grosse wrote:
> >> > On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
> >> >> ..
> >> >> > +LIB_DEPENDS-common +=net/curl net/libpsl 
> >> >> > net/miniupnp/libnatpmp
> >> >> > +LIB_DEPENDS-common +=net/miniupnp/miniupnpc>=1.9
> >> >>
> >> >> would prefer one-per-line in LIB_DEPENDS like other ports do
> >> >
> >> > Done.
> >> >
> >> >> ..
> >> >> > +share/metainfo/
> >> >> > +share/metainfo/transmission-gtk.metainfo.xml
> >> >>
> >> >> that should be in PLIST-gtk
> >> >
> >> > Thank you for catching this. Corrected.
> >> >
> >> Hi,
> >> I guess share/transmission/translations/transmission_*.qm should go to
> >> PLIST-qt, not PLIST-main. Spotted while running update-plist with
> >> FLAVOR=no_qt.
> >
> > Thank you, Kirill!  "v3" diff attached.
> >
> 
> gtk flavor works fine for me on amd64. Qt not tested.
> 

Thanks everyone, I'll commit this tomorrow with all the PLIST fixes and
double checking yet again.

Re: [update] net/transmission 4.0.2

2023-04-14 Thread Kirill Bychkov

On Wed, April 12, 2023 01:57, Josh Grosse wrote:
> On Wed, Apr 12, 2023 at 12:18:47AM +0300, Kirill Bychkov wrote:
>> On Fri, April 7, 2023 14:35, Josh Grosse wrote:
>> > On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
>> >> ..
>> >> > +LIB_DEPENDS-common +=  net/curl net/libpsl net/miniupnp/libnatpmp
>> >> > +LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
>> >>
>> >> would prefer one-per-line in LIB_DEPENDS like other ports do
>> >
>> > Done.
>> >
>> >> ..
>> >> > +share/metainfo/
>> >> > +share/metainfo/transmission-gtk.metainfo.xml
>> >>
>> >> that should be in PLIST-gtk
>> >
>> > Thank you for catching this. Corrected.
>> >
>> Hi,
>> I guess share/transmission/translations/transmission_*.qm should go to
>> PLIST-qt, not PLIST-main. Spotted while running update-plist with
>> FLAVOR=no_qt.
>
> Thank you, Kirill!  "v3" diff attached.
>

gtk flavor works fine for me on amd64. Qt not tested.

Re: [update] net/transmission 4.0.2

2023-04-11 Thread Josh Grosse

On Wed, Apr 12, 2023 at 12:18:47AM +0300, Kirill Bychkov wrote:
> On Fri, April 7, 2023 14:35, Josh Grosse wrote:
> > On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
> >> ..
> >> > +LIB_DEPENDS-common +=   net/curl net/libpsl net/miniupnp/libnatpmp
> >> > +LIB_DEPENDS-common +=   net/miniupnp/miniupnpc>=1.9
> >>
> >> would prefer one-per-line in LIB_DEPENDS like other ports do
> >
> > Done.
> >
> >> ..
> >> > +share/metainfo/
> >> > +share/metainfo/transmission-gtk.metainfo.xml
> >>
> >> that should be in PLIST-gtk
> >
> > Thank you for catching this. Corrected.
> >
> Hi,
> I guess share/transmission/translations/transmission_*.qm should go to
> PLIST-qt, not PLIST-main. Spotted while running update-plist with 
> FLAVOR=no_qt.
 
Thank you, Kirill!  "v3" diff attached.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..cf5cbfa77a5 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,56 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+
+WANTLIB-qt +=  ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt +=  Qt6Widgets
+
+MODULES += devel/cmake textproc/intltool
+
+LIB_DEPENDS-common +=

Re: [update] net/transmission 4.0.2

2023-04-11 Thread Kirill Bychkov

On Fri, April 7, 2023 14:35, Josh Grosse wrote:
> On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
>> ..
>> > +LIB_DEPENDS-common += net/curl net/libpsl net/miniupnp/libnatpmp
>> > +LIB_DEPENDS-common += net/miniupnp/miniupnpc>=1.9
>>
>> would prefer one-per-line in LIB_DEPENDS like other ports do
>
> Done.
>
>> ..
>> > +share/metainfo/
>> > +share/metainfo/transmission-gtk.metainfo.xml
>>
>> that should be in PLIST-gtk
>
> Thank you for catching this. Corrected.
>
Hi,
I guess share/transmission/translations/transmission_*.qm should go to
PLIST-qt, not PLIST-main. Spotted while running update-plist with FLAVOR=no_qt.

Re: [update] net/transmission 4.0.2

2023-04-07 Thread Josh Grosse

On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
> ..
> > +LIB_DEPENDS-common +=  net/curl net/libpsl net/miniupnp/libnatpmp
> > +LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
> 
> would prefer one-per-line in LIB_DEPENDS like other ports do

Done.
 
> ..
> > +share/metainfo/
> > +share/metainfo/transmission-gtk.metainfo.xml
> 
> that should be in PLIST-gtk
 
Thank you for catching this. Corrected.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..cf5cbfa77a5 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,56 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+
+WANTLIB-qt +=  ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt +=  Qt6Widgets
+
+MODULES += devel/cmake textproc/intltool
+
+LIB_DEPENDS-common +=  net/curl 
+LIB_DEPENDS-common +=  net/libpsl
+LIB_DEPENDS-common +=  net/miniupnp/libnatpmp
+LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
 
-FIX_CRLF_FILES=third-party/libutp/*.h third-party/libutp/*.cpp
+LIB_DEPENDS-main = ${LIB_DEPENDS-common}
+
+LIB_DEPENDS-gtk += ${LIB_DEPENDS-common} x11/gtk3mm x11/gtk+3
+
+LIB_DEPENDS-qt +=

Re: [update] net/transmission 4.0.2

2023-04-07 Thread Stuart Henderson

On 2023/04/06 19:06, Josh Grosse wrote:
> -LIB_DEPENDS-common=devel/gettext,-runtime \
> - devel/libevent2 \
> - net/curl \
> - net/miniupnp/libnatpmp \
> - net/miniupnp/miniupnpc>=1.9
..
> +LIB_DEPENDS-common +=net/curl net/libpsl net/miniupnp/libnatpmp
> +LIB_DEPENDS-common +=net/miniupnp/miniupnpc>=1.9

would prefer one-per-line in LIB_DEPENDS like other ports do

> index 276f17fc393..3b32bec2996 100644
> --- a/net/transmission/pkg/PLIST-gtk
> +++ b/net/transmission/pkg/PLIST-gtk
> @@ -1,8 +1,6 @@
>  @pkgpath net/transmission,-gui
>  @bin bin/transmission-gtk
>  @man man/man1/transmission-gtk.1
> -share/appdata/
> -share/appdata/transmission-gtk.appdata.xml
...
> --- a/net/transmission/pkg/PLIST-main
> +++ b/net/transmission/pkg/PLIST-main
> @@ -22,81 +22,83 @@
..
> +share/metainfo/
> +share/metainfo/transmission-gtk.metainfo.xml

that should be in PLIST-gtk

[update] net/transmission 4.0.2

2023-04-06 Thread Josh Grosse

The attached patch has been prepared with Klemens Nanni's kind
guidance.  Without it, I would not have been able to complete
this diff.

We have both performed light testing of the application.

The key difference from the 4.0.1 diff submitted to ports@ previously
is that this builds with gtk+3, the version fallback is required due
to recent API changes found in gtk+4.10.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..4c4b5a4ef26 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,54 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+
+WANTLIB-qt +=  ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt +=  Qt6Widgets
+
+MODULES += devel/cmake textproc/intltool
+
+LIB_DEPENDS-common +=  net/curl net/libpsl net/miniupnp/libnatpmp
+LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
 
-FIX_CRLF_FILES=third-party/libutp/*.h third-party/libutp/*.cpp
+LIB_DEPENDS-main = ${LIB_DEPENDS-common}
+
+LIB_DEPENDS-gtk += ${LIB_DEPENDS-common} x11/gtk3mm x11/gtk+3
+
+LIB_DEPENDS-qt +=  ${LIB_DEPENDS-common} ${MODQT_LIB_DEPENDS}
+LIB_DEPENDS-qt +=  x11/qt6/qtsvg
+
+RUN_DEPENDS-gtk +=

Re: [update] net/transmission 4.0.1 - work in progress

2023-04-06 Thread Klemens Nanni

06.04.2023 12:51, Josh Grosse пишет:
> Upstream is now at 4.0.2.   I'd like to test that revision.   

4.0.2 shows 20 compile errors on am64, I have not looked into it.
Do you want to fix that and jump to .2 directly or commit what we have
and then work on the minor update?

Re: [update] net/transmission 4.0.1 - work in progress

2023-04-06 Thread Josh Grosse

On Thu, Apr 06, 2023 at 11:55:18AM +, Klemens Nanni wrote:
> On Tue, Mar 14, 2023 at 09:28:45PM -0400, Josh Grosse wrote:
> > I think this may be ready for testing by transmission users.
> 
> I saw now feedback on this.  Shall we commit?
> Works for me in light testing.

Upstream is now at 4.0.2.   I'd like to test that revision.

Re: [update] net/transmission 4.0.1 - work in progress

2023-04-06 Thread Klemens Nanni

On Tue, Mar 14, 2023 at 09:28:45PM -0400, Josh Grosse wrote:
> I think this may be ready for testing by transmission users.

I saw now feedback on this.  Shall we commit?
Works for me in light testing.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile
--- Makefile8 Nov 2022 11:17:02 -   1.140
+++ Makefile11 Mar 2023 12:46:12 -
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,62 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl ssl
+
+WANTLIB-main = ${WANTLIB-common}
+
+WANTLIB-gtk += ${WANTLIB-common} cairo cairo-gobject cairomm-1.16 
gdk_pixbuf-2.0
+WANTLIB-gtk += gio-2.0 giomm-2.68 glib-2.0 glibmm-2.68 gobject-2.0 graphene-1.0
+WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB-gtk += pangomm-2.48 sigc-3.0
+
+WANTLIB-qt += ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt += Qt6Widgets
+
+MODULES =  devel/cmake \
+   textproc/intltool
+
+LIB_DEPENDS-common=net/curl \
+   net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
 LIB_DEPENDS-main=${LIB_DEPENDS-common}
 LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
+   x11/gtkmm40 \
+   x11/gtk+4
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
+   ${MODQT_LIB_DEPENDS} \
+   x11/qt6/qtsvg
 
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
-   x11/gtk+3,-guic
+   x11/gtk+3,-guic \
+   x11/gtk+4,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
 
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
+CONFIGURE_ARGS =   -DENABLE_CLI=ON \
+   -DENABLE_TESTS=OFF
 
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
-
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
+# XXX sees ports libevent2 but picks base libevent expecting a single .so.*
+# use the bundle until upstream cmake code gets fixed
+CONFIGURE_ARGS +=  -DUSE_SYSTEM_EVENT2=OFF
+
+.if ${BUILD_PACKAGES:M-gtk}
+CONFIGURE_ARGS +=  -DENABLE_GTK=ON \
+

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-14 Thread Josh Grosse

On Sat, Mar 11, 2023 at 12:55:39PM +, Klemens Nanni wrote:
> 10.03.2023 20:47, Klemens Nanni ??:
> > +++ pkg/PLIST-main  10 Mar 2023 14:45:13 -
> > @@ -22,81 +22,84 @@
> >  @man man/man1/transmission-remote.1
> >  @man man/man1/transmission-show.1
> >  @comment share/applications/
> 
> (This @comment  can probably go well and then get cleaned up from
>  update-plist, now that I see it...)
> 
> > +share/doc/transmission/
> > +share/doc/transmission/AUTHORS
> > +share/doc/transmission/COPYING
> > +share/doc/transmission/README.md
> > +share/doc/transmission/news/
> > +share/doc/transmission/news/news-2.42-and-older.md
> [lots of news files]
> > +share/doc/transmission/news/news-4.0.1.md
> > +share/doc/transmission/rpc-spec.md
> > +share/doc/transmission/send-email-when-torrent-done.sh
> 
> These come from default INSTALL_DOC, either default =ON should put the
> script into the examples dir and account for its nail(1) usage, imho, or
> =OFF should be used to skip all those files.  Or just zap news/?

I've added INSTALL_DOC=NO to the Makefile, removed the @comment,
and updated the plist.  Thank you for your help and your guidance!

I think this may be ready for testing by transmission users.

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..8c18efcee02 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,63 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl ssl
+
+WANTLIB-main = ${WANTLIB-common}
+
+WANTLIB-gtk += ${WANTLIB-common} cairo cairo-gobject cairomm-1.16 
gdk_pixbuf-2.0
+WANTLIB-gtk += gio-2.0 giomm-2.68 glib-2.0 glibmm-2.68 gobject-2.0 graphene-1.0
+WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB-gtk += pangomm-2.48 sigc-3.0
+
+WANTLIB-qt += ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt += Qt6Widgets
+
+MODULES =  devel/cmake \
+   textproc/intltool
+
+LIB_DEPENDS-common=net/curl \
+   net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
 LIB_DEPENDS-main=${LIB_DEPENDS-common}
 LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
+   x11/gtkmm40 \
+   x11/gtk+4
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
+   ${MODQT_LIB_DEPENDS} \
+   x11/qt6/qtsvg
 
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
-   x11/gtk+3,-guic
+   x11/gtk+3,-guic \
+   x11/gtk+4,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
 
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS =   -DENABLE_CLI=ON \
+

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-11 Thread Josh Grosse

On Sat, Mar 11, 2023 at 12:55:39PM +, Klemens Nanni wrote:
> 10.03.2023 20:47, Klemens Nanni ??:
> > +++ pkg/PLIST-main  10 Mar 2023 14:45:13 -
> > @@ -22,81 +22,84 @@
> >  @man man/man1/transmission-remote.1
> >  @man man/man1/transmission-show.1
> >  @comment share/applications/
> 
> (This @comment  can probably go well and then get cleaned up from
>  update-plist, now that I see it...)
> 
> > +share/doc/transmission/
> > +share/doc/transmission/AUTHORS
> > +share/doc/transmission/COPYING
> > +share/doc/transmission/README.md
> > +share/doc/transmission/news/
> > +share/doc/transmission/news/news-2.42-and-older.md
> [lots of news files]
> > +share/doc/transmission/news/news-4.0.1.md
> > +share/doc/transmission/rpc-spec.md
> > +share/doc/transmission/send-email-when-torrent-done.sh
> 
> These come from default INSTALL_DOC, either default =ON should put the
> script into the examples dir and account for its nail(1) usage, imho, or
> =OFF should be used to skip all those files.  Or just zap news/?
> 
> 
> Enabling tests could be useful, they use a bundled gtest, though.
> Perhaps upstream could change that to allow system gtest?
> 
> 
> Regardless of the update, is transmission.rc's daemon_reload=NO still
> accurate?  In 4.0.1 ${WRKSRC}/daemon/daemon.cc I see
> 
> 750 /* If we got a SIGHUP during startup, process that now. */
> 751 if (seen_hup_)
> 752 {
> 753 reconfigure();
> 754 }
> 
> which looks like the daemon is reconfiguring on HUP, i.e. reloading.
 
Thank you, Klemens, for all your help.  I will review.

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-11 Thread Klemens Nanni

10.03.2023 20:47, Klemens Nanni пишет:
> +++ pkg/PLIST-main10 Mar 2023 14:45:13 -
> @@ -22,81 +22,84 @@
>  @man man/man1/transmission-remote.1
>  @man man/man1/transmission-show.1
>  @comment share/applications/

(This @comment  can probably go well and then get cleaned up from
 update-plist, now that I see it...)

> +share/doc/transmission/
> +share/doc/transmission/AUTHORS
> +share/doc/transmission/COPYING
> +share/doc/transmission/README.md
> +share/doc/transmission/news/
> +share/doc/transmission/news/news-2.42-and-older.md
[lots of news files]
> +share/doc/transmission/news/news-4.0.1.md
> +share/doc/transmission/rpc-spec.md
> +share/doc/transmission/send-email-when-torrent-done.sh

These come from default INSTALL_DOC, either default =ON should put the
script into the examples dir and account for its nail(1) usage, imho, or
=OFF should be used to skip all those files.  Or just zap news/?


Enabling tests could be useful, they use a bundled gtest, though.
Perhaps upstream could change that to allow system gtest?


Regardless of the update, is transmission.rc's daemon_reload=NO still
accurate?  In 4.0.1 ${WRKSRC}/daemon/daemon.cc I see

750 /* If we got a SIGHUP during startup, process that now. */
751 if (seen_hup_)
752 {
753 reconfigure();
754 }

which looks like the daemon is reconfiguring on HUP, i.e. reloading.

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Klemens Nanni

10.03.2023 19:57, Josh Grosse пишет:
> On Fri, Mar 10, 2023 at 03:09:42PM +, Klemens Nanni wrote:
> [snip]
>> Here is a diff using cmake, qt6 and gtk4 as per upstream defaults.
>> Above mentioned cmake issues should be mentioned upstream.
>> The one new local patch is trivial, free PR for anyone taking their time.
>>
>> Both gtk and qt run fine on amd64 for me.
> 
> Thank you for your diff!  
> 
> 1. I needed to add a BUILD_DEPENDS for x11/qt6/qttools to complete the
> qt configure step; it wasn't pre-installed on my build system when I began.  

Yeah, I did not go over all the little details.

> 2. transmission-gtk now produces a locale warning here. I'm not sure how
> to correct it as I'm one of those en_US.UTF-8 users who never pays any
> attention to locale -- until something like this happens and then I just
> stare at the screen with a slack-jawed gaze.
> 
> ** (transmission-gtk:32822): WARNING **: 14:20:24.974: Can't make the global 
> C++ locale equal to the C locale.
>collate_byname::collate_byname failed to construct for 
> C/en_US.UTF-8/C/C/C/C
>C locale = C/en_US.UTF-8/C/C/C/C

I don't see that, it starts from console without any warning and
different locales yield different languages... so works for me.

>  
> I have some additional minor changes to your Makefile:
> 
>   * the BDEP noted above
>   * 2 lines of WANTLIB-qt per port-lib-depends-check

Oops, I just missed WANTLIB-common for -qt.

>   * RDEP adds and deletes according to portcheck(1)
>   * MASTER_SITES over 2 lines to fit within 80 chars, per portcheck().

As you like, I think we have many >80chars ports due to MASTER_SITES.

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index ae7a342a6b4..6c384373071 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -14,7 +14,8 @@ MAINTAINER= Josh Grosse 
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
>  
> -MASTER_SITES=
> https://github.com/transmission/transmission/releases/download/${VER}/
> +MASTER_SITES=\
> + https://github.com/transmission/transmission/releases/download/${VER}/
>  EXTRACT_SUFX=.tar.xz
>  
>  MULTI_PACKAGES=  -main -gtk -qt
> @@ -22,7 +23,6 @@ MULTI_PACKAGES= -main -gtk -qt
>  # gnu++17
>  COMPILER =   base-clang ports-gcc
>  
> -
>  PSEUDO_FLAVORS=  no_gtk no_qt
>  FLAVOR?=
>  
> @@ -38,12 +38,13 @@ WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 
> pangocairo-1.0
>  WANTLIB-gtk += pangomm-2.48 sigc-3.0
>  
>  WANTLIB-qt += GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg Qt6Widgets
> +WANTLIB-qt += ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp
> +WANTLIB-qt += psl ssl

Looks like you inlined WANTLIB-common and this diff applies neither to
-current nor on top of my diff.

>  
>  MODULES =devel/cmake \
>   textproc/intltool
>  
> -LIB_DEPENDS-common=devel/gettext,-runtime \
> - net/curl \
> +LIB_DEPENDS-common=net/curl \
>   net/libpsl \
>   net/miniupnp/libnatpmp \
>   net/miniupnp/miniupnpc>=1.9
> @@ -57,6 +58,7 @@ LIB_DEPENDS-qt= ${LIB_DEPENDS-common} \
>  
>  RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
>   devel/desktop-file-utils \
> + x11/gtk+3,-guic \
>   x11/gtk+4,-guic

I *think* we only need one of those, but I could be wrong and won't dig
into that now.

>  RUN_DEPENDS-qt=  ${PKGNAME-main}:${BUILD_PKGPATH} \
>   devel/desktop-file-utils
> @@ -80,6 +82,7 @@ MODULES +=  x11/qt6
>  # XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
>  CONFIGURE_ARGS +=-DENABLE_QT=ON \
>   -DUSE_QT_VERSION=6
> +BUILD_DEPENDS+=  x11/qt6/qttools
>  .else
>  CONFIGURE_ARGS +=-DENABLE_QT=OFF
>  .endif

New diff with your findings manually amended.

Just helping out, I am not using transmission myself, so others should
test and decide if this update should make it into release.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile
--- Makefile8 Nov 2022 11:17:02 -   1.140
+++ Makefile10 Mar 2023 20:33:06 -
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Josh Grosse

On Fri, Mar 10, 2023 at 03:09:42PM +, Klemens Nanni wrote:
[snip]
> Here is a diff using cmake, qt6 and gtk4 as per upstream defaults.
> Above mentioned cmake issues should be mentioned upstream.
> The one new local patch is trivial, free PR for anyone taking their time.
> 
> Both gtk and qt run fine on amd64 for me.

Thank you for your diff!  

1. I needed to add a BUILD_DEPENDS for x11/qt6/qttools to complete the
qt configure step; it wasn't pre-installed on my build system when I began.  

2. transmission-gtk now produces a locale warning here. I'm not sure how
to correct it as I'm one of those en_US.UTF-8 users who never pays any
attention to locale -- until something like this happens and then I just
stare at the screen with a slack-jawed gaze.

** (transmission-gtk:32822): WARNING **: 14:20:24.974: Can't make the global 
C++ locale equal to the C locale.
   collate_byname::collate_byname failed to construct for 
C/en_US.UTF-8/C/C/C/C
   C locale = C/en_US.UTF-8/C/C/C/C

I have some additional minor changes to your Makefile:

  * the BDEP noted above
  * 2 lines of WANTLIB-qt per port-lib-depends-check
  * RDEP adds and deletes according to portcheck(1)
  * MASTER_SITES over 2 lines to fit within 80 chars, per portcheck().

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index ae7a342a6b4..6c384373071 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=   Josh Grosse 
 # GPLv2+
 PERMIT_PACKAGE=Yes

-MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
+MASTER_SITES=  \
+   https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz

 MULTI_PACKAGES=-main -gtk -qt
@@ -22,7 +23,6 @@ MULTI_PACKAGES=   -main -gtk -qt
 # gnu++17
 COMPILER = base-clang ports-gcc

-
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=

@@ -38,12 +38,13 @@ WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 
pangocairo-1.0
 WANTLIB-gtk += pangomm-2.48 sigc-3.0

 WANTLIB-qt += GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg Qt6Widgets
+WANTLIB-qt += ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp
+WANTLIB-qt += psl ssl

 MODULES =  devel/cmake \
textproc/intltool

-LIB_DEPENDS-common=devel/gettext,-runtime \
-   net/curl \
+LIB_DEPENDS-common=net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
@@ -57,6 +58,7 @@ LIB_DEPENDS-qt=   ${LIB_DEPENDS-common} \

 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
+   x11/gtk+3,-guic \
x11/gtk+4,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
@@ -80,6 +82,7 @@ MODULES +=x11/qt6
 # XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
 CONFIGURE_ARGS +=  -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
+BUILD_DEPENDS+=x11/qt6/qttools
 .else
 CONFIGURE_ARGS +=  -DENABLE_QT=OFF
 .endif

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Klemens Nanni

On Fri, Mar 10, 2023 at 03:09:42PM +, Klemens Nanni wrote:
> transmission's cmake code finds and prints libevent2's 2.1.12, but ends up
> always using base libevent.so.* which I have not been able to fix.
> 
> Looks like transmission wants to link against a single -levent like base,
> but ports only has libevent_* libraries.
> 
> Perhaps this fixes itselt when devel/libevent2 switches to cmake and
> provides .cmake files or consumers, maybe this needs more fixing.
> 
> For now, I'd just build the bundled copy as you already found out.

libevent2's CMakeLists.txt has this comment:

# library exists for historical reasons; it contains the contents of
# both libevent_core and libevent_extra. You shouldn’t use it; it may
# go away in a future version of Libevent.

devel/libevent2 currently builds with autoconf and does not ship this -levent.
Switching to cmake enables it (by default), but seeing this comment now,
I recommend opening an issue with transmission and getting their code to use
event_* properly.

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Klemens Nanni

On Thu, Mar 09, 2023 at 06:02:31PM -0500, Josh Grosse wrote:
> The attached "version 1" patch is a work-in-progress; I'm looking for
> advice and corrections
> 
> 1) I have (temporarily) disabled the Qt subpackage 
>build, because upstream has switched to using CMake for
>everything, and I do not know enough about either CMake
>or QMake to get it to build. I could use some help here,
>as it won't build under CMake and with QMake it looks for
>a Makefile which doesn't exist.

Mixing autoconf/cmake/qmake is a bad idea, better use cmake for everything.

transmission's cmake code "supports" Qt 5 and 6, but USE_QT_VERSION=5 fails
to find "Qt" whereas USE_QT_VERSION=6 properly finds "Qt6".

By default, 6 is tried first, so just use that.

> 2) I am having an issue with "size mismatch" warnings as both 
>libevent and devel/libevent2 are required by the main and
>gtk subpackages.  

transmission's cmake code finds and prints libevent2's 2.1.12, but ends up
always using base libevent.so.* which I have not been able to fix.

Looks like transmission wants to link against a single -levent like base,
but ports only has libevent_* libraries.

Perhaps this fixes itselt when devel/libevent2 switches to cmake and
provides .cmake files or consumers, maybe this needs more fixing.

For now, I'd just build the bundled copy as you already found out.

> 
> The updated programs:
> 
> transmission-daemon
> transmission-cli
> transmission-gtk 
> 
> have had limited testing on amd64.
> 
> Thanks in advance for any cluebats!

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 3deb9382f4a..ff6ce4c8891 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -1,89 +1,88 @@
>  COMMENT-main=BitTorrent command line and daemon client
>  COMMENT-gtk= BitTorrent client with GTK+ interface
> -COMMENT-qt=  BitTorrent client with Qt interface
> +#COMMENT-qt= BitTorrent client with Qt interface
>  
>  NOT_FOR_ARCHS-gtk= sparc64
> -NOT_FOR_ARCHS-qt= sparc64
> +#NOT_FOR_ARCHS-qt= sparc64

...

> -ONLY_FOR_ARCHS-qt=   ${MODGCC4_ARCHS} ${CLANG_ARCHS}
> +#ONLY_FOR_ARCHS-qt=  ${MODGCC4_ARCHS} ${CLANG_ARCHS}
>  
>  COMPILER =   base-clang ports-gcc
>  COMPILER_LANGS = c

The whole project switched to modern C++ and deps, so *_ARCHS-* bits seem
obsolete now.


Here is a diff using cmake, qt6 and gtk4 as per upstream defaults.
Above mentioned cmake issues should be mentioned upstream.
The one new local patch is trivial, free PR for anyone taking their time.

Both gtk and qt run fine on amd64 for me.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile
--- Makefile8 Nov 2022 11:17:02 -   1.140
+++ Makefile10 Mar 2023 15:04:52 -
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,60 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl ssl
+
+WANTLIB-main =

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Josh Grosse

On Fri, Mar 10, 2023 at 03:20:51PM +0100, Antoine Jacoutot wrote:
> On Fri, Mar 10, 2023 at 09:10:56AM -0500, Josh Grosse wrote:
> > On Fri, Mar 10, 2023 at 07:37:20AM +, Stuart Henderson wrote:
> > > On 2023/03/09 18:02, Josh Grosse wrote:
> > > > 2) I am having an issue with "size mismatch" warnings as both 
> > > >libevent and devel/libevent2 are required by the main and
> > > >gtk subpackages.  
> > > 
> > > Mixing the two won't work, it will need to use either one or the other.
> >  
> > Thanks, got that cured by adding to the CMakeLists.txt patch:
> > 
> > -tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
> > +tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" OFF)
> 
> You should just be able to add -DUSE_SYSTEM_EVENT2=Off to CONFIGURE_ARGS, no?

Yes, that works too, with an upper-case OFF.  Better in the Makefile than the
patch file.  Thanks!

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Antoine Jacoutot

On Fri, Mar 10, 2023 at 09:10:56AM -0500, Josh Grosse wrote:
> On Fri, Mar 10, 2023 at 07:37:20AM +, Stuart Henderson wrote:
> > On 2023/03/09 18:02, Josh Grosse wrote:
> > > 2) I am having an issue with "size mismatch" warnings as both 
> > >libevent and devel/libevent2 are required by the main and
> > >gtk subpackages.  
> > 
> > Mixing the two won't work, it will need to use either one or the other.
>  
> Thanks, got that cured by adding to the CMakeLists.txt patch:
> 
> -tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
> +tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" OFF)

You should just be able to add -DUSE_SYSTEM_EVENT2=Off to CONFIGURE_ARGS, no?

-- 
Antoine

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-10 Thread Josh Grosse

On Fri, Mar 10, 2023 at 07:37:20AM +, Stuart Henderson wrote:
> On 2023/03/09 18:02, Josh Grosse wrote:
> > 2) I am having an issue with "size mismatch" warnings as both 
> >libevent and devel/libevent2 are required by the main and
> >gtk subpackages.  
> 
> Mixing the two won't work, it will need to use either one or the other.

Thanks, got that cured by adding to the CMakeLists.txt patch:

-tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
+tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" OFF)

and then removing the base `event` from Makefile WANTLIBs.  

kn@ wrote to me off-list that he may be able to look at the Qt issue.
I'll post an updated diff once that problem is solved.

Thanks again, as always!

Re: [update] net/transmission 4.0.1 - work in progress

2023-03-09 Thread Stuart Henderson

On 2023/03/09 18:02, Josh Grosse wrote:
> 2) I am having an issue with "size mismatch" warnings as both 
>libevent and devel/libevent2 are required by the main and
>gtk subpackages.  

Mixing the two won't work, it will need to use either one or the other.

[update] net/transmission 4.0.1 - work in progress

2023-03-09 Thread Josh Grosse

The attached "version 1" patch is a work-in-progress; I'm looking for
advice and corrections

1) I have (temporarily) disabled the Qt subpackage 
   build, because upstream has switched to using CMake for
   everything, and I do not know enough about either CMake
   or QMake to get it to build. I could use some help here,
   as it won't build under CMake and with QMake it looks for
   a Makefile which doesn't exist.
   
2) I am having an issue with "size mismatch" warnings as both 
   libevent and devel/libevent2 are required by the main and
   gtk subpackages.  

The updated programs:

transmission-daemon
transmission-cli
transmission-gtk 

have had limited testing on amd64.

Thanks in advance for any cluebats!
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..ff6ce4c8891 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -1,89 +1,88 @@
 COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
-COMMENT-qt=BitTorrent client with Qt interface
+#COMMENT-qt=   BitTorrent client with Qt interface
 
 NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
+#NOT_FOR_ARCHS-qt= sparc64
 
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
-PKGNAME-qt=transmission-qt-${VER}
+#PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  \
+   https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
-MULTI_PACKAGES=-main -gtk -qt
+#MULTI_PACKAGES=   -main -gtk -qt
+MULTI_PACKAGES=-main -gtk
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
+#ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS} ${CLANG_ARCHS}
 
 COMPILER = base-clang ports-gcc
 COMPILER_LANGS =   c
 
 
-PSEUDO_FLAVORS=no_gtk no_qt
+#PSEUDO_FLAVORS=   no_gtk no_qt
+PSEUDO_FLAVORS=no_gtk
 FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
+WANTLIB-common=${COMPILER_LIBCXX} c crypto curl event \
+   event_core event_extra intl m miniupnpc>=2.0 \
+   natpmp psl pthread ssl
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo \
+   cairo-gobject cairomm-1.0 event gdk-3 \
+   gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 \
+   glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0 \
+   harfbuzz pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+#WANTLIB-qt=   ${WANTLIB-common} ${MODQT_WANTLIB} \
+#  GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+#  fontconfig freetype $(COMPILER_LIBCXX)
+
+MODULES+=  textproc/intltool devel/cmake
 
 LIB_DEPENDS-common=devel/gettext,-runtime \
devel/libevent2 \
net/curl \
+   net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
 LIB_DEPENDS-main=${LIB_DEPENDS-common}
 LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
+   devel/atk2mm \
+   devel/glib2mm \
+   devel/libsigc++-2 \
+   devel/pangomm \
+   graphics/cairomm \
+   x11/gtk3mm \
x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
${MODQT_LIB_DEPENDS}
 
+RUN_DEPENDS-main=x11/gtk+3,-guic
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+3,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
 
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=

Re: [update] net/transmission

2020-07-01 Thread Josh Grosse

"Ping."  

On Sat, May 23, 2020 at 02:20:38PM -0400, Josh Grosse wrote:
> Update from 2.94 to 3.00
> 
> Changelog: https://github.com/transmission/transmission/releases/tag/3.00

> Index: Makefile
> ===
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- Makefile  12 Jul 2019 20:48:50 -  1.134
> +++ Makefile  23 May 2020 18:01:27 -
> @@ -7,7 +7,7 @@ COMMENT-qt=   BitTorrent client with Qt in
>  NOT_FOR_ARCHS-gtk= sparc64
>  NOT_FOR_ARCHS-qt= sparc64
>  
> -VER= 2.94
> +VER= 3.00
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
> @@ -15,9 +15,6 @@ PKGNAME-qt= transmission-qt-${VER}
>  CATEGORIES=  net
>  HOMEPAGE=https://transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
> -REVISION-gtk=4
> -REVISION-qt= 4
> -REVISION-main=   2
>  
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
> @@ -43,8 +40,8 @@ WANTLIB-common= c crypto curl event_core
>  WANTLIB-main=${WANTLIB-common} nghttp2 iconv
>  WANTLIB-gtk= ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
>   Xext Xfixes Xi Xinerama Xrandr Xrender \
> - atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
> - dbus-1 expat ffi fontconfig freetype fribidi \
> + atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
> + expat ffi fontconfig freetype fribidi \
>   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
>   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
>   harfbuzz pango-1.0 pangoft2-1.0 \
> Index: distinfo
> ===
> RCS file: /systems/cvs/ports/net/transmission/distinfo,v
> retrieving revision 1.52
> diff -u -p -r1.52 distinfo
> --- distinfo  14 May 2018 21:23:59 -  1.52
> +++ distinfo  23 May 2020 17:46:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-2.94.tar.xz) = 
> NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
> -SIZE (transmission-2.94.tar.xz) = 3365952
> +SHA256 (transmission-3.00.tar.xz) = 
> kURlL+dC9/fdZldxbjeNpgt1Gq7ai++DRLPu/E2yVfI=
> +SIZE (transmission-3.00.tar.xz) = 3329220
> Index: pkg/PLIST-gtk
> ===
> RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-gtk,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST-gtk
> --- pkg/PLIST-gtk 29 Jun 2018 22:16:19 -  1.11
> +++ pkg/PLIST-gtk 23 May 2020 18:15:10 -
> @@ -5,163 +5,89 @@
>  share/applications/transmission-gtk.desktop
>  share/icons/
>  share/icons/hicolor/
> -share/icons/hicolor/16x16/
> -share/icons/hicolor/16x16/apps/
> -share/icons/hicolor/16x16/apps/transmission.png
> -share/icons/hicolor/22x22/
> -share/icons/hicolor/22x22/apps/
> -share/icons/hicolor/22x22/apps/transmission.png
> -share/icons/hicolor/24x24/
> -share/icons/hicolor/24x24/apps/
> -share/icons/hicolor/24x24/apps/transmission.png
> -share/icons/hicolor/256x256/
> -share/icons/hicolor/256x256/apps/
> -share/icons/hicolor/256x256/apps/transmission.png
> -share/icons/hicolor/32x32/
> -share/icons/hicolor/32x32/apps/
> -share/icons/hicolor/32x32/apps/transmission.png
> -share/icons/hicolor/48x48/
> -share/icons/hicolor/48x48/apps/
> -share/icons/hicolor/48x48/apps/transmission.png
>  share/icons/hicolor/scalable/
>  share/icons/hicolor/scalable/apps/
>  share/icons/hicolor/scalable/apps/transmission.svg
> -share/locale/an/
> -share/locale/an/LC_MESSAGES/
>  share/locale/an/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ar/
> -share/locale/ar/LC_MESSAGES/
>  share/locale/ar/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ast/
> -share/locale/ast/LC_MESSAGES/
>  share/locale/ast/LC_MESSAGES/transmission-gtk.mo
> -share/locale/az/
> -share/locale/az/LC_MESSAGES/
>  share/locale/az/LC_MESSAGES/transmission-gtk.mo
>  share/locale/be/LC_MESSAGES/transmission-gtk.mo
> -share/locale/be@latin/
> -share/locale/be@latin/LC_MESSAGES/
> -share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
>  share/locale/bg/LC_MESSAGES/transmission-gtk.mo
> -share/locale/bn/
> -share/locale/bn/LC_MESSAGES/
>  share/locale/bn/LC_MESSAGES/transmission-gtk.mo
>  share/locale/bo/
>  share/locale/bo/LC_MESSAGES/
>  share/locale/bo/LC_MESSAGES/transmission-gtk.mo
> -share/locale/br/
> -share/locale/br/LC_MESSAGES/
>  share/locale/br/LC_MESSAGES/transmission-gtk.mo
> -share/locale/bs/
> -share/locale/bs/LC_MESSAGES/
>  share/locale/bs/LC_MESSAGES/transmission-gtk.mo
>  share/locale/ca/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ca@valencia/
> -share/locale/ca@valencia/LC_MESSAGES/
>  share/locale/ca@valencia/LC_MESSAGES/transmission-gtk.mo
>  share/locale/ceb/
>  share/locale/ceb/LC_MESSAGES/
>  share/locale/ceb/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ckb/
> -share/locale/ckb/LC_MESSAGES/
>  share/locale/ckb/LC_MESSAGES/transmission-gtk.mo
>

[update] net/transmission

2020-05-23 Thread Josh Grosse

Update from 2.94 to 3.00

Changelog: https://github.com/transmission/transmission/releases/tag/3.00
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- Makefile12 Jul 2019 20:48:50 -  1.134
+++ Makefile23 May 2020 18:01:27 -
@@ -7,7 +7,7 @@ COMMENT-qt= BitTorrent client with Qt in
 NOT_FOR_ARCHS-gtk= sparc64
 NOT_FOR_ARCHS-qt= sparc64
 
-VER=   2.94
+VER=   3.00
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -15,9 +15,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  4
-REVISION-qt=   4
-REVISION-main= 2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
@@ -43,8 +40,8 @@ WANTLIB-common=   c crypto curl event_core
 WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
 WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
-   dbus-1 expat ffi fontconfig freetype fribidi \
+   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
+   expat ffi fontconfig freetype fribidi \
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
harfbuzz pango-1.0 pangoft2-1.0 \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.52
diff -u -p -r1.52 distinfo
--- distinfo14 May 2018 21:23:59 -  1.52
+++ distinfo23 May 2020 17:46:46 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.94.tar.xz) = 
NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
-SIZE (transmission-2.94.tar.xz) = 3365952
+SHA256 (transmission-3.00.tar.xz) = 
kURlL+dC9/fdZldxbjeNpgt1Gq7ai++DRLPu/E2yVfI=
+SIZE (transmission-3.00.tar.xz) = 3329220
Index: pkg/PLIST-gtk
===
RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-gtk,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-gtk
--- pkg/PLIST-gtk   29 Jun 2018 22:16:19 -  1.11
+++ pkg/PLIST-gtk   23 May 2020 18:15:10 -
@@ -5,163 +5,89 @@
 share/applications/transmission-gtk.desktop
 share/icons/
 share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/transmission.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
-share/icons/hicolor/22x22/apps/transmission.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/transmission.png
-share/icons/hicolor/256x256/
-share/icons/hicolor/256x256/apps/
-share/icons/hicolor/256x256/apps/transmission.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/transmission.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/transmission.png
 share/icons/hicolor/scalable/
 share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/transmission.svg
-share/locale/an/
-share/locale/an/LC_MESSAGES/
 share/locale/an/LC_MESSAGES/transmission-gtk.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/transmission-gtk.mo
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
 share/locale/ast/LC_MESSAGES/transmission-gtk.mo
-share/locale/az/
-share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/transmission-gtk.mo
 share/locale/be/LC_MESSAGES/transmission-gtk.mo
-share/locale/be@latin/
-share/locale/be@latin/LC_MESSAGES/
-share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
 share/locale/bg/LC_MESSAGES/transmission-gtk.mo
-share/locale/bn/
-share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/transmission-gtk.mo
 share/locale/bo/
 share/locale/bo/LC_MESSAGES/
 share/locale/bo/LC_MESSAGES/transmission-gtk.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
 share/locale/br/LC_MESSAGES/transmission-gtk.mo
-share/locale/bs/
-share/locale/bs/LC_MESSAGES/
 share/locale/bs/LC_MESSAGES/transmission-gtk.mo
 share/locale/ca/LC_MESSAGES/transmission-gtk.mo
-share/locale/ca@valencia/
-share/locale/ca@valencia/LC_MESSAGES/
 share/locale/ca@valencia/LC_MESSAGES/transmission-gtk.mo
 share/locale/ceb/
 share/locale/ceb/LC_MESSAGES/
 share/locale/ceb/LC_MESSAGES/transmission-gtk.mo
-share/locale/ckb/
-share/locale/ckb/LC_MESSAGES/
 share/locale/ckb/LC_MESSAGES/transmission-gtk.mo
 share/locale/cs/LC_MESSAGES/transmission-gtk.mo
+share/locale/cy/LC_MESSAGES/transmission-gtk.mo
 share/locale/da/LC_MESSAGES/transmission-gtk.mo
 share/locale/de/LC_MESSAGES/transmission-gtk.mo
 share/locale/el/LC_MESSAGES/transmission-gtk.mo
 share/locale/en_AU/
 share/locale/en_AU/LC_MESSAGES/

[update] net/transmission

2018-05-03 Thread Josh Grosse

=== Transmission 2.94 (2018/05/01) ===

 All Platforms 
  * Fix building against LibreSSL (#284, #486, #570)
  * Fix building against mbedTLS (#115, #528)
  * Fix torrents ETA calculation (#522)
  * Fix cross-compilation issues caused by miniupnpc configuration test (#475)
 Qt Client 
  * Fix bad downloaded percentage in DetailsDialog  (#547)
 Web Client 
  * Fix tracker error XSS in inspector (CVE pending)
  * Fix torrent name HTML-escaping in trackers inspector tabTODO

Because there is a CVE noted for the Web Client, please find backported -stable 
updates
attached for 6.3 and 6.2.

Gtk, Qt, and Web clients tested on amd64 and i386 at -current, 6.3, and 6.2.
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.125
diff -u -p -r1.125 Makefile
--- Makefile24 Apr 2018 12:52:12 -  1.125
+++ Makefile2 May 2018 10:28:44 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.93
+VER=   2.94
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -12,7 +12,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION=  0
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -39,12 +38,12 @@ WANTLIB-main=   ${WANTLIB-common} nghttp2 
 WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
-   dbus-1 expat ffi fontconfig freetype \
+   dbus-1 expat ffi fontconfig freetype fribidi \
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv Xtst
+   xcb-render xcb-shm epoxy nghttp2 iconv
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
fontconfig freetype $(COMPILER_LIBCXX)
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo30 Jan 2018 16:34:35 -  1.51
+++ distinfo1 May 2018 20:18:44 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
-SIZE (transmission-2.93.tar.xz) = 3363868
+SHA256 (transmission-2.94.tar.xz) = 
NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
+SIZE (transmission-2.94.tar.xz) = 3365952
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.124
diff -u -p -r1.124 Makefile
--- Makefile30 Jan 2018 16:34:35 -  1.124
+++ Makefile3 May 2018 05:08:24 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.93
+VER=   2.94
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo30 Jan 2018 16:34:35 -  1.51
+++ distinfo3 May 2018 05:41:12 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
-SIZE (transmission-2.93.tar.xz) = 3363868
+SHA256 (transmission-2.94.tar.xz) = 
NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
+SIZE (transmission-2.94.tar.xz) = 3365952
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.118.2.1
diff -u -p -r1.118.2.1 Makefile
--- Makefile30 Jan 2018 17:37:15 -  1.118.2.1
+++ Makefile3 May 2018 20:54:06 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.93
+VER=   2.94
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.50.6.1
diff -u -p -r1.50.6.1 distinfo
--- distinfo30 Jan

Re: [update] net/transmission

2018-01-25 Thread Josh Grosse

I was advised via private Email to update $HOMEPAGE.

Version 2 of both patch sets are attached.
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile12 Jan 2018 16:09:42 -  1.122
+++ Makefile25 Jan 2018 11:25:50 -
@@ -4,15 +4,13 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.92
+VER=   2.93
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
-REVISION-main= 6
 CATEGORIES=net
-HOMEPAGE=  http://www.transmissionbt.com/
+HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
 
 # GPLv2+
@@ -39,7 +37,7 @@ FLAVOR?=
 WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
natpmp pthread ssl z intl
 WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -47,7 +45,7 @@ WANTLIB-gtk=  ${WANTLIB-common} ICE SM X1
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv
+   xcb-render xcb-shm epoxy nghttp2 iconv Xtst
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
fontconfig freetype $(COMPILER_LIBCXX)
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo8 Mar 2016 16:14:16 -   1.50
+++ distinfo24 Jan 2018 01:02:17 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
-SIZE (transmission-2.92.tar.xz) = 3378116
+SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
+SIZE (transmission-2.93.tar.xz) = 3363868
Index: patches/patch-libtransmission_crypto-utils-openssl_c
===
RCS file: patches/patch-libtransmission_crypto-utils-openssl_c
diff -N patches/patch-libtransmission_crypto-utils-openssl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_crypto-utils-openssl_c25 Jan 2018 
04:21:09 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Use upstream provided OpenSSL functions
+
+Index: libtransmission/crypto-utils-openssl.c
+--- libtransmission/crypto-utils-openssl.c.orig
 libtransmission/crypto-utils-openssl.c
+@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t   handle,
+ 
+ ***/
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010
++#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
+ static inline int
+ DH_set0_pqg (DH * dh,
+  BIGNUM * p,
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- Makefile26 Jul 2017 22:45:28 -  1.118
+++ Makefile25 Jan 2018 11:27:17 -
@@ -4,14 +4,13 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.92
+VER=   2.93
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  4
 CATEGORIES=net
-HOMEPAGE=  http://www.transmissionbt.com/
+HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
 
 # GPLv2+
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo8 Mar 2016 16:14:16 -   1.50
+++ distinfo25 Jan 2018 11:27:17 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
-SIZE (transmission-2.92.tar.xz) = 3378116
+SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
+SIZE (transmission-2.93.tar.xz) = 3363868
Index: patches/patch-libtransmission_crypto-utils-openssl_c
===
RCS file: patches/patch-libtransmission_crypto-utils-openssl_c

[update] net/transmission

2018-01-24 Thread Josh Grosse

This updates net/transmission from 2.92 -> 2.93.

This includes a fix for CVE-2018-5702, so there are two
MIME attachments.  

net.transmission.patch is for -current
net.transmission.stable.patch is for -stable

Both were tested on amd64.
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile12 Jan 2018 16:09:42 -  1.122
+++ Makefile25 Jan 2018 04:39:13 -
@@ -4,13 +4,11 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.92
+VER=   2.93
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
-REVISION-main= 6
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 MAINTAINER=Josh Grosse 
@@ -39,7 +37,7 @@ FLAVOR?=
 WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
natpmp pthread ssl z intl
 WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -47,7 +45,7 @@ WANTLIB-gtk=  ${WANTLIB-common} ICE SM X1
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv
+   xcb-render xcb-shm epoxy nghttp2 iconv Xtst
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
fontconfig freetype $(COMPILER_LIBCXX)
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo8 Mar 2016 16:14:16 -   1.50
+++ distinfo24 Jan 2018 01:02:17 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
-SIZE (transmission-2.92.tar.xz) = 3378116
+SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
+SIZE (transmission-2.93.tar.xz) = 3363868
Index: patches/patch-libtransmission_crypto-utils-openssl_c
===
RCS file: patches/patch-libtransmission_crypto-utils-openssl_c
diff -N patches/patch-libtransmission_crypto-utils-openssl_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_crypto-utils-openssl_c25 Jan 2018 
04:21:09 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Use upstream provided OpenSSL functions
+
+Index: libtransmission/crypto-utils-openssl.c
+--- libtransmission/crypto-utils-openssl.c.orig
 libtransmission/crypto-utils-openssl.c
+@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t   handle,
+ 
+ ***/
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010
++#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
+ static inline int
+ DH_set0_pqg (DH * dh,
+  BIGNUM * p,
? net.transmission.stable.patch
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- Makefile26 Jul 2017 22:45:28 -  1.118
+++ Makefile25 Jan 2018 05:09:06 -
@@ -4,12 +4,11 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.92
+VER=   2.93
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  4
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 MAINTAINER=Josh Grosse 
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- distinfo8 Mar 2016 16:14:16 -   1.50
+++ distinfo25 Jan 2018 05:09:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
-SIZE (transmission-2.92.tar.xz) = 3378116
+SHA256 (transmission-2.93.tar.xz) = 
iBWSDgpEmbza276JpBFQktq0LOUZn3H/mpJs/RK5uQs=
+SIZE (transmission-2.93.tar.xz) = 3363868
Index: patches/patch-libtransmission_crypto-utils-openssl_c

Re: [UPDATE] net/transmission

2016-09-21 Thread Josh Grosse

On Wed, Sep 21, 2016 at 11:03:11PM +0200, Rafael Sadowski wrote:

> http(s)?!
 
The committed diff:

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- Makefile1 Sep 2016 10:53:27 -   1.106
+++ Makefile21 Sep 2016 10:52:51 -  1.107
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.106 2016/09/01 10:53:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.107 2016/09/21 10:52:51 sthen Exp $
 
 COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
@@ -17,7 +17,7 @@ MAINTAINER=   Josh Grosse

Re: [UPDATE] net/transmission

2016-09-21 Thread Rafael Sadowski

On Wed Sep 21, 2016 at 06:46:30AM -0400, Josh Grosse wrote:
> On Wed, Sep 21, 2016 at 06:30:50AM -0400, Josh Grosse wrote:
> > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote:
> > > They still have proper tarballs, this is identical to the previous one:
> > > 
> > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz
> > 
> > Thank you, Sir.  But is there a GH_* mechanism to fetch it?  Or should I set
> > MASTER_SITES_GITHUB instead?
> > 
> Heh.  I can just set MASTER_SITES instead.  Here is a smaller diff

> Index: Makefile
> ===
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.106
> diff -u -p -r1.106 Makefile
> --- Makefile  1 Sep 2016 10:53:27 -   1.106
> +++ Makefile  21 Sep 2016 10:41:13 -
> @@ -9,7 +9,7 @@ DISTNAME= transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
>  PKGNAME-qt=  transmission-qt-${VER}
> -REVISION=0
> +REVISION=1
>  CATEGORIES=  net
>  HOMEPAGE=http://www.transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
> @@ -17,7 +17,7 @@ MAINTAINER= Josh Grosse   # GPLv2+
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES=http://download.transmissionbt.com/files/
> +MASTER_SITES=
> http://github.com/transmission/transmission-releases/raw/master/

http(s)?!

Re: [UPDATE] net/transmission

2016-09-21 Thread Josh Grosse

On Wed, Sep 21, 2016 at 11:46:58AM +0100, Stuart Henderson wrote:
> On 2016/09/21 06:30, Josh Grosse wrote:
> > On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote:
> > > They still have proper tarballs, this is identical to the previous one:
> > > 
> > > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz
> > 
> > Thank you, Sir.  But is there a GH_* mechanism to fetch it?  Or should I set
> > MASTER_SITES_GITHUB instead?
> > 
> 
> The GH_* things are just for lazy upstreams who don't make proper tarballs,
> and the MASTER_SITES_GITHUB is only for use with the GH_* variables.
> This is all that's needed - ok?

Our diffs crossed in the mail, the only variation is mine updates REVISION. 
If that is unnecessary, yours will be fine. :)

Re: [UPDATE] net/transmission

2016-09-21 Thread Stuart Henderson

On 2016/09/21 06:30, Josh Grosse wrote:
> On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote:
> > They still have proper tarballs, this is identical to the previous one:
> > 
> > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz
> 
> Thank you, Sir.  But is there a GH_* mechanism to fetch it?  Or should I set
> MASTER_SITES_GITHUB instead?
> 

The GH_* things are just for lazy upstreams who don't make proper tarballs,
and the MASTER_SITES_GITHUB is only for use with the GH_* variables.
This is all that's needed - ok?

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile11 Apr 2016 20:00:51 -  1.105
+++ Makefile21 Sep 2016 10:46:22 -
@@ -17,7 +17,7 @@ MAINTAINER=   Josh Grosse

Re: [UPDATE] net/transmission

2016-09-21 Thread Josh Grosse

On Wed, Sep 21, 2016 at 06:30:50AM -0400, Josh Grosse wrote:
> On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote:
> > They still have proper tarballs, this is identical to the previous one:
> > 
> > https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz
> 
> Thank you, Sir.  But is there a GH_* mechanism to fetch it?  Or should I set
> MASTER_SITES_GITHUB instead?
> 
Heh.  I can just set MASTER_SITES instead.  Here is a smaller diff
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Sep 2016 10:53:27 -   1.106
+++ Makefile21 Sep 2016 10:41:13 -
@@ -9,7 +9,7 @@ DISTNAME=   transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  0
+REVISION=  1
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 MAINTAINER=Josh Grosse 
@@ -17,7 +17,7 @@ MAINTAINER=   Josh Grosse

Re: [UPDATE] net/transmission

2016-09-21 Thread Josh Grosse

On Wed, Sep 21, 2016 at 11:10:16AM +0100, Stuart Henderson wrote:
> They still have proper tarballs, this is identical to the previous one:
> 
> https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz

Thank you, Sir.  But is there a GH_* mechanism to fetch it?  Or should I set
MASTER_SITES_GITHUB instead?

Re: [UPDATE] net/transmission

2016-09-21 Thread Stuart Henderson

On 2016/09/21 06:05, Josh Grosse wrote:
> Upstream has relocated source to Github, and are using 
> a tarball that requires a pre-configure step.
> 
> It is still the same release 2.92.  Tested on amd64.
> 
> My thanks to David Hill for letting me know Upstream had
> transitioned development to Github.

They still have proper tarballs, this is identical to the previous one:

https://github.com/transmission/transmission-releases/raw/master/transmission-2.92.tar.xz

[UPDATE] net/transmission

2016-09-21 Thread Josh Grosse

Upstream has relocated source to Github, and are using 
a tarball that requires a pre-configure step.

It is still the same release 2.92.  Tested on amd64.

My thanks to David Hill for letting me know Upstream had
transitioned development to Github.
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile1 Sep 2016 10:53:27 -   1.106
+++ Makefile21 Sep 2016 09:48:33 -
@@ -9,7 +9,7 @@ DISTNAME=   transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  0
+REVISION=  1
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 MAINTAINER=Josh Grosse 
@@ -17,8 +17,9 @@ MAINTAINER=   Josh Grosse

Re: [update] net/transmission

2016-03-10 Thread Josh Grosse

On 2016-03-08 13:11, Marc Espie wrote:

On Tue, Mar 08, 2016 at 04:18:16PM +, Christian Weisgerber wrote:

On 2016-03-08, Josh Grosse  wrote:

> Thank you, naddy, for your kind patience with my port update.  This one in
> particular has been a learning experience, and I appreciate the guidance.

That port is awfully complex.  I keep wavering between wanting to
split off the Qt client into a separate port to simplify things,
and keeping the port as is just because it makes a good example.

Can you build the qt client separately in a simple enough way to not
have lots of patches duplication ?

If the -qt subpackage is split into its own port, it needs to build 
-main

in order to link needed objects.  If I'm right, then this doesn't seem
a worthwhile separation.  But, due to the large set of corrections
that Vadim, Naddy, and Antoine needed to make to my port update OK for
commit, it is safest to assume I'm wrong.  :)

I've had a look, it's not that awful, but then I'm biased, considering
what "complex" was in the past...

Re: [update] net/transmission

2016-03-08 Thread Marc Espie

On Tue, Mar 08, 2016 at 04:18:16PM +, Christian Weisgerber wrote:
> On 2016-03-08, Josh Grosse  wrote:
> 
> > Thank you, naddy, for your kind patience with my port update.  This one in
> > particular has been a learning experience, and I appreciate the guidance.
> 
> That port is awfully complex.  I keep wavering between wanting to
> split off the Qt client into a separate port to simplify things,
> and keeping the port as is just because it makes a good example.

Can you build the qt client separately in a simple enough way to not
have lots of patches duplication ?

I've had a look, it's not that awful, but then I'm biased, considering
what "complex" was in the past...

Re: [update] net/transmission

2016-03-08 Thread Christian Weisgerber

On 2016-03-08, Josh Grosse  wrote:

> Thank you, naddy, for your kind patience with my port update.  This one in
> particular has been a learning experience, and I appreciate the guidance.

That port is awfully complex.  I keep wavering between wanting to
split off the Qt client into a separate port to simplify things,
and keeping the port as is just because it makes a good example.

Anyway, committed.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: [update] net/transmission

2016-03-08 Thread Josh Grosse


On 2016-03-08 11:18, Christian Weisgerber wrote:

That port is awfully complex.  I keep wavering between wanting to
split off the Qt client into a separate port to simplify things,
and keeping the port as is just because it makes a good example.


A good example of what *not* to do?  :)

http://cdn.shopify.com/s/files/1/0535/6917/products/mistakesdemotivator.jpeg


Anyway, committed.


Thank you very much!

Re: [update] net/transmission

2016-03-07 Thread Josh Grosse

On Mon, Mar 07, 2016 at 09:33:58PM +, Christian Weisgerber wrote:
> I think you misunderstand GCC4_ARCHS.  GCC4_ARCHS are the architectures
> that have gcc 4.2.1 in base.  It has nothing to do with the gcc4
> module, which covers gcc 4.9.  And there is no reason not to build
> -main and -gtk on architectures that lack gcc 4.9.

You are correct.  A quick tour of bsd.own.mk has enlightened me.

> I think you want something like this:
> 
> ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS}
> 
> MODULES=  ... gcc4
> MODGCC4_ARCHS=[list of archs where gcc 4.9 is available]
> 
> .if ${BUILD_PACKAGES:M-qt}
> MODULES+= x11/qt5
> ...
> .endif

Thank you, naddy, for your kind patience with my port update.  This one in
particular has been a learning experience, and I appreciate the guidance.
I've applied your recommendation, using ONLY_FOR_ARCHS from lang/gcc/4.9, as 
can be seen in this incremental diff:

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 7f27b5b..7e0e213 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -21,7 +21,8 @@ EXTRACT_SUFX=   .tar.xz
>  
>  MULTI_PACKAGES=  -main -gtk -qt
>  
> -ONLY_FOR_ARCHS=  ${GCC4_ARCHS}
> +ONLY_FOR_ARCHS-qt=   ${MODGCC4_ARCHS}
> +MODGCC4_ARCHS=   amd64 arm hppa i386 mips64 mips64el powerpc sparc 
> sparc64
>  
>  PSEUDO_FLAVORS=  no_gtk no_qt
>  FLAVOR?=

The full diff against the ports tree follows.

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile8 Mar 2016 01:09:50 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.92
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,7 +21,8 @@ EXTRACT_SUFX= .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
+ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS}
+MODGCC4_ARCHS= amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
 
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
@@ -41,14 +42,10 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
-.endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
devel/libevent2 \
@@ -69,7 +66,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,8 +77,15 @@ CONFIGURE_ARGS=  --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt5
+MODQMAKE_PROJECTS= qt/qtr.pro
+CONFIGURE_STYLE+=  qmake
+SEPARATE_BUILD=No
+MODQMAKE_INSTALL_ROOT= ${PREFIX}
+.else
+MODULES+=  gcc4
+.endif
 
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
@@ -90,12 +96,10 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   ${MODQMAKE_build}
 
 post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+   ${MODQMAKE_install}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo7 Mar 2016 11:01:47 -
@@ -1,2 +1,2 @@
-SHA256

Re: [update] net/transmission

2016-03-07 Thread Christian Weisgerber

On 2016-03-07, Josh Grosse  wrote:

> Attached is a new update, from 2.90 -> 2.92.

Sorry, I still don't think this is right.

> -ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
> +ONLY_FOR_ARCHS=  ${GCC4_ARCHS}

> +.if ${BUILD_PACKAGES:M-qt}
> +MODULES+=x11/qt5
> +MODQMAKE_PROJECTS=   qt/qtr.pro
> +CONFIGURE_STYLE+=qmake
> +SEPARATE_BUILD=  No
> +MODQMAKE_INSTALL_ROOT=   ${PREFIX}
> +.else
> +MODULES+=gcc4
> +.endif

I think you misunderstand GCC4_ARCHS.  GCC4_ARCHS are the architectures
that have gcc 4.2.1 in base.  It has nothing to do with the gcc4
module, which covers gcc 4.9.  And there is no reason not to build
-main and -gtk on architectures that lack gcc 4.9.

I think you want something like this:

ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS}

MODULES=... gcc4
MODGCC4_ARCHS=  [list of archs where gcc 4.9 is available]

.if ${BUILD_PACKAGES:M-qt}
MODULES+=   x11/qt5
...
.endif

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: [update] net/transmission

2016-03-07 Thread Vadim Zhukov

2016-03-07 13:59 GMT+03:00 Stuart Henderson :
> On 2016/03/07 13:45, Vadim Zhukov wrote:
>> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
>> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
>> >> ... However, as the
>> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> >> So depending on no_qt the _other_ packages are different.  That is
>> >> wrong.
>> >
>> > Two additional revisions after ensuring the gcc4 module is always
>> > used:
>> >
>> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>> >
>> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>> > from Vadim Zhukov below.
>>
>> This is okay zhuk@.
>>
>> --
>>   WBR,
>>   Vadim Zhukov
>>
>
> The distfile for 2.90 has been removed upstream (also given recent
> events it would probably be wise to read through a source diff from
> the previous version in tree ;)

Yep, I had distfile cached. :(

2.92 update is fine with me.

--
  WBR,
  Vadim Zhukov

Re: [update] net/transmission

2016-03-07 Thread Josh Grosse

On Mon, Mar 07, 2016 at 10:59:38AM +, Stuart Henderson wrote:
> The distfile for 2.90 has been removed upstream (also given recent
> events it would probably be wise to read through a source diff from
> the previous version in tree ;)

The new distfile matches their published SHA256, and this diff shows
the changes in their repository:

Common subdirectories: 14695/.svn and 14714/.svn
Common subdirectories: 14695/.tx and 14714/.tx
diff -uNP 14695/CMakeLists.txt 14714/CMakeLists.txt
--- 14695/CMakeLists.txtMon Mar  7 06:22:56 2016
+++ 14714/CMakeLists.txtMon Mar  7 06:23:37 2016
@@ -41,8 +41,8 @@
 # "Z" for unsupported trunk builds,
 # "0" for stable, supported releases
 # these should be the only two lines you need to change
-set(TR_USER_AGENT_PREFIX "2.90")
-set(TR_PEER_ID_PREFIX "-TR2900-")
+set(TR_USER_AGENT_PREFIX "2.92")
+set(TR_PEER_ID_PREFIX "-TR2920-")
 
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION 
"${TR_USER_AGENT_PREFIX}")
 set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}")
diff -uNP 14695/Makefile.am 14714/Makefile.am
--- 14695/Makefile.am   Mon Mar  7 06:22:56 2016
+++ 14714/Makefile.am   Mon Mar  7 06:23:35 2016
@@ -51,8 +51,12 @@
   third-party/b64.cmake \
   third-party/dht.cmake \
   third-party/event2.cmake \
+  third-party/event2-01-win32.patch \
+  third-party/event2-02-win32.patch \
   third-party/natpmp.cmake \
   third-party/utp-01-ticket-5002.patch \
+  third-party/utp-02-win32.patch \
+  third-party/utp-03-msvc14.patch \
   third-party/utp.cmake \
   third-party/utp_config.h \
   utils/CMakeLists.txt
diff -uNP 14695/NEWS 14714/NEWS
--- 14695/NEWS  Mon Mar  7 06:22:56 2016
+++ 14714/NEWS  Mon Mar  7 06:23:35 2016
@@ -1,3 +1,25 @@
+=== Transmission 2.92 (2016/03/06) ===
+[http://trac.transmissionbt.com/query?milestone=2.92=component=severity
 All tickets closed by this release]
+ Mac Client 
+  * Build OSX.KeRanger.A ransomware removal into the app
+
+=== Transmission 2.91 (2016/03/06) ===
+[http://trac.transmissionbt.com/query?milestone=2.91=component=severity
 All tickets closed by this release]
+ All Platforms 
+  * Fix Makefile.am to include Windows patches into source archive
+  * Fix miniupnpc script to handle spaces and other special chars in paths
+ Mac Client 
+  * Prevent crash during group rules removal in some cases
+  * Fix failure to remove seeding completion notifications from notification 
center
+  * Show main window and scroll to torrent on notification click
+  * Fix issue on Yosemite where peers view didn't occupy all the available 
space when web seed view was hidden
+ Qt Client 
+  * Fix existing running instance detection and torrents delegation when using 
DBus
+ Daemon 
+  * Fix building on Windows x86
+  * Add `--blocklist-update` argument description to transmission-remote man 
page
+  * Use `-rad` as short form of `--remove-and-delete` option in 
transmission-remote
+
 === Transmission 2.90 (2016/02/28) ===
 
[http://trac.transmissionbt.com/query?milestone=2.90=component=severity
 All tickets closed by this release]
  All Platforms 
Common subdirectories: 14695/Transmission.xcodeproj and 
14714/Transmission.xcodeproj
Common subdirectories: 14695/cli and 14714/cli
Common subdirectories: 14695/cmake and 14714/cmake
diff -uNP 14695/configure.ac 14714/configure.ac
--- 14695/configure.ac  Mon Mar  7 06:22:55 2016
+++ 14714/configure.ac  Mon Mar  7 06:23:34 2016
@@ -3,8 +3,8 @@
 dnl "Z" for unsupported trunk builds,
 dnl "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[2.90])
-m4_define([peer_id_prefix],[-TR2900-])
+m4_define([user_agent_prefix],[2.92])
+m4_define([peer_id_prefix],[-TR2920-])
 
 
AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket])
 AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])
Common subdirectories: 14695/daemon and 14714/daemon
Common subdirectories: 14695/extras and 14714/extras
Common subdirectories: 14695/gtk and 14714/gtk
Common subdirectories: 14695/libtransmission and 14714/libtransmission
Common subdirectories: 14695/m4 and 14714/m4
Common subdirectories: 14695/macosx and 14714/macosx
Common subdirectories: 14695/po and 14714/po
Common subdirectories: 14695/qt and 14714/qt
Common subdirectories: 14695/third-party and 14714/third-party
Common subdirectories: 14695/utils and 14714/utils
Common subdirectories: 14695/web and 14714/web

Re: [update] net/transmission

2016-03-07 Thread Stuart Henderson

On 2016/03/07 13:45, Vadim Zhukov wrote:
> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> >> ... However, as the
> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> >> So depending on no_qt the _other_ packages are different.  That is
> >> wrong.
> >
> > Two additional revisions after ensuring the gcc4 module is always
> > used:
> >
> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
> >
> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> > from Vadim Zhukov below.
> 
> This is okay zhuk@.
> 
> --
>   WBR,
>   Vadim Zhukov
> 

The distfile for 2.90 has been removed upstream (also given recent
events it would probably be wise to read through a source diff from
the previous version in tree ;)

Re: [update] net/transmission

2016-03-07 Thread Josh Grosse

On Mon, Mar 07, 2016 at 01:45:15PM +0300, Vadim Zhukov wrote:
> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> >> ... However, as the
> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> >> So depending on no_qt the _other_ packages are different.  That is
> >> wrong.
> >
> > Two additional revisions after ensuring the gcc4 module is always
> > used:
> >
> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
> >
> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> > from Vadim Zhukov below.
> 
> This is okay zhuk@.

Thank you, Vadim.  Attached is a new update, from 2.90 -> 2.92.  It
fixes minor bugs and includes new security protections for upstream's
OSX binary -- a ransomware attack made the news yesterday and was promptly
addressed.  

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile7 Mar 2016 10:43:24 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.92
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
+ONLY_FOR_ARCHS=${GCC4_ARCHS}
 
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
@@ -41,14 +41,10 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
-.endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
devel/libevent2 \
@@ -69,7 +65,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,8 +76,15 @@ CONFIGURE_ARGS=  --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt5
+MODQMAKE_PROJECTS= qt/qtr.pro
+CONFIGURE_STYLE+=  qmake
+SEPARATE_BUILD=No
+MODQMAKE_INSTALL_ROOT= ${PREFIX}
+.else
+MODULES+=  gcc4
+.endif
 
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
@@ -90,12 +95,10 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   ${MODQMAKE_build}
 
 post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+   ${MODQMAKE_install}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo7 Mar 2016 10:44:04 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
+SIZE (transmission-2.92.tar.xz) = 3378116
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++

Re: [update] net/transmission

2016-03-07 Thread Vadim Zhukov

2016-03-07 3:23 GMT+03:00 Josh Grosse :
> On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
>> ... However, as the
>> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> So depending on no_qt the _other_ packages are different.  That is
>> wrong.
>
> Two additional revisions after ensuring the gcc4 module is always
> used:
>
> 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>
> 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> from Vadim Zhukov below.

This is okay zhuk@.

--
  WBR,
  Vadim Zhukov

Re: [update] net/transmission

2016-03-06 Thread Josh Grosse

On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> ... However, as the
> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> So depending on no_qt the _other_ packages are different.  That is
> wrong.

Two additional revisions after ensuring the gcc4 module is always
used:

1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}

2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
from Vadim Zhukov below.

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile6 Mar 2016 19:54:11 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
+ONLY_FOR_ARCHS=${GCC4_ARCHS}
 
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
@@ -41,14 +41,10 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
-.endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
devel/libevent2 \
@@ -69,7 +65,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,8 +76,15 @@ CONFIGURE_ARGS=  --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt5
+MODQMAKE_PROJECTS= qt/qtr.pro
+CONFIGURE_STYLE+=  qmake
+SEPARATE_BUILD=No
+MODQMAKE_INSTALL_ROOT= ${PREFIX}
+.else
+MODULES+=  gcc4
+.endif
 
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
@@ -90,12 +95,10 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   ${MODQMAKE_build}
 
 post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+   ${MODQMAKE_install}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy Exp 
$
-
-time_t printing.
-
 libtransmission/peer-mgr.c.origSun May 18 22:52:12 2014
-+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
-@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
- const double mult = MIN (timeSinceCancel, maxHistory) / (double) 
maxHistory;
-

Re: [update] net/transmission

2016-03-05 Thread Josh Grosse

On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> Minor issue: WANTLIB-qt should be synced.

I assume you mean this from port-lib-depends-check:

---
transmission-qt-2.90(net/transmission,-qt):
Extra:  ICE.10 SM.9 X11.16 Xext.13 Xi.12 Xinerama.6 Xrender.6
Extra:  iconv.6
---

I assume I may safely ignore iconv, the others were removed in the 
diff below.

> Major issue: The difference between FLAVOR="" and FLAVOR="no_qt"
> should be that the latter does not build the -qt subpackage, but
> the -main and -gtk subpackages should be the same.  However, as the
> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> So depending on no_qt the _other_ packages are different.  That is
> wrong.

I found the error; the x11/qt5 module includes a dependency on gcc4,
and I'd kept the Qt module optional with the -qt subpackage, which is
how the x11/qt4 module is used in the older port.  The error is clear 
to see with these three show=MODULES:

---
$ make show=MODULES
devel/gettext textproc/intltool x11/qt5 gnu gcc4
$ env FLAVOR=no_gtk make show=MODULES
devel/gettext textproc/intltool x11/qt5 gnu gcc4
$ env FLAVOR=no_qt make show=MODULES
devel/gettext textproc/intltool gnu
---

The fix in the diff below uses gcc4 XOR x11/qt5:

---
.if ${BUILD_PACKAGES:M-qt}
MODULES+=   x11/qt5
.else
MODULES+=   gcc4
.endif
---

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile6 Mar 2016 02:39:31 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -41,13 +41,15 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
+
+MODULES=   devel/gettext textproc/intltool 
 
-MODULES=   devel/gettext textproc/intltool
 .if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
+.else
+MODULES+=  gcc4
 .endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
@@ -69,7 +71,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,9 +82,6 @@ CONFIGURE_ARGS=   --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
-
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
@@ -90,7 +91,8 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS}
 
 post-install:
cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3

Re: [update] net/transmission

2016-03-05 Thread Christian Weisgerber

On 2016-03-01, Josh Grosse  wrote:

>> You still depend on gtk-update-icon-cache in the -main package.
>
> Corrected.
>
>> And you still have the PLIST goos.
>
> Thanks, fixed!

Minor issue: WANTLIB-qt should be synced.

Major issue: The difference between FLAVOR="" and FLAVOR="no_qt"
should be that the latter does not build the -qt subpackage, but
the -main and -gtk subpackages should be the same.  However, as the
port stands now, FLAVOR="" builds those subpackages with GCC 4.9
from ports, but FLAVOR="no_qt" builds them with the base compiler.
So depending on no_qt the _other_ packages are different.  That is
wrong.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: [update] net/transmission

2016-03-05 Thread Noth


Hi ports@,

  I've tested v2.90 in openbsd-wip, builds and works without any 
issues. Please commit it.


Cheers,

Noth

Re: [update] net/transmission

2016-03-01 Thread Josh Grosse

On Tue, Mar 01, 2016 at 08:05:41AM +0100, Antoine Jacoutot wrote:
> You still depend on gtk-update-icon-cache in the -main package.

Corrected.

> And you still have the PLIST goos.

Thanks, fixed!

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile1 Mar 2016 12:30:12 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -41,13 +41,13 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
 .if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
 .endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
@@ -69,7 +69,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,9 +80,6 @@ CONFIGURE_ARGS=   --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
-
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
@@ -90,7 +89,8 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS}
 
 post-install:
cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy Exp 
$
-
-time_t printing.
-
 libtransmission/peer-mgr.c.origSun May 18 22:52:12 2014
-+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
-@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
- const double mult = MIN (timeSinceCancel, maxHistory) / (double) 
maxHistory;
- const int inc = maxIncrease * mult;
- maxPeers = s->maxPeers + inc;
--tordbg (s, "time since last cancel is %li -- increasing the "
-+tordbg (s, "time since last cancel is %lli -- increasing the "
-"number of peers we're interested in by %d",
--   timeSinceCancel, inc);
-+   (long long)timeSinceCancel, inc);
-   }
-   }
- 
Index: patches/patch-qt_mainwin_cc
===
RCS file: patches/patch-qt_mainwin_cc
diff -N patches/patch-qt_mainwin_cc
--- patches/patch-qt_mainwin_cc 1 Jun 2014 11:37:06 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-qt_mainwin_cc,v 1.1 2014/06/01 11:37:06 naddy Exp $
-
-We do not support C++11 yet.
-
 qt/mainwin.cc.orig Sun May 18 22:52:27 2014
-+++ qt/mainwin.cc  Sun May 25 00:04:18 2014
-@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
-   QCheckBox * b = new

Re: [update] net/transmission

2016-02-29 Thread Antoine Jacoutot

On Mon, Feb 29, 2016 at 07:16:53PM -0500, Josh Grosse wrote:
> On Mon, Feb 29, 2016 at 08:57:30PM +, Christian Weisgerber wrote:
> > On 2016-02-29, Josh Grosse  wrote:
> > 
> > > This diff updates the application to version 2.90.
> > > Tested on amd64.  (Some light testing on i386 was also performed.)
> > 
> > Shuffling the icon directories, which are only used in the gtk
> > flavor, from PLIST-gtk to PLIST-main doesn't make any sense.
> > update-plist is wrong there.
> 
> Fixed, thank you.

You still depend on gtk-update-icon-cache in the -main package.
And you still have the PLIST goos.

> > > Note to testers: pkg_delete any 2.84 transmission before beginning
> > > your build, $WRKSRC search libraries are behind /usr/local/lib.
> > 
> > Can't this be fixed?
> 
> I looked into this in more detail.  It was caused by qmake, so only would
> impact the -qt subpackage, but has no actual impact as the trailing -L 
> search directory $WRKSRC/qt contains no link archives.
> 
> While cleaning up, I removed an extra $DISTFILES that was used while
> testing with nightly tarballs.
> 
> The diff is also in openbsd-wip.  
> 
> Index: Makefile
> ===
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.101
> diff -u -p -r1.101 Makefile
> --- Makefile  30 Oct 2015 12:47:40 -  1.101
> +++ Makefile  29 Feb 2016 23:48:49 -
> @@ -4,14 +4,14 @@ COMMENT-main=   BitTorrent command line an
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt=  BitTorrent client with Qt interface
>  
> -VER= 2.84
> +VER= 2.90
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
>  PKGNAME-qt=  transmission-qt-${VER}
> -REVISION=5
>  CATEGORIES=  net
>  HOMEPAGE=http://www.transmissionbt.com/
> +MAINTAINER=  Josh Grosse 
>  
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -41,13 +41,13 @@ WANTLIB-gtk=  ${WANTLIB-common} ICE SM X1
>   pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
>   xcb-render xcb-shm epoxy idn nghttp2
>  WANTLIB-qt=  ${WANTLIB-common} ${MODQT_WANTLIB} \
> - lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
> + GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
>   ICE SM X11 Xext Xi Xinerama Xrender \
> - fontconfig freetype stdc++
> + fontconfig freetype estdc++
>  
>  MODULES= devel/gettext textproc/intltool
>  .if ${BUILD_PACKAGES:M-qt}
> -MODULES+=x11/qt4
> +MODULES+=x11/qt5
>  .endif
>  
>  LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
> @@ -61,6 +61,8 @@ LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
>  LIB_DEPENDS-qt=  ${LIB_DEPENDS-common} \
>   ${MODQT_LIB_DEPENDS}
>  
> +RUN_DEPENDS-main=x11/gtk+3,-guic
> +
>  RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
>   devel/desktop-file-utils \
>   x11/gtk+3,-guic
> @@ -69,7 +71,9 @@ RUN_DEPENDS-qt= ${PKGNAME-main}:${BUILD_
>  
>  USE_GMAKE=   Yes
>  CONFIGURE_STYLE=gnu
> +
>  CONFIGURE_ARGS=  --disable-shared \
> + --enable-cli \
>   --enable-external-natpmp
>  
>  # -I$(top_builddir)/third-party is required, but configure fails to
> @@ -78,9 +82,6 @@ CONFIGURE_ARGS= --disable-shared \
>  CONFIGURE_ENV=   CPPFLAGS="-I${WRKSRC}/third-party 
> -I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>  
> -QMAKE_ARGS=  QMAKE_CXX="${CXX}" \
> - QMAKE_CXXFLAGS="${CXXFLAGS}"
> -
>  .if !${BUILD_PACKAGES:M-gtk}
>  CONFIGURE_ARGS+=--without-gtk
>  .endif
> @@ -90,7 +91,8 @@ pre-patch:
>  
>  .if ${BUILD_PACKAGES:M-qt}
>  post-build:
> - cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
> + cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
> + ${MAKE_FLAGS}
>  
>  post-install:
>   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
> Index: distinfo
> ===
> RCS file: /systems/cvs/ports/net/transmission/distinfo,v
> retrieving revision 1.49
> diff -u -p -r1.49 distinfo
> --- distinfo  21 Jul 2014 14:59:17 -  1.49
> +++ distinfo  29 Feb 2016 02:10:06 -
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-2.84.tar.xz) = 
> qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
> -SIZE (transmission-2.84.tar.xz) = 3077836
> +SHA256 (transmission-2.90.tar.xz) = 
> af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
> +SIZE (transmission-2.90.tar.xz) = 3377720
> Index: patches/patch-libtransmission_peer-mgr_c
> ===
> RCS file: patches/patch-libtransmission_peer-mgr_c
> diff -N patches/patch-libtransmission_peer-mgr_c
> --- patches/patch-libtransmission_peer-mgr_c  1 Jun 2014 11:37:06 -   
> 1.3
> +++ /dev/null 1 Jan

Re: [update] net/transmission

2016-02-29 Thread Josh Grosse

On Mon, Feb 29, 2016 at 08:57:30PM +, Christian Weisgerber wrote:
> On 2016-02-29, Josh Grosse  wrote:
> 
> > This diff updates the application to version 2.90.
> > Tested on amd64.  (Some light testing on i386 was also performed.)
> 
> Shuffling the icon directories, which are only used in the gtk
> flavor, from PLIST-gtk to PLIST-main doesn't make any sense.
> update-plist is wrong there.

Fixed, thank you.
 
> > Note to testers: pkg_delete any 2.84 transmission before beginning
> > your build, $WRKSRC search libraries are behind /usr/local/lib.
> 
> Can't this be fixed?

I looked into this in more detail.  It was caused by qmake, so only would
impact the -qt subpackage, but has no actual impact as the trailing -L 
search directory $WRKSRC/qt contains no link archives.

While cleaning up, I removed an extra $DISTFILES that was used while
testing with nightly tarballs.

The diff is also in openbsd-wip.  

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile29 Feb 2016 23:48:49 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -41,13 +41,13 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
 .if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
 .endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
@@ -61,6 +61,8 @@ LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
${MODQT_LIB_DEPENDS}
 
+RUN_DEPENDS-main=x11/gtk+3,-guic
+
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+3,-guic
@@ -69,7 +71,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,9 +82,6 @@ CONFIGURE_ARGS=   --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
-
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
@@ -90,7 +91,8 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS}
 
 post-install:
cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy Exp 
$
-
-time_t printing.
-
 libtransmission/peer-mgr.c.origSun May 18 22:52:12 2014
-+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
-@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
- const double mult =

Re: [update] net/transmission

2016-02-29 Thread Christian Weisgerber

On 2016-02-29, Josh Grosse  wrote:

> This diff updates the application to version 2.90.
> Tested on amd64.  (Some light testing on i386 was also performed.)

Shuffling the icon directories, which are only used in the gtk
flavor, from PLIST-gtk to PLIST-main doesn't make any sense.
update-plist is wrong there.

> Note to testers: pkg_delete any 2.84 transmission before beginning
> your build, $WRKSRC search libraries are behind /usr/local/lib.

Can't this be fixed?

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

[update] net/transmission

2016-02-29 Thread Josh Grosse

This diff updates the application to version 2.90.
Tested on amd64.  (Some light testing on i386 was also performed.)

This is a bugfix release of the application.

Major changes in the port:

qt4 -> qt5
GCC4 for the complete build, to support c++11 and gnu++11


Note to testers: pkg_delete any 2.84 transmission before beginning
your build, $WRKSRC search libraries are behind /usr/local/lib.

My thanks to Naddy and Vadim for their kind direction and
patience with me.

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile29 Feb 2016 03:10:32 -
@@ -4,14 +4,15 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.90
 DISTNAME=  transmission-${VER}
+DISTFILES= transmission-${VER}${EXTRACT_SUFX}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -41,13 +42,13 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
 .if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
+MODULES+=  x11/qt5
 .endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
@@ -61,6 +62,8 @@ LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
${MODQT_LIB_DEPENDS}
 
+RUN_DEPENDS-main=x11/gtk+3,-guic
+
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+3,-guic
@@ -69,7 +72,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,9 +83,6 @@ CONFIGURE_ARGS=   --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
-
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
@@ -90,7 +92,8 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   cd ${WRKSRC}/qt; qmake-qt5 qtr.pro; ${MAKE_ENV} ${MAKE_PROGRAM} \
+   ${MAKE_FLAGS}
 
 post-install:
cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo29 Feb 2016 02:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.90.tar.xz) = 
af+Mr4FoQVWSb0N/Rr998bH7ME9Sx4CfVGJX6JI/L9I=
+SIZE (transmission-2.90.tar.xz) = 3377720
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.3 2014/06/01 11:37:06 naddy Exp 
$
-
-time_t printing.
-
 libtransmission/peer-mgr.c.origSun May 18 22:52:12 2014
-+++ libtransmission/peer-mgr.c Mon May 26 20:51:06 2014
-@@ -2892,9 +2892,9 @@ rechokeDownloads (tr_swarm * s)
- const double mult = MIN (timeSinceCancel, maxHistory) / (double) 
maxHistory;
- const int inc = maxIncrease * mult;
- maxPeers = s->maxPeers + inc;
--tordbg (s, "time since last cancel is %li -- increasing the "
-+tordbg (s, "time since last cancel is %lli -- increasing the "
-"number of peers we're interested in by %d",
--   timeSinceCancel, inc);
-+

Update: net/transmission 2.84

2014-07-20 Thread Christian Weisgerber

Update net/transmission to 2.84:
  Fix peer communication vulnerability

There are few changes so this should be safe unless they screwed
up that particular bug fix.  I'll run a minimal test of -daemon on
sparc64 in the next few days.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- Makefile1 Jun 2014 11:37:06 -   1.94
+++ Makefile20 Jul 2014 15:09:09 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.83
+VER=   2.84
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo1 Jun 2014 11:37:06 -   1.48
+++ distinfo20 Jul 2014 15:09:09 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.83.tar.xz) = 
sOGwUBZ+f3G2jgGo1VuYSoKP6IDfmr+8YoHLKg19FDM=
-SIZE (transmission-2.83.tar.xz) = 3136752
+SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
+SIZE (transmission-2.84.tar.xz) = 3077836
-- 
Christian naddy Weisgerber  na...@mips.inka.de

Re: Update: net/transmission 2.83

2014-05-28 Thread Josh Grosse

On Mon, May 26, 2014 at 09:19:48PM +0200, Christian Weisgerber wrote:
 Update of net/transmission to 2.83.  Some of our old patches can
 go away and I decided that removing the many warning options isn't
 worth the effort.
 
 Untested.  It builds, but I've done zero actual data transfers with it.

Tested cli, gtk, and qt clients on i386.

Update: net/transmission 2.83

2014-05-26 Thread Christian Weisgerber

Update of net/transmission to 2.83.  Some of our old patches can
go away and I decided that removing the many warning options isn't
worth the effort.

Untested.  It builds, but I've done zero actual data transfers with it.

Does anybody want to take over maintainership of this port?  I rarely
use BitTorrent at all these days, and if I do, I only run the daemon
client.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile3 Feb 2014 13:30:52 -   1.93
+++ Makefile26 May 2014 19:11:51 -
@@ -4,10 +4,7 @@ COMMENT-main=  BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.82
-REVISION-main= 1
-REVISION-gtk=  1
-REVISION-qt=   0
+VER=   2.83
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -17,7 +14,7 @@ HOMEPAGE= http://www.transmissionbt.com/
 
 MAINTAINER=Christian Weisgerber na...@openbsd.org
 
-# GPLv2
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
 MASTER_SITES=  http://download.transmissionbt.com/files/
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo22 Aug 2013 17:34:33 -  1.47
+++ distinfo26 May 2014 19:11:51 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
-SIZE (transmission-2.82.tar.xz) = 3172024
+SHA256 (transmission-2.83.tar.xz) = 
sOGwUBZ+f3G2jgGo1VuYSoKP6IDfmr+8YoHLKg19FDM=
+SIZE (transmission-2.83.tar.xz) = 3136752
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 3 Feb 2014 13:30:52 -   1.32
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-$OpenBSD: patch-configure,v 1.32 2014/02/03 13:30:52 dcoppa Exp $
-
-Unbreak with miniupnpc=1.9
-
 configure.orig Fri Aug  9 04:49:21 2013
-+++ configure  Mon Feb  3 13:05:57 2014
-@@ -11800,8 +11800,8 @@ if test 0 = 0; then
- else
-   supported_build=no
-   if test x$GCC = xyes ; then
--CFLAGS=$CFLAGS -g -O0
--CXXFLAGS=$CXXFLAGS -g -O0
-+: CFLAGS=$CFLAGS -g -O0
-+: CXXFLAGS=$CXXFLAGS -g -O0
-   fi
- fi
-  if test x$supported_build = xno; then
-@@ -16193,7 +16193,7 @@ esac
- 
- if test x$GCC = xyes ; then
- 
--CFLAGS=$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith 
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes 
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls 
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal
-+: CFLAGS=$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith 
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes 
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls 
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal
- 
- { $as_echo $as_me:${as_lineno-$LINENO}: checking gcc version 5
- $as_echo_n checking gcc version...  6; }
-@@ -16205,10 +16205,10 @@ $as_echo_n checking gcc version...  6; }
- { $as_echo $as_me:${as_lineno-$LINENO}: result: $GCC_VERSION 5
- $as_echo $GCC_VERSION 6; }
- if test $GCC_VERSION_NUM -ge 304; then
--CFLAGS=$CFLAGS -Wextra -Wdeclaration-after-statement 
-Winit-self
-+: CFLAGS=$CFLAGS -Wextra -Wdeclaration-after-statement 
-Winit-self
- fi
- if test $GCC_VERSION_NUM -ge 403; then
--CFLAGS=$CFLAGS -Wvariadic-macros
-+: CFLAGS=$CFLAGS -Wvariadic-macros
- fi
- fi
- 
-@@ -18223,7 +18223,7 @@ main ()
- upnpDiscover( 2000, NULL, NULL, 0, 0, errno );
- UPNP_GetValidIGD( devlist, urls, data, lanaddr, sizeof( lanaddr ) );
- UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
--portStr, TCP, intClient, intPort, NULL, NULL, NULL 
);
-+portStr, TCP, NULL, intClient, intPort, NULL, NULL, 
NULL );
- 
-   ;
-   return 0;
Index: patches/patch-gtk_main_c
===
RCS file: patches/patch-gtk_main_c
diff -N patches/patch-gtk_main_c
--- patches/patch-gtk_main_c18 Nov 2013 16:51:23 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-gtk_main_c,v 1.1 2013/11/18 16:51:23 naddy Exp $
-
-Disable help entry in menu while the URL returns 404.
-http://www.transmissionbt.com/help/gtk/2.8x/
-
 gtk/main.c.origFri Aug  9 04:46:06 2013
-+++ gtk/main.c Mon Nov 18 16:12:09 2013
-@@ -268,6 +268,9 @@ refresh_actions (gpointer gdata)
-   canUpdate = 0;
-   gtk_tree_selection_selected_foreach

Re: Update: net/transmission 2.82 drops -qt

2013-08-13 Thread Vadim Zhukov

2013/8/13 Stuart Henderson st...@openbsd.org:
 On 2013/08/13 02:31, Vadim Zhukov wrote:
   -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
   +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
  
   No, we don't want the PSEUDO_FLAVORS to make their way into the
   dependency.
 
  And I do not see PSEUDO_FLAVORS landing in packing list.
  This is with BUILD_PKGPATH being used:
 
  $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
  @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes
 
  $ FLAVOR=no_gtk make show=BUILD_PKGPATH
  net/transmission,no_gtk

 Yes. And what? PSEUDO_FLAVORS do not do their way to packaging list
 (as I showed above), thus inter-package dependencies will be the
 same. Where is the problem? And, if is there, should we change all
 the (BUILD|BASE)_PKGPATH entries in the tree back to hardcoded
 ones?

 A pseudo-flavour is only allowed to enable/disable certain subpackages.
 but with this diff applied, setting the pseudo-flavour changes how
 RUN_DEPENDS-gtk and RUN_DEPEND-qt are set. This isn't permitted and
 PLIST_DB will complain if you rebuild with the various flavours..


 $ FLAVOR=no_qt SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
 transmission-2.82:net/transmission,no_qt devel/desktop-file-utils 
 x11/gtk+2,-guic

 $ SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
 transmission-2.82:net/transmission, devel/desktop-file-utils x11/gtk+2,-guic

For usual FLAVORS it is so, but PSEUDO_FLAVORS are stripped from
resulting plist (which is being written to package and to PLIST_DB).
You can check this easy, just run:

$ SUBPACKAGE=-gtk make print-plist-with-depends /tmp/a
$ FLAVOR=no_qt SUBPACKAGE=-gtk make print-plist-with-depends /tmp/b
$ cmp /tmp/{a,b}  echo They are same!
They are same!

Output of make print-plist-with-depends is what gets in PLIST_DB,
just look in bsd.port.mk. Here is an excerpt with @depend lines:

$ FLAVOR=no_qt SUBPACKAGE=-gtk make print-plist-with-depends | fgrep @depend
@depend converters/libiconv:libiconv-*:libiconv-1.14p0
@depend devel/desktop-file-utils:desktop-file-utils-*:desktop-file-utils-0.21p0
@depend devel/gettext:gettext-=0.10.38:gettext-0.18.2p2
@depend devel/libevent2:libevent-*:libevent-2.0.21
@depend net/curl:curl-*:curl-7.26.0p2
@depend net/miniupnp/libnatpmp:libnatpmp-*:libnatpmp-20120821
@depend net/miniupnp/miniupnpc,-main:miniupnpc-*:miniupnpc-1.8
@depend net/transmission,-main:transmission-2.82:transmission-2.82
@depend x11/gtk+2,-guic:gtk-update-icon-cache-*:gtk-update-icon-cache-2.24.19p1
@depend x11/gtk+3,-main:gtk+3-*:gtk+3-3.8.2p2

No PSEUDO_FLAVORs there, as you can see. And that's the intended behaviour:

PSEUDO_FLAVORS
   Extra list of flavors that do not register in package
   names, but are still used to control build logic, and work
   directory names.  Its only use should be for disabling part
   of a multi-packages build, for instance:

To proof my point, I just build transmission packages with my diff;
first with no_qt FLAVOR, and then with empty FLAVOR. No complains
from PLIST_DB, as expected.

--
  WBR,
  Vadim Zhukov

Re: Update: net/transmission 2.82 drops -qt

2013-08-13 Thread Stuart Henderson

On 2013/08/13 11:43, Vadim Zhukov wrote:
  $ FLAVOR=no_qt SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
  transmission-2.82:net/transmission,no_qt devel/desktop-file-utils 
  x11/gtk+2,-guic
 
  $ SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
  transmission-2.82:net/transmission, devel/desktop-file-utils x11/gtk+2,-guic
 
 For usual FLAVORS it is so, but PSEUDO_FLAVORS are stripped from
 resulting plist (which is being written to package and to PLIST_DB).
 You can check this easy, just run:
 
 $ SUBPACKAGE=-gtk make print-plist-with-depends /tmp/a
 $ FLAVOR=no_qt SUBPACKAGE=-gtk make print-plist-with-depends /tmp/b
 $ cmp /tmp/{a,b}  echo They are same!
 They are same!
 
 Output of make print-plist-with-depends is what gets in PLIST_DB,
 just look in bsd.port.mk. Here is an excerpt with @depend lines:
 
 $ FLAVOR=no_qt SUBPACKAGE=-gtk make print-plist-with-depends | fgrep @depend
 @depend converters/libiconv:libiconv-*:libiconv-1.14p0
 @depend 
 devel/desktop-file-utils:desktop-file-utils-*:desktop-file-utils-0.21p0
 @depend devel/gettext:gettext-=0.10.38:gettext-0.18.2p2
 @depend devel/libevent2:libevent-*:libevent-2.0.21
 @depend net/curl:curl-*:curl-7.26.0p2
 @depend net/miniupnp/libnatpmp:libnatpmp-*:libnatpmp-20120821
 @depend net/miniupnp/miniupnpc,-main:miniupnpc-*:miniupnpc-1.8
 @depend net/transmission,-main:transmission-2.82:transmission-2.82
 @depend 
 x11/gtk+2,-guic:gtk-update-icon-cache-*:gtk-update-icon-cache-2.24.19p1
 @depend x11/gtk+3,-main:gtk+3-*:gtk+3-3.8.2p2
 
 No PSEUDO_FLAVORs there, as you can see. And that's the intended behaviour:
 
 PSEUDO_FLAVORS
Extra list of flavors that do not register in package
names, but are still used to control build logic, and work
directory names.  Its only use should be for disabling part
of a multi-packages build, for instance:
 
 To proof my point, I just build transmission packages with my diff;
 first with no_qt FLAVOR, and then with empty FLAVOR. No complains
 from PLIST_DB, as expected.
 
 --
   WBR,
   Vadim Zhukov

Hmm, this is news to me, but thanks for the detailed explanation, no
objections from me then.

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Christian Weisgerber

Vadim Zhukov persg...@gmail.com wrote:

  This minor release, under the guise of adding support for Qt5, now
  casually requires Qt5 as the minimum version.  Since we don't have
  a Qt5 port, this means dropping the Qt client.  If somebody has a
  strong opinion to the contrary and a better suggestion, speak up.
 
 This is an improved version of your patch, that allows to build with
 Qt4.  Actual Qt4 support needed only two small patches.

Great!

 I fixed WANTLIB handling and RUN_DEPENDS handling while there, too.

What are you trying to fix here?  The extra libs reported by
lib-depends-check for the -qt subpackage?  I can assure you that
transmission-qt pulls in these libraries.  It's just that they are
reached indirectly, e.g., transmission-qt links against libcurl,
which links against libidn.  If you want to fix the extras, I'd
rather link the libraries explicitly in qtr.pro.

 -MODULES= devel/gettext textproc/intltool
 +MODULES= devel/gettext textproc/intltool x11/qt4

No, we don't want a build dependency on Qt4 despite FLAVOR=no_qt.

 -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
 +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \

No, we don't want the PSEUDO_FLAVORS to make their way into the
dependency.

New try:

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 14:22:08 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -44,7 +44,7 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
xcb-render xcb-shm
 WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+   fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo12 Aug 2013 14:22:08 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
-   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
- {
- #elif defined(__sun)
-@@ -235,7 +235,7 @@ getquota (const char * device)
-   /* No quota enabled for this user */
-   return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-   spaceused = (int64_t) dq.dqb_curblocks  1;
- #elif defined(SYS_DARWIN)
-   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_favicon_cc
===
RCS file: patches/patch-qt_favicon_cc
diff -N patches/patch-qt_favicon_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qt_favicon_cc 12 Aug 2013 14:22:08 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- qt/favicon.cc.orig Mon Aug 12 13:27:14 2013
 qt/favicon.cc  Mon Aug 12 13:28:49 2013
+@@ -14,7 +14,12 @@
+ #include QNetworkAccessManager
+ #include QNetworkReply
+ #include QNetworkRequest
++
++#if QT_VERSION = 0x05
+ #include QStandardPaths
++#else
++#include QDesktopServices
++#endif
+ 
+ #include favicon.h
+ 
+@@ -40,7 +45,11 @@

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Vadim Zhukov

2013/8/12 Christian Weisgerber na...@mips.inka.de:
 Vadim Zhukov persg...@gmail.com wrote:

  This minor release, under the guise of adding support for Qt5, now
  casually requires Qt5 as the minimum version.  Since we don't have
  a Qt5 port, this means dropping the Qt client.  If somebody has a
  strong opinion to the contrary and a better suggestion, speak up.

 This is an improved version of your patch, that allows to build with
 Qt4.  Actual Qt4 support needed only two small patches.

 Great!

 I fixed WANTLIB handling and RUN_DEPENDS handling while there, too.

 What are you trying to fix here?  The extra libs reported by
 lib-depends-check for the -qt subpackage?  I can assure you that
 transmission-qt pulls in these libraries.  It's just that they are
 reached indirectly, e.g., transmission-qt links against libcurl,
 which links against libidn.  If you want to fix the extras, I'd
 rather link the libraries explicitly in qtr.pro.

Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
keeping extra WANTLIB.

 -MODULES= devel/gettext textproc/intltool
 +MODULES= devel/gettext textproc/intltool x11/qt4

 No, we don't want a build dependency on Qt4 despite FLAVOR=no_qt.

There should be none: LIB_DEPENDS-qt does not inherit from LIB_DEPENDS,
but uses MODQT_LIB_DEPENDS directly. But I was wrong, I should add
x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
is preferred over simple LDEP because this module sets up some build
environment, too.

 -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
 +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \

 No, we don't want the PSEUDO_FLAVORS to make their way into the
 dependency.

Hm, but bsd.port.mk(5) encourages using BUILD_PKGPATH right for this
sort of situations:

BUILD_PKGPATH
   Full pkgpath(7) to the current port, taking flavors and
   pseudo-flavors into account.  See also BASE_PKGPATH, which
   doesn't include pseudo-flavors.  Mostly useful to write
   dependencies for subpackages like this:
   LIB_DEPENDS-foo=${BUILD_PKGPATH} and avoid starting to
   build a package with some other flavor combination.  See
   pkgpath(7) on the subject of `pkgpath normalisation'.
   Read-only.

And I do not see PSEUDO_FLAVORS landing in packing list.
This is with BUILD_PKGPATH being used:

$ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
@comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

Here is updated patch with idn back to WANTLIB-common.

--
  WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 15:51:16 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -27,13 +27,16 @@ ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
 
+.include bsd.port.arch.mk
+
 # Reminder:
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
-   natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-common=c crypto curl event_core event_extra idn m miniupnpc \
+   natpmp pthread ssl z ${MODGETTEXT_WANTLIB}
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -42,25 +45,31 @@ WANTLIB-gtk=${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
+   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype \
+   stdc++
 
 MODULES=   devel/gettext textproc/intltool
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt4
+.endif
 
-LIB_DEPENDS=   devel/libevent2 \
+LDEP-common=   ${MODGETTEXT_LIB_DEPENDS} \
+   devel/libevent2 \
net/curl \

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Christian Weisgerber

Vadim Zhukov persg...@gmail.com wrote:

 Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
 lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
 keeping extra WANTLIB.

Hmm, but MODQT4_WANTLIB only contains lib/qt4/QtCore.

 x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
 is preferred over simple LDEP because this module sets up some build
 environment, too.

... which isn't passed on to post-build.  Well, MAKE_FLAGS happens to
make it through, but what for? It's not clear to me that MODULES+=x11/qt4
is a gain when we don't need most of its contents and then have to
to work around its WANTLIB and LIB_DEPENDS additions.

  -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
  +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
 
  No, we don't want the PSEUDO_FLAVORS to make their way into the
  dependency.
 
 And I do not see PSEUDO_FLAVORS landing in packing list.
 This is with BUILD_PKGPATH being used:
 
 $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
 @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

$ FLAVOR=no_gtk make show=BUILD_PKGPATH
net/transmission,no_gtk

And there was a reason I didn't use BASE_PKGPATH, too.  *Thinks*
Oh, right.  The -gtk and -qt subpackages should not depend on a
particular REVISION of -main.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 20:24:02 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -42,9 +42,9 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB} ICE SM lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtGui \
+   lib/qt4/QtNetwork lib/qt4/QtXml X11 Xext Xi Xinerama Xrender \
+   fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo12 Aug 2013 20:24:02 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
-   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
- {
- #elif defined(__sun)
-@@ -235,7 +235,7 @@ getquota (const char * device)
-   /* No quota enabled for this user */
-   return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-   spaceused = (int64_t) dq.dqb_curblocks  1;
- #elif defined(SYS_DARWIN)
-   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_favicon_cc
===
RCS file: patches/patch-qt_favicon_cc
diff -N patches/patch-qt_favicon_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qt_favicon_cc 12 Aug 2013 20:24:02 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+---

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Vadim Zhukov

2013/8/13 Christian Weisgerber na...@mips.inka.de:
 Vadim Zhukov persg...@gmail.com wrote:

 Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
 lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
 keeping extra WANTLIB.

 Hmm, but MODQT4_WANTLIB only contains lib/qt4/QtCore.

Yes, and what's wrong with that? The reasoning behind lib/qt4/QtFoo is
that you need to distinct, when doing actual packaging, between
libQtCore.so.X.Y from Qt3, Qt4 and, likely, Qt5. Same applies to other
cases (KDE3 and KDE4 stuff, for example).

 x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
 is preferred over simple LDEP because this module sets up some build
 environment, too.

 ... which isn't passed on to post-build.

Oops. It should be passed in that case, of course. New day, new
knowledge... Fixed, thanks.

 Well, MAKE_FLAGS happens to
 make it through, but what for? It's not clear to me that MODULES+=x11/qt4
 is a gain when we don't need most of its contents and then have to
 to work around its WANTLIB and LIB_DEPENDS additions.

My point is to always use the (x11/qt4) MODULE unless it breaks
things. Or we likely to have problems when Qt5 finally arrives in
ports, because many software could be build with both Qt4 and Qt5.
The situation be the same then to what we have in JDK land already.
qt4.port.mk forces using Qt4, and Qt4 version we have in ports. It
makes builds more reliable - not a need for now but a need for
future. Unless someone will step in and port all of the Qt4-based
software in ports to Qt5. :)

Regarding working around WANTLIB and LIB_DEPENDS:

  -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
  +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
 
  No, we don't want the PSEUDO_FLAVORS to make their way into the
  dependency.

 And I do not see PSEUDO_FLAVORS landing in packing list.
 This is with BUILD_PKGPATH being used:

 $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
 @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

 $ FLAVOR=no_gtk make show=BUILD_PKGPATH
 net/transmission,no_gtk

Yes. And what? PSEUDO_FLAVORS do not do their way to packaging list
(as I showed above), thus inter-package dependencies will be the
same. Where is the problem? And, if is there, should we change all
the (BUILD|BASE)_PKGPATH entries in the tree back to hardcoded
ones?

 And there was a reason I didn't use BASE_PKGPATH, too.  *Thinks*
 Oh, right.  The -gtk and -qt subpackages should not depend on a
 particular REVISION of -main.

Sorry, I got one point, but didn't get another:

1) Yep, I missed the version narrowing. My bad. Fixed.

2) What does REVISION makes with BUILD_PKGPATH/BASE_PKGPATH?

--
  WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 22:30:07 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -27,13 +27,16 @@ ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
 
+.include bsd.port.arch.mk
+
 # Reminder:
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
-   natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-common=c crypto curl event_core event_extra idn m miniupnpc \
+   natpmp pthread ssl z ${MODGETTEXT_WANTLIB}
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -42,25 +45,31 @@ WANTLIB-gtk=${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
+   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype \
+   stdc++
 
 MODULES=   devel/gettext textproc/intltool
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt4
+.endif
 
-LIB_DEPENDS=   devel/libevent2 \
+LDEP-common=   ${MODGETTEXT_LIB_DEPENDS} \
+

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Stuart Henderson

On 2013/08/13 02:31, Vadim Zhukov wrote:
   -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
   +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
  
   No, we don't want the PSEUDO_FLAVORS to make their way into the
   dependency.
 
  And I do not see PSEUDO_FLAVORS landing in packing list.
  This is with BUILD_PKGPATH being used:
 
  $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
  @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes
 
  $ FLAVOR=no_gtk make show=BUILD_PKGPATH
  net/transmission,no_gtk
 
 Yes. And what? PSEUDO_FLAVORS do not do their way to packaging list
 (as I showed above), thus inter-package dependencies will be the
 same. Where is the problem? And, if is there, should we change all
 the (BUILD|BASE)_PKGPATH entries in the tree back to hardcoded
 ones?

A pseudo-flavour is only allowed to enable/disable certain subpackages.
but with this diff applied, setting the pseudo-flavour changes how
RUN_DEPENDS-gtk and RUN_DEPEND-qt are set. This isn't permitted and
PLIST_DB will complain if you rebuild with the various flavours..


$ FLAVOR=no_qt SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
transmission-2.82:net/transmission,no_qt devel/desktop-file-utils 
x11/gtk+2,-guic

$ SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
transmission-2.82:net/transmission, devel/desktop-file-utils x11/gtk+2,-guic

Re: Update: net/transmission 2.82 drops -qt

2013-08-11 Thread Brad Smith


On 10/08/13 7:51 PM, Vadim Zhukov wrote:

Update to 2.82 for more bug fixes.


This minor release, under the guise of adding support for Qt5, now
casually requires Qt5 as the minimum version.  Since we don't have
a Qt5 port, this means dropping the Qt client.  If somebody has a
strong opinion to the contrary and a better suggestion, speak up.


This is an improved version of your patch, that allows to build with
Qt4. I fixed WANTLIB handling and RUN_DEPENDS handling while there,
too. Actual Qt4 support needed only two small patches. I'm afraid of
possible encoding-related fallout (file names, etc.) and/or new
crashes, though. Any testers?


Seems to be fine for me. I had mentioned to Vadim that I was seeing
a crashing issue but I decided to go back to 2.81 to see if I could
reproduce the crash and I could. It happens when I click on the Open 
URL button and only that button. Sometimes it happens relatively 
quickly without only one or two clicks of the button and other times I 
have to click it quite a few times. I usually don't use that button so 
that explains why I haven't seen it before. I usually go through the 
File menu and then open URL from there.


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Update: net/transmission 2.82 drops -qt

2013-08-10 Thread Christian Weisgerber

Update to 2.82 for more bug fixes.

This minor release, under the guise of adding support for Qt5, now
casually requires Qt5 as the minimum version.  Since we don't have
a Qt5 port, this means dropping the Qt client.  If somebody has a
strong opinion to the contrary and a better suggestion, speak up.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile10 Aug 2013 21:02:42 -
@@ -2,13 +2,11 @@
 
 COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
-COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
-PKGNAME-qt=transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
@@ -20,11 +18,9 @@ PERMIT_PACKAGE_CDROM=Yes
 MASTER_SITES=  http://download.transmissionbt.com/files/
 EXTRACT_SUFX=  .tar.xz
 
-MULTI_PACKAGES=-main -gtk -qt
+MULTI_PACKAGES=-main -gtk
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
-
-PSEUDO_FLAVORS=no_gtk no_qt
+PSEUDO_FLAVORS=no_gtk
 FLAVOR?=
 
 # Reminder:
@@ -42,9 +38,6 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
@@ -54,14 +47,10 @@ LIB_DEPENDS=devel/libevent2 \
net/miniupnp/miniupnpc
 LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS} \
-   x11/qt4
 
 RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils \
x11/gtk+2,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:net/transmission,-main \
-   devel/desktop-file-utils
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
@@ -76,9 +65,6 @@ CONFIGURE_ARGS+=--disable-utp
 CONFIGURE_ENV= CPPFLAGS=-I${WRKSRC}/third-party -I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 
-QMAKE_ARGS=QMAKE_CXX=${CXX} \
-   QMAKE_CXXFLAGS=${CXXFLAGS}
-
 .include bsd.port.arch.mk
 
 .if !${BUILD_PACKAGES:M-gtk}
@@ -87,21 +73,5 @@ CONFIGURE_ARGS+=--without-gtk
 
 pre-patch:
@cd ${WRKSRC}/third-party/libutp; perl -pi -e 's/\r$$//' *.h *.cpp
-
-.if ${BUILD_PACKAGES:M-qt}
-post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
-
-post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE=${INSTALL_DATA} \
-   INSTALL_PROGRAM=${INSTALL_PROGRAM}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-   ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
-   ${PREFIX}/share/applications/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
-   ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
-   ${PREFIX}/share/pixmaps/transmission-qt.png
-.endif
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo10 Aug 2013 21:02:42 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) ||

Re: Update: net/transmission 2.82 drops -qt

2013-08-10 Thread Brad Smith


On 10/08/13 5:09 PM, Christian Weisgerber wrote:

Update to 2.82 for more bug fixes.

This minor release, under the guise of adding support for Qt5, now
casually requires Qt5 as the minimum version.  Since we don't have
a Qt5 port, this means dropping the Qt client.  If somebody has a
strong opinion to the contrary and a better suggestion, speak up.


I do object. All I use is the Qt client. Is anyone working on a Qt 5.1 
port? Its not like that can be put off for that long as Qt based apps
will want to switch over fairly quickly and there is quite a growing 
number of Qt apps even outside of KDE using.




Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile10 Aug 2013 21:02:42 -
@@ -2,13 +2,11 @@

  COMMENT-main= BitTorrent command line and daemon client
  COMMENT-gtk=  BitTorrent client with GTK+ interface
-COMMENT-qt=BitTorrent client with Qt interface

-VER=   2.81
+VER=   2.82
  DISTNAME= transmission-${VER}
  PKGNAME-main= transmission-${VER}
  PKGNAME-gtk=  transmission-gtk-${VER}
-PKGNAME-qt=transmission-qt-${VER}
  CATEGORIES=   net
  HOMEPAGE= http://www.transmissionbt.com/

@@ -20,11 +18,9 @@ PERMIT_PACKAGE_CDROM=Yes
  MASTER_SITES= http://download.transmissionbt.com/files/
  EXTRACT_SUFX= .tar.xz

-MULTI_PACKAGES=-main -gtk -qt
+MULTI_PACKAGES=-main -gtk

-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
-
-PSEUDO_FLAVORS=no_gtk no_qt
+PSEUDO_FLAVORS=no_gtk
  FLAVOR?=

  # Reminder:
@@ -42,9 +38,6 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++

  MODULES=  devel/gettext textproc/intltool

@@ -54,14 +47,10 @@ LIB_DEPENDS=devel/libevent2 \
net/miniupnp/miniupnpc
  LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS} \
-   x11/qt4

  RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils \
x11/gtk+2,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:net/transmission,-main \
-   devel/desktop-file-utils

  USE_GMAKE=Yes
  CONFIGURE_STYLE=gnu
@@ -76,9 +65,6 @@ CONFIGURE_ARGS+=--disable-utp
  CONFIGURE_ENV=CPPFLAGS=-I${WRKSRC}/third-party 
-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib

-QMAKE_ARGS=QMAKE_CXX=${CXX} \
-   QMAKE_CXXFLAGS=${CXXFLAGS}
-
  .include bsd.port.arch.mk

  .if !${BUILD_PACKAGES:M-gtk}
@@ -87,21 +73,5 @@ CONFIGURE_ARGS+=--without-gtk

  pre-patch:
@cd ${WRKSRC}/third-party/libutp; perl -pi -e 's/\r$$//' *.h *.cpp
-
-.if ${BUILD_PACKAGES:M-qt}
-post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
-
-post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE=${INSTALL_DATA} \
-   INSTALL_PROGRAM=${INSTALL_PROGRAM}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-   ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
-   ${PREFIX}/share/applications/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
-   ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \
-   ${PREFIX}/share/pixmaps/transmission-qt.png
-.endif

  .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo10 Aug 2013 21:02:42 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
-
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
--

Re: Update: net/transmission 2.82 drops -qt

2013-08-10 Thread Vadim Zhukov

Update to 2.82 for more bug fixes.

 This minor release, under the guise of adding support for Qt5, now
 casually requires Qt5 as the minimum version.  Since we don't have
 a Qt5 port, this means dropping the Qt client.  If somebody has a
 strong opinion to the contrary and a better suggestion, speak up.

This is an improved version of your patch, that allows to build with
Qt4. I fixed WANTLIB handling and RUN_DEPENDS handling while there,
too. Actual Qt4 support needed only two small patches. I'm afraid of
possible encoding-related fallout (file names, etc.) and/or new
crashes, though. Any testers?

--
  WBR,
Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile10 Aug 2013 23:42:18 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -31,36 +31,40 @@ FLAVOR?=
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
-   natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-common=c crypto curl event_core event_extra m miniupnpc \
+   natpmp pthread ssl z ${MODGETTEXT_WANTLIB}
+WANTLIB-main=  ${WANTLIB-common} idn
+WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
+   harfbuzz idn pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
+   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype \
+   stdc++
 
-MODULES=   devel/gettext textproc/intltool
+MODULES=   devel/gettext textproc/intltool x11/qt4
 
-LIB_DEPENDS=   devel/libevent2 \
+LDEP-common=   ${MODGETTEXT_LIB_DEPENDS} \
+   devel/libevent2 \
net/curl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc
-LIB_DEPENDS-gtk=${LIB_DEPENDS} \
+LIB_DEPENDS-main=${LDEP-common}
+LIB_DEPENDS-gtk=${LDEP-common} \
x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS} \
-   x11/qt4
+LIB_DEPENDS-qt=${LDEP-common} \
+   ${MODQT_LIB_DEPENDS}
 
-RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
+RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+2,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:net/transmission,-main \
+RUN_DEPENDS-qt=${BUILD_PKGPATH} \
devel/desktop-file-utils
 
 USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo10 Aug 2013 23:42:18 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: 
/cvs/ports/net/transmission/patches/patch-libtransmission_platform-quota_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ patches/patch-libtransmission_platform-quota_c  10 Aug 2013 23:42:18 
-
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by

Re: Update: net/transmission 2.82 drops -qt

2013-08-10 Thread Brad Smith


On 10/08/13 7:51 PM, Vadim Zhukov wrote:

Update to 2.82 for more bug fixes.


This minor release, under the guise of adding support for Qt5, now
casually requires Qt5 as the minimum version.  Since we don't have
a Qt5 port, this means dropping the Qt client.  If somebody has a
strong opinion to the contrary and a better suggestion, speak up.


This is an improved version of your patch, that allows to build with
Qt4. I fixed WANTLIB handling and RUN_DEPENDS handling while there,
too. Actual Qt4 support needed only two small patches. I'm afraid of
possible encoding-related fallout (file names, etc.) and/or new
crashes, though. Any testers?


I definitely will. I'll start building now.

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Update: net/transmission 2.81

2013-08-06 Thread Christian Weisgerber

Update net/transmission to 2.81 for some bug fixes.
As usual this could use some testing.  I'm finding myself using
BitTorrent less and less.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile12 Jul 2013 17:03:59 -  1.88
+++ Makefile6 Aug 2013 18:46:48 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.80
+VER=   2.81
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo12 Jul 2013 17:03:59 -  1.45
+++ distinfo6 Aug 2013 18:46:48 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.80.tar.xz) = 
DqC8YuORfOTLhIWCiI7NzQwNvo/7lILXMwyCPh/xXfM=
-SIZE (transmission-2.80.tar.xz) = 3167136
+SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
+SIZE (transmission-2.81.tar.xz) = 3167816
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_platform-quota_c  6 Aug 2013 18:46:48 
-
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
 libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
+@@ -18,7 +18,7 @@
+ 
+ #ifndef WIN32
+  #include sys/types.h /* types needed by quota.h */
+- #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+   #include ufs/ufs/quota.h /* quotactl() */
+  #elif defined (__sun)
+   #include sys/fs/ufs_quota.h /* quotactl */
+@@ -203,7 +203,7 @@ getquota (const char * device)
+   int64_t freespace;
+   int64_t spaceused;
+ 
+-#if defined(__FreeBSD__) || defined(SYS_DARWIN)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
+   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
+ {
+ #elif defined(__sun)
+@@ -235,7 +235,7 @@ getquota (const char * device)
+   /* No quota enabled for this user */
+   return -1;
+ }
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+   spaceused = (int64_t) dq.dqb_curblocks  1;
+ #elif defined(SYS_DARWIN)
+   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-libtransmission_platform_c
===
RCS file: patches/patch-libtransmission_platform_c
diff -N patches/patch-libtransmission_platform_c
--- patches/patch-libtransmission_platform_c12 Jul 2013 17:03:59 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform_c,v 1.1 2013/07/12 17:03:59 naddy Exp 
$
 libtransmission/platform.c.origWed Jun 26 04:35:25 2013
-+++ libtransmission/platform.c Sat Jul  6 21:57:56 2013
-@@ -12,7 +12,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -751,7 +751,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
-   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
- {
- #elif defined(__sun)
-@@ -783,7 +783,7 @@ getquota (const char * device)
-   /* No quota enabled for this user */
-   return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-   spaceused = (int64_t) dq.dqb_curblocks  1;
- #elif defined(SYS_DARWIN)
-   spaceused = (int64_t) dq.dqb_curbytes;
-- 
Christian naddy Weisgerber  na...@mips.inka.de

Update: net/transmission 2.80

2013-07-06 Thread Christian Weisgerber

Here's an update of net/transmission to 2.80, largely untested as yet.
https://trac.transmissionbt.com/wiki/Changes#version-2.80

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile31 May 2013 15:34:53 -  1.87
+++ Makefile6 Jul 2013 21:01:18 -
@@ -4,14 +4,11 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.77
+VER=   2.80
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION-main= 1
-REVISION-gtk=  1
-REVISION-qt=   1
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo20 Mar 2013 20:18:07 -  1.44
+++ distinfo6 Jul 2013 21:01:18 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.77.tar.xz) = 
VbFlP8GKEBU7qUOfKEvXsidqaFlBbcriF9noxomEH94=
-SIZE (transmission-2.77.tar.xz) = 2953840
+SHA256 (transmission-2.80.tar.xz) = 
DqC8YuORfOTLhIWCiI7NzQwNvo/7lILXMwyCPh/xXfM=
+SIZE (transmission-2.80.tar.xz) = 3167136
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.30
diff -u -p -r1.30 patch-configure
--- patches/patch-configure 20 Mar 2013 20:18:07 -  1.30
+++ patches/patch-configure 6 Jul 2013 21:01:18 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.30 2013/03/20 20:18:07 naddy Exp $
 configure.orig Mon Feb 18 15:43:15 2013
-+++ configure  Wed Mar 20 16:41:17 2013
-@@ -11762,8 +11762,8 @@ if test 0 = 0; then
+--- configure.orig Wed Jun 26 04:36:03 2013
 configure  Sat Jul  6 21:51:16 2013
+@@ -11800,8 +11800,8 @@ if test 0 = 0; then
  else
supported_build=no
if test x$GCC = xyes ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.30 2013/03
fi
  fi
   if test x$supported_build = xno; then
-@@ -16155,7 +16155,7 @@ esac
+@@ -16193,7 +16193,7 @@ esac
  
  if test x$GCC = xyes ; then
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.30 2013/03
  
  { $as_echo $as_me:${as_lineno-$LINENO}: checking gcc version 5
  $as_echo_n checking gcc version...  6; }
-@@ -16167,10 +16167,10 @@ $as_echo_n checking gcc version...  6; }
+@@ -16205,10 +16205,10 @@ $as_echo_n checking gcc version...  6; }
  { $as_echo $as_me:${as_lineno-$LINENO}: result: $GCC_VERSION 5
  $as_echo $GCC_VERSION 6; }
  if test $GCC_VERSION_NUM -ge 304; then
Index: patches/patch-libtransmission_platform_c
===
RCS file: patches/patch-libtransmission_platform_c
diff -N patches/patch-libtransmission_platform_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_platform_c6 Jul 2013 21:01:18 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- libtransmission/platform.c.origWed Jun 26 04:35:25 2013
 libtransmission/platform.c Sat Jul  6 21:57:56 2013
+@@ -12,7 +12,7 @@
+ 
+ #ifndef WIN32
+  #include sys/types.h /* types needed by quota.h */
+- #ifdef __FreeBSD__
++ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+   #include ufs/ufs/quota.h /* quotactl() */
+  #elif defined (__sun)
+   #include sys/fs/ufs_quota.h /* quotactl */
+@@ -751,7 +751,7 @@ getquota (const char * device)
+   int64_t freespace;
+   int64_t spaceused;
+ 
+-#if defined(__FreeBSD__) || defined(SYS_DARWIN)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
+   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
+ {
+ #elif defined(__sun)
+@@ -783,7 +783,7 @@ getquota (const char * device)
+   /* No quota enabled for this user */
+   return -1;
+ }
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+   spaceused = (int64_t) dq.dqb_curblocks  1;
+ #elif defined(SYS_DARWIN)
+   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_torrent-filter_cc
===
RCS file: patches/patch-qt_torrent-filter_cc
diff -N patches/patch-qt_torrent-filter_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qt_torrent-filter_cc  6 Jul 2013 21:01:18 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qt/torrent-filter.cc.orig  Sat Jul  6 22:21:17 2013
 qt/torrent-filter.cc   Sat Jul  6 22:29:10 2013
+@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const
+ void
+ TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
+ {
+-  std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
++  std::fill_n (setmeCounts,

Re: Update: net/transmission 2.71

2012-09-29 Thread David Coppa

On Sat, Sep 29, 2012 at 7:04 AM, Brad Smith b...@comstyle.com wrote:
 On Thu, Sep 27, 2012 at 09:10:11PM +0200, Christian Weisgerber wrote:
 Update net/transmission to 2.71.
 Numerous bug fixes and small changes.

 Includes work by dcoppa@ originally for 2.61.

 Works for me, but there is too much functionality to test it all.

 Tested on amd64 with the Qt frontend. Downloaded 30 odd torrents.

 ok brad@

Works fine for me too. Ok dcoppa@

Re: Update: net/transmission 2.71

2012-09-28 Thread Brad Smith

On Thu, Sep 27, 2012 at 09:10:11PM +0200, Christian Weisgerber wrote:
 Update net/transmission to 2.71.
 Numerous bug fixes and small changes.
 
 Includes work by dcoppa@ originally for 2.61.
 
 Works for me, but there is too much functionality to test it all.

Tested on amd64 with the Qt frontend. Downloaded 30 odd torrents.

ok brad@

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Update: net/transmission 2.71

2012-09-27 Thread Christian Weisgerber

Update net/transmission to 2.71.
Numerous bug fixes and small changes.

Includes work by dcoppa@ originally for 2.61.

Works for me, but there is too much functionality to test it all.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- Makefile15 Jun 2012 08:32:17 -  1.77
+++ Makefile27 Sep 2012 19:00:17 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.52
+VER=   2.71
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -12,8 +12,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
-REVISION-gtk=  0
-
 MAINTAINER=Christian Weisgerber na...@openbsd.org
 
 # GPLv2
@@ -38,11 +36,13 @@ FLAVOR?=
 
 WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
-   Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
-   cairo-gobject drm expat ffi fontconfig freetype \
+WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xau Xcomposite Xcursor Xdamage \
+   Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm \
+   GL atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
+   dbus-1 drm expat ffi fontconfig freetype \
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
+   gobject-2.0 gthread-2.0 gtk-3 \
+   harfbuzz icudata icule icuuc pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
 WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
@@ -91,6 +91,9 @@ QMAKE_ARGS=   QMAKE_CXX=${CXX} \
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
 .endif
+
+pre-patch:
+   @cd ${WRKSRC}/third-party/libutp; perl -pi -e 's/\r$$//' *.h *.cpp
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo26 May 2012 15:43:55 -  1.39
+++ distinfo27 Sep 2012 19:00:17 -
@@ -1,5 +1,2 @@
-MD5 (transmission-2.52.tar.xz) = tQzIe0zXe6DL2pi1VopNBw==
-RMD160 (transmission-2.52.tar.xz) = rVQWSGS4hHbUElc+iaBUBSQCLCY=
-SHA1 (transmission-2.52.tar.xz) = ccQnOKqGs2DLUn7HltVi8S+GqEw=
-SHA256 (transmission-2.52.tar.xz) = 
vN37e+AUvCdld1olIXID0ye9HsEhlxlUYj2MM2DBThc=
-SIZE (transmission-2.52.tar.xz) = 2784408
+SHA256 (transmission-2.71.tar.xz) = 
1ieH1HKhyz6OBkgpvK5/F6cuWVmqg3AQzegv792oCDY=
+SIZE (transmission-2.71.tar.xz) = 2929516
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.28
diff -u -p -r1.28 patch-configure
--- patches/patch-configure 18 Apr 2012 10:46:07 -  1.28
+++ patches/patch-configure 27 Sep 2012 19:00:17 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.28 2012/04/18 10:46:07 naddy Exp $
 configure.orig Mon Apr  9 05:01:59 2012
-+++ configure  Sun Apr 15 12:01:27 2012
-@@ -11753,8 +11753,8 @@ if test 0 = 0; then
+--- configure.orig Tue Jul 24 03:59:24 2012
 configure  Wed Aug 29 14:06:00 2012
+@@ -11769,8 +11769,8 @@ if test 0 = 0; then
  else
supported_build=no
if test x$GCC = xyes ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.28 2012/04
fi
  fi
   if test x$supported_build = xno; then
-@@ -16163,7 +16163,7 @@ esac
+@@ -16176,7 +16176,7 @@ esac
  
  if test x$GCC = xyes ; then
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.28 2012/04
  
  { $as_echo $as_me:${as_lineno-$LINENO}: checking gcc version 5
  $as_echo_n checking gcc version...  6; }
-@@ -16175,10 +16175,10 @@ $as_echo_n checking gcc version...  6; }
+@@ -16188,10 +16188,10 @@ $as_echo_n checking gcc version...  6; }
  { $as_echo $as_me:${as_lineno-$LINENO}: result: $GCC_VERSION 5
  $as_echo $GCC_VERSION 6; }
  if test $GCC_VERSION_NUM -ge 304; then
Index: patches/patch-third-party_libutp_utypes_h
===
RCS file: patches/patch-third-party_libutp_utypes_h
diff -N patches/patch-third-party_libutp_utypes_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-third-party_libutp_utypes_h   27 Sep 2012 19:00:17 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+tr-utp.c:66: error: conflicting types for 'UTP_Write'
+(https://trac.transmissionbt.com/ticket/4528)
+
+--- third-party/libutp/utypes.h.orig   Wed

Re: Update: net/transmission 2.50

2012-04-01 Thread Gonzalo L. R.

Works fine here on amd64, the cli and gtk package.


El 03/30/12 20:04, Christian Weisgerber escribió:
 David Coppa dco...@gmail.com wrote:
 
 Just out of curiosity... Why not patching transmission to use
 libnatpmp from the ports then?
 
 I was going the path of least resistance and hadn't even bothered
 to check which libnatpmp was newer...  So here's a slightly tweaked
 version that relies on net/miniupnp/libnatpmp.
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/net/transmission/Makefile,v
 retrieving revision 1.73
 diff -u -p -r1.73 Makefile
 --- Makefile  1 Jan 2012 09:04:13 -   1.73
 +++ Makefile  30 Mar 2012 23:02:05 -
 @@ -4,7 +4,7 @@ COMMENT-main= BitTorrent command line an
  COMMENT-gtk= BitTorrent client with GTK+ interface
  COMMENT-qt=  BitTorrent client with Qt interface
  
 -VER= 2.42
 +VER= 2.50
  DISTNAME=transmission-${VER}
  PKGNAME-main=transmission-${VER}
  PKGNAME-gtk= transmission-gtk-${VER}
 @@ -12,8 +12,6 @@ PKGNAME-qt= transmission-qt-${VER}
  CATEGORIES=  net
  HOMEPAGE=http://www.transmissionbt.com/
  
 -REVISION-gtk=1
 -
  MAINTAINER=  Christian Weisgerber na...@openbsd.org
  
  # GPLv2
 @@ -36,7 +34,8 @@ FLAVOR?=
  # MODULES adds to WANTLIB and LIB_DEPENDS
  # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
  
 -WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z
 +WANTLIB= c crypto curl event_core event_extra idn m miniupnpc \
 + natpmp pthread ssl z
  WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
   Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
   cairo-gobject drm expat ffi fontconfig freetype \
 @@ -44,13 +43,16 @@ WANTLIB-gtk=  ${WANTLIB} X11 Xau Xcomposi
   gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
   pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
   xcb-render xcb-shm
 -WANTLIB-qt=  ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
 +WANTLIB-qt=  ${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
 + X11 Xext Xi Xinerama Xrender \
   expat fontconfig freetype stdc++
  
  MODULES= devel/gettext textproc/intltool
  
  LIB_DEPENDS= devel/libevent2 \
 - net/curl
 + net/curl \
 + net/miniupnp/libnatpmp \
 + net/miniupnp/miniupnpc
  LIB_DEPENDS-gtk=${LIB_DEPENDS} \
   x11/gtk+3
  LIB_DEPENDS-qt=  ${LIB_DEPENDS} \
 @@ -68,11 +70,15 @@ TAR=  ${LOCALBASE}/bin/gtar
  USE_GMAKE=   Yes
  USE_LIBTOOL= Yes
  CONFIGURE_STYLE=gnu
 -CONFIGURE_ARGS=  --disable-shared
 +CONFIGURE_ARGS=  --disable-shared \
 + --enable-external-natpmp
  # unaligned accesses throughout
  CONFIGURE_ARGS+=--disable-utp
  
 -CONFIGURE_ENV=   CPPFLAGS=-I${LOCALBASE}/include \
 +# -I$(top_builddir)/third-party is required, but configure fails to
 +# set it if we use external miniupnp libs.
 +
 +CONFIGURE_ENV=   CPPFLAGS=-I${WRKSRC}/third-party 
 -I${LOCALBASE}/include \
   LDFLAGS=-L${LOCALBASE}/lib
  
  .include bsd.port.arch.mk
 Index: distinfo
 ===
 RCS file: /cvs/ports/net/transmission/distinfo,v
 retrieving revision 1.36
 diff -u -p -r1.36 distinfo
 --- distinfo  15 Nov 2011 16:05:19 -  1.36
 +++ distinfo  30 Mar 2012 23:02:05 -
 @@ -1,5 +1,5 @@
 -MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
 -RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
 -SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
 -SHA256 (transmission-2.42.tar.xz) = 
 ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
 -SIZE (transmission-2.42.tar.xz) = 2629072
 +MD5 (transmission-2.50.tar.xz) = B2Bnifqy+XMPpFTPx6BLLQ==
 +RMD160 (transmission-2.50.tar.xz) = cpn3QQr1j7utKk5XcfM7ySPyod4=
 +SHA1 (transmission-2.50.tar.xz) = 3wwZwDgPKLOeY5HKsodfz3IKxws=
 +SHA256 (transmission-2.50.tar.xz) = 
 wnHI9LZJWcKxuhJFxGXj7Ce1RQEo9A4VwH/y8Tbp+QA=
 +SIZE (transmission-2.50.tar.xz) = 2766300
 Index: patches/patch-configure
 ===
 RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
 retrieving revision 1.26
 diff -u -p -r1.26 patch-configure
 --- patches/patch-configure   15 Nov 2011 16:05:19 -  1.26
 +++ patches/patch-configure   30 Mar 2012 23:02:05 -
 @@ -1,7 +1,7 @@
  $OpenBSD: patch-configure,v 1.26 2011/11/15 16:05:19 naddy Exp $
  configure.orig   Thu Oct 20 04:02:58 2011
 -+++ configureSun Nov  6 19:06:37 2011
 -@@ -11648,8 +11648,8 @@ if test 0 = 0; then
 +--- configure.orig   Wed Feb 15 03:02:06 2012
  configureThu Mar 29 17:30:45 2012
 +@@ -11753,8 +11753,8 @@ if test 0 = 0; then
   else
 supported_build=no
 if test x$GCC = xyes ; then
 @@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v

Re: Update: net/transmission 2.50

2012-03-30 Thread David Coppa

On Thu, Mar 29, 2012 at 9:50 PM, Christian Weisgerber
na...@mips.inka.de wrote:
 This updates net/transmission to 2.50.  New in this version:
 * Overhauled web client.
 * Various bug fixes.

 The port now uses the external miniupnp client library from the
 ports tree.  We can't do the same for natpmp because the included
 version has a different API.

Just out of curiosity... Why not patching transmission to use
libnatpmp from the ports then?

I did this for mldonkey:

ports/net/mldonkey/stable/patches/patch-src_utils_net_upnp_stubs_c

ciao,
David

Re: Update: net/transmission 2.50

2012-03-30 Thread Christian Weisgerber

David Coppa dco...@gmail.com wrote:

 Just out of curiosity... Why not patching transmission to use
 libnatpmp from the ports then?

I was going the path of least resistance and hadn't even bothered
to check which libnatpmp was newer...  So here's a slightly tweaked
version that relies on net/miniupnp/libnatpmp.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile1 Jan 2012 09:04:13 -   1.73
+++ Makefile30 Mar 2012 23:02:05 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.42
+VER=   2.50
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -12,8 +12,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
-REVISION-gtk=  1
-
 MAINTAINER=Christian Weisgerber na...@openbsd.org
 
 # GPLv2
@@ -36,7 +34,8 @@ FLAVOR?=
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m pthread ssl z
+WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
+   natpmp pthread ssl z
 WANTLIB-gtk=   ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
cairo-gobject drm expat ffi fontconfig freetype \
@@ -44,13 +43,16 @@ WANTLIB-gtk=${WANTLIB} X11 Xau Xcomposi
gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
+WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
+   X11 Xext Xi Xinerama Xrender \
expat fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
 LIB_DEPENDS=   devel/libevent2 \
-   net/curl
+   net/curl \
+   net/miniupnp/libnatpmp \
+   net/miniupnp/miniupnpc
 LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS} \
@@ -68,11 +70,15 @@ TAR=${LOCALBASE}/bin/gtar
 USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--disable-shared
+CONFIGURE_ARGS=--disable-shared \
+   --enable-external-natpmp
 # unaligned accesses throughout
 CONFIGURE_ARGS+=--disable-utp
 
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+# -I$(top_builddir)/third-party is required, but configure fails to
+# set it if we use external miniupnp libs.
+
+CONFIGURE_ENV= CPPFLAGS=-I${WRKSRC}/third-party -I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 
 .include bsd.port.arch.mk
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo15 Nov 2011 16:05:19 -  1.36
+++ distinfo30 Mar 2012 23:02:05 -
@@ -1,5 +1,5 @@
-MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
-RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
-SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
-SHA256 (transmission-2.42.tar.xz) = 
ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
-SIZE (transmission-2.42.tar.xz) = 2629072
+MD5 (transmission-2.50.tar.xz) = B2Bnifqy+XMPpFTPx6BLLQ==
+RMD160 (transmission-2.50.tar.xz) = cpn3QQr1j7utKk5XcfM7ySPyod4=
+SHA1 (transmission-2.50.tar.xz) = 3wwZwDgPKLOeY5HKsodfz3IKxws=
+SHA256 (transmission-2.50.tar.xz) = 
wnHI9LZJWcKxuhJFxGXj7Ce1RQEo9A4VwH/y8Tbp+QA=
+SIZE (transmission-2.50.tar.xz) = 2766300
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.26
diff -u -p -r1.26 patch-configure
--- patches/patch-configure 15 Nov 2011 16:05:19 -  1.26
+++ patches/patch-configure 30 Mar 2012 23:02:05 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.26 2011/11/15 16:05:19 naddy Exp $
 configure.orig Thu Oct 20 04:02:58 2011
-+++ configure  Sun Nov  6 19:06:37 2011
-@@ -11648,8 +11648,8 @@ if test 0 = 0; then
+--- configure.orig Wed Feb 15 03:02:06 2012
 configure  Thu Mar 29 17:30:45 2012
+@@ -11753,8 +11753,8 @@ if test 0 = 0; then
  else
supported_build=no
if test x$GCC = xyes ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11
fi
  fi
   if test x$supported_build = xno; then
-@@ -16049,7 +16049,7 @@ esac
+@@ -16153,7 +16153,7 @@ esac
  
  if test x$GCC = xyes ; then
  
@@

Update: net/transmission 2.50

2012-03-29 Thread Christian Weisgerber

This updates net/transmission to 2.50.  New in this version:
* Overhauled web client.
* Various bug fixes.

The port now uses the external miniupnp client library from the
ports tree.  We can't do the same for natpmp because the included
version has a different API.

I'm especially interested in feedback from people who use the GTK+
and Qt clients, because I don't.

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile1 Jan 2012 09:04:13 -   1.73
+++ Makefile29 Mar 2012 19:33:56 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.42
+VER=   2.50
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -12,8 +12,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
-REVISION-gtk=  1
-
 MAINTAINER=Christian Weisgerber na...@openbsd.org
 
 # GPLv2
@@ -36,7 +34,8 @@ FLAVOR?=
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m pthread ssl z
+WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
+   pthread ssl z
 WANTLIB-gtk=   ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
cairo-gobject drm expat ffi fontconfig freetype \
@@ -44,13 +43,15 @@ WANTLIB-gtk=${WANTLIB} X11 Xau Xcomposi
gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
+WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
+   X11 Xext Xi Xinerama Xrender \
expat fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
 LIB_DEPENDS=   devel/libevent2 \
-   net/curl
+   net/curl \
+   net/miniupnp/miniupnpc
 LIB_DEPENDS-gtk=${LIB_DEPENDS} \
x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS} \
@@ -72,7 +73,12 @@ CONFIGURE_ARGS=  --disable-shared
 # unaligned accesses throughout
 CONFIGURE_ARGS+=--disable-utp
 
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+# header and API conflict with net/miniupnp/natpmp
+INCLUDE_PATH=  -I${WRKSRC}/third-party/libnatpmp
+# configure fails to set this if it finds an external miniupnp
+INCLUDE_PATH+= -I${WRKSRC}/third-party
+
+CONFIGURE_ENV= CPPFLAGS=${INCLUDE_PATH} -I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
 
 .include bsd.port.arch.mk
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo15 Nov 2011 16:05:19 -  1.36
+++ distinfo29 Mar 2012 19:33:56 -
@@ -1,5 +1,5 @@
-MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
-RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
-SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
-SHA256 (transmission-2.42.tar.xz) = 
ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
-SIZE (transmission-2.42.tar.xz) = 2629072
+MD5 (transmission-2.50.tar.xz) = B2Bnifqy+XMPpFTPx6BLLQ==
+RMD160 (transmission-2.50.tar.xz) = cpn3QQr1j7utKk5XcfM7ySPyod4=
+SHA1 (transmission-2.50.tar.xz) = 3wwZwDgPKLOeY5HKsodfz3IKxws=
+SHA256 (transmission-2.50.tar.xz) = 
wnHI9LZJWcKxuhJFxGXj7Ce1RQEo9A4VwH/y8Tbp+QA=
+SIZE (transmission-2.50.tar.xz) = 2766300
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.26
diff -u -p -r1.26 patch-configure
--- patches/patch-configure 15 Nov 2011 16:05:19 -  1.26
+++ patches/patch-configure 29 Mar 2012 19:33:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.26 2011/11/15 16:05:19 naddy Exp $
 configure.orig Thu Oct 20 04:02:58 2011
-+++ configure  Sun Nov  6 19:06:37 2011
-@@ -11648,8 +11648,8 @@ if test 0 = 0; then
+--- configure.orig Wed Feb 15 03:02:06 2012
 configure  Thu Mar 29 17:30:45 2012
+@@ -11753,8 +11753,8 @@ if test 0 = 0; then
  else
supported_build=no
if test x$GCC = xyes ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11
fi
  fi
   if test x$supported_build = xno; then
-@@ -16049,7 +16049,7 @@ esac
+@@ -16153,7 +16153,7 @@ esac
  
  if test x$GCC = xyes ; then
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.26 2011/11
  
  { $as_echo

Re: Update: net/transmission 2.42

2011-11-07 Thread LEVAI Daniel

 This updates net/transmission to 2.42.

The -gtk package doesn't build here :\

$ make package
===  Building package for transmission-2.42
Create /usr/ports/packages/i386/all/transmission-2.42.tgz
Link to /usr/ports/packages/i386/ftp/transmission-2.42.tgz
Link to /usr/ports/packages/i386/cdrom/transmission-2.42.tgz
`/usr/ports/pobj/transmission-2.42/fake-i386/.fake_done' is up to date.
===  Building package for transmission-gtk-2.42
Create /usr/ports/packages/i386/all/transmission-gtk-2.42.tgz
Error: Dependency transmission-2.42 doesn't match FULLPKGNAME: transmission-2.33
Error: Dependency transmission-2.42 doesn't match FULLPKGNAME: transmission-2.33
Error: @depend net/transmission,-main:transmission-2.42:transmission-2.33
  pattern transmission-2.42 doesn't match default transmission-2.33

Fatal error: can't continue
 at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1224
*** Error code 1

Stop in /usr/ports/mystuff/net/transmission (line 1640 of 
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/mystuff/net/transmission (line 2167 of 
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/mystuff/net/transmission (line 2147 of 
/usr/ports/infrastructure/mk/bsd.port.mk).



I don't have any previous transmission package(s) installed, the patch
applied clean to net/transmission and I have an updated ports tree too.


Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: Update: net/transmission 2.42

2011-11-07 Thread Brad


- Original message -
 On Sun, Nov 6, 2011 at 10:41 PM, Brad b...@comstyle.com wrote:
  On 06/11/11 4:40 PM, David Coppa wrote:
   
   On Sun, Nov 6, 2011 at 9:28 PM, Bradb...@comstyle.com  wrote:
   
I much prefer Qt apps but what exactly is the objection with Gtk+3
over 2?
   
   It's just that I don't want to install gtk3 only for using my
   favourite bittorrent client...
  
  You don't use any other Gtk+ apps?
 
 Sure, but they're all gtk+2

and they will be moving to Gtk+3 over time. Most pretty soon.

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: Update: net/transmission 2.42

2011-11-07 Thread Stuart Henderson

you have some confusion between /usr/ports and /usr/ports/mystuff

On 2011-11-07, LEVAI Daniel l...@ecentrum.hu wrote:
 This updates net/transmission to 2.42.

 The -gtk package doesn't build here :\

 $ make package
===  Building package for transmission-2.42
 Create /usr/ports/packages/i386/all/transmission-2.42.tgz
 Link to /usr/ports/packages/i386/ftp/transmission-2.42.tgz
 Link to /usr/ports/packages/i386/cdrom/transmission-2.42.tgz
 `/usr/ports/pobj/transmission-2.42/fake-i386/.fake_done' is up to date.
===  Building package for transmission-gtk-2.42
 Create /usr/ports/packages/i386/all/transmission-gtk-2.42.tgz
 Error: Dependency transmission-2.42 doesn't match FULLPKGNAME: 
 transmission-2.33
 Error: Dependency transmission-2.42 doesn't match FULLPKGNAME: 
 transmission-2.33
 Error: @depend net/transmission,-main:transmission-2.42:transmission-2.33
   pattern transmission-2.42 doesn't match default transmission-2.33

 Fatal error: can't continue
  at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1224
 *** Error code 1

 Stop in /usr/ports/mystuff/net/transmission (line 1640 of 
 /usr/ports/infrastructure/mk/bsd.port.mk).
 *** Error code 1

 Stop in /usr/ports/mystuff/net/transmission (line 2167 of 
 /usr/ports/infrastructure/mk/bsd.port.mk).
 *** Error code 1

 Stop in /usr/ports/mystuff/net/transmission (line 2147 of 
 /usr/ports/infrastructure/mk/bsd.port.mk).



 I don't have any previous transmission package(s) installed, the patch
 applied clean to net/transmission and I have an updated ports tree too.


 Daniel

Re: Update: net/transmission 2.42

2011-11-07 Thread LEVAI Daniel

On Mon, Nov 07, 2011 at 12:06:52 +, Stuart Henderson wrote:
 you have some confusion between /usr/ports and /usr/ports/mystuff
 

Well, indeed. I didn't notice it.

Thanks!


Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F

Re: Update: net/transmission 2.42

2011-11-07 Thread Dmitrij D. Czarkoff

On Sun, 2011-11-06 at 21:01 +0100, David Coppa wrote:
 On Sun, Nov 6, 2011 at 7:26 PM, Christian Weisgerber na...@mips.inka.de 
 wrote:
 
  The GTK+ client now uses GTK+3.
 
 n!!!

What is Your problem with GTK+3?

-- 
Dmitrij D. Czarkoff

Re: Update: net/transmission 2.42

2011-11-07 Thread Brad


On 07/11/11 10:01 AM, Dmitrij D. Czarkoff wrote:

On Sun, 2011-11-06 at 21:01 +0100, David Coppa wrote:

On Sun, Nov 6, 2011 at 7:26 PM, Christian Weisgerberna...@mips.inka.de  wrote:


The GTK+ client now uses GTK+3.


n!!!


What is Your problem with GTK+3?


Read the whole thread first..

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Update: net/transmission 2.42

2011-11-06 Thread Christian Weisgerber

This updates net/transmission to 2.42.
The GTK+ client now uses GTK+3.

I've only lightly tested the daemon client.  The GTK+ and Qt clients
start up, beyond that I don't know.

Stefan Unterweger wasn't quite happy about 2.41:

 transmission-cli now doesn't write the download into the directory from
 which it was invoked [...]
 But I have the feeling that this may be actually an ill-advised, but
 deliberate change from upstream, so this is just me ranting.

The CLI client has always been rather neglected, and personally I
barely see its use.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile25 Sep 2011 21:55:49 -  1.70
+++ Makefile6 Nov 2011 18:15:55 -
@@ -1,15 +1,14 @@
 # $OpenBSD: Makefile,v 1.70 2011/09/25 21:55:49 naddy Exp $
 
-COMMENT-main=  lightweight BitTorrent command line and daemon client
-COMMENT-gtk=   lightweight BitTorrent client with GTK+ interface
-COMMENT-qt=lightweight BitTorrent client with Qt interface
+COMMENT-main=  BitTorrent command line and daemon client
+COMMENT-gtk=   BitTorrent client with GTK+ interface
+COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.33
+VER=   2.42
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION-gtk=  0
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 
@@ -38,10 +37,10 @@ FLAVOR?=
 WANTLIB=   c crypto curl event_core event_extra idn m pthread ssl z
 WANTLIB-gtk=   ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
-   dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype \
-   gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
+   cairo-gobject drm expat ffi fontconfig freetype \
+   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
+   gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
+   pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
 WANTLIB-qt=${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
expat fontconfig freetype stdc++
@@ -51,8 +50,7 @@ MODULES=  devel/gettext textproc/intltool
 LIB_DEPENDS=   devel/libevent2 \
net/curl
 LIB_DEPENDS-gtk=${LIB_DEPENDS} \
-   x11/gtk+2 \
-   x11/dbus-glib
+   x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS} \
x11/qt4
 
@@ -68,10 +66,7 @@ TAR= ${LOCALBASE}/bin/gtar
 USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--disable-shared \
-   --disable-libnotify \
-   --disable-libappindicator \
-   --disable-libcanberra
+CONFIGURE_ARGS=--disable-shared
 # unaligned accesses throughout
 CONFIGURE_ARGS+=--disable-utp
 
@@ -81,7 +76,7 @@ CONFIGURE_ENV=CPPFLAGS=-I${LOCALBASE}/
 .include bsd.port.arch.mk
 
 .if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--disable-gtk
+CONFIGURE_ARGS+=--without-gtk
 .endif
 
 .if ${BUILD_PACKAGES:M-qt}
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo25 Sep 2011 21:55:49 -  1.35
+++ distinfo6 Nov 2011 18:15:55 -
@@ -1,5 +1,5 @@
-MD5 (transmission-2.33.tar.xz) = dt8rAC6eJD8uRge0DAGZdA==
-RMD160 (transmission-2.33.tar.xz) = i4IoovrVWmTUYxTxv4eai4n6FQ0=
-SHA1 (transmission-2.33.tar.xz) = pVAnI+m4/cmCzE08BS5IOctFsag=
-SHA256 (transmission-2.33.tar.xz) = 
wVp/nYJ0P7Mp7hLkG/JCBw3bqoxnQdp84LuR2NOZoHI=
-SIZE (transmission-2.33.tar.xz) = 2583032
+MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
+RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
+SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
+SHA256 (transmission-2.42.tar.xz) = 
ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
+SIZE (transmission-2.42.tar.xz) = 2629072
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.25
diff -u -p -r1.25 patch-configure
--- patches/patch-configure 23 Sep 2011 09:12:32 -  1.25
+++ patches/patch-configure 6 Nov 2011 18:15:55 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.25 2011/09/23 09:12:32 naddy Exp $
 configure.orig Thu Jul 21 01:39:42 2011
-+++ configure  Tue Sep 20 01:42:31 2011
-@@ -10895,8 +10895,8 @@ if test 0 = 0; then
+--- configure.orig Thu Oct 20 04:02:58 2011

Re: Update: net/transmission 2.42

2011-11-06 Thread David Coppa

On Sun, Nov 6, 2011 at 7:26 PM, Christian Weisgerber na...@mips.inka.de wrote:

 The GTK+ client now uses GTK+3.

n!!!

Re: Update: net/transmission 2.42

2011-11-06 Thread Vadim Zhukov

2011/11/7 David Coppa dco...@gmail.com:
 On Sun, Nov 6, 2011 at 7:26 PM, Christian Weisgerber na...@mips.inka.de 
 wrote:

 The GTK+ client now uses GTK+3.

 n!!!

... Learn to use the Qt Side of the Force...
--
  WBR,
  Vadim Zhukov

Re: Update: net/transmission 2.42

2011-11-06 Thread David Coppa

On Sun, Nov 6, 2011 at 9:28 PM, Brad b...@comstyle.com wrote:

 I much prefer Qt apps but what exactly is the objection with Gtk+3 over 2?

It's just that I don't want to install gtk3 only for using my
favourite bittorrent client...

Re: Update: net/transmission 2.42

2011-11-06 Thread David Coppa

On Sun, Nov 6, 2011 at 10:41 PM, Brad b...@comstyle.com wrote:
 On 06/11/11 4:40 PM, David Coppa wrote:

 On Sun, Nov 6, 2011 at 9:28 PM, Bradb...@comstyle.com  wrote:

 I much prefer Qt apps but what exactly is the objection with Gtk+3 over
 2?

 It's just that I don't want to install gtk3 only for using my
 favourite bittorrent client...

 You don't use any other Gtk+ apps?

Sure, but they're all gtk+2

Re: Update: net/transmission 2.41

2011-10-22 Thread Stefan Unterweger

* Stefan Unterweger on Sat, Oct 22, 2011 at 06:56:23PM +0200:
 * Christian Weisgerber on Fri, Oct 21, 2011 at 07:16:15PM +0200:
  Update to 2.41.  Miscellaneous fixes/improvements, but nothing too
  exciting.

 Works for me on i386.

Wait -- I take it back, there seems to be a regression.

I've just noticed that with 2.41, transmission-cli seems not to like to
be interrupted anymore.  When I SIGINT it, it tells me that it's saving
its current state to its config directory, but stays alive. That is, if
I want it to terminate, I have to kill(1) it.

I've just double-checked with 2.33 -- there, ctrl+c makes
transmission-cli shut down gracefully.

I've never used the GTK version before (and am using transmission only
sporadically anyway), but I'll give it a quick try.


s//un

-- 
Getting an inch of snow is like winning ten cents in the lottery!
-- Calvin; Calvin  Hobbes

1 2 >

1 - 100 of 137 matches

Mail list logo