Re: Update: net/transmission 2.82 drops -qt
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/8/13 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
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
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/8/13 Christian Weisgerber :
> Vadim Zhukov 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
+
# 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
Vadim Zhukov 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 /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include /* quotactl() */
- #elif defined (__sun)
- #include /* 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$
+--- qt/favicon.cc.orig Mon Aug 12 13:27:14 2013
Re: Update: net/transmission 2.82 drops -qt
2013/8/12 Christian Weisgerber :
> Vadim Zhukov 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
+
# 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 \
net/miniupnp/libnatpm
Re: Update: net/transmission 2.82 drops -qt
Vadim Zhukov 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 /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include /* quotactl() */
- #elif defined (__sun)
- #include /* 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
+ #include
+ #include
++
++#if QT_VERSION >= 0x05
+ #include
++#else
++#include
++#endif
+
+ #include "favicon.h"
+
+@@ -40,7 +45,11 @@ Favicons :: ~Favicons( )
+ QString
+ Favicons :: getCacheDir( )
+ {
++#if QT_VERSION >= 0x05
+ const QString base = QS
Re: Update: net/transmission 2.82 drops -qt
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.
Re: Update: net/transmission 2.82 drops -qt
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.
Re: Update: net/transmission 2.82 drops -qt
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 /* types needed by quota.h */
Re: Update: net/transmission 2.82 drops -qt
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
.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
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 /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defin
Update: net/transmission 2.82 drops -qt
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
.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
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 /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include /* quotactl() */
- #elif defined (__sun)
- #include /* 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(_
