CVS commit: pkgsrc/net

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 14 09:45:40 UTC 2023

Modified Files:
        pkgsrc/net: Makefile
        pkgsrc/net/transmission: Makefile Makefile.common PLIST
        pkgsrc/net/transmission-gtk: Makefile
        pkgsrc/net/transmission-qt: Makefile

Log Message:
transmission*: depend on transmission-common

The web frontend files can be used with all frontends and the daemon.


To generate a diff of this commit:
cvs rdiff -u -r1.1501 -r1.1502 pkgsrc/net/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/transmission/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/transmission/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/transmission/PLIST
cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/transmission-gtk/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/net/transmission-qt/Makefile

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

Modified files:

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1501 pkgsrc/net/Makefile:1.1502
--- pkgsrc/net/Makefile:1.1501  Tue Jan 31 18:53:46 2023
+++ pkgsrc/net/Makefile Tue Feb 14 09:45:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1501 2023/01/31 18:53:46 nikita Exp $
+# $NetBSD: Makefile,v 1.1502 2023/02/14 09:45:39 wiz Exp $
 #
 
 COMMENT=       Networking tools
@@ -973,6 +973,7 @@ SUBDIR+=    traceroute-as
 SUBDIR+=       traceroute-nanog
 SUBDIR+=       trafshow
 SUBDIR+=       transmission
+SUBDIR+=       transmission-common
 SUBDIR+=       transmission-gtk
 SUBDIR+=       transmission-qt
 SUBDIR+=       trickle

Index: pkgsrc/net/transmission/Makefile
diff -u pkgsrc/net/transmission/Makefile:1.33 pkgsrc/net/transmission/Makefile:1.34
--- pkgsrc/net/transmission/Makefile:1.33       Mon Feb 13 11:26:29 2023
+++ pkgsrc/net/transmission/Makefile    Tue Feb 14 09:45:39 2023
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2023/02/13 11:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2023/02/14 09:45:39 wiz Exp $
+
+PKGREVISION=   1
+
+DEPENDS+=      transmission-common>=${VERSION}:../../net/transmission-common
 
 CONFLICTS+=    Transmission-[0-9]*
 
@@ -25,5 +29,10 @@ OWN_DIRS_PERMS+=     ${PKG_SYSCONFDIR}/trans
 OWN_DIRS_PERMS+=       ${VARBASE}/log/transmission \
                        ${TRANSMISSION_USER} ${TRANSMISSION_GROUP} 0755
 
+# https://github.com/transmission/transmission/issues/4864
+post-install:
+       ${RM} -R ${DESTDIR}${PREFIX}/share/transmission/public_html
+
 .include "../../net/transmission/Makefile.common"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/transmission/Makefile.common
diff -u pkgsrc/net/transmission/Makefile.common:1.12 pkgsrc/net/transmission/Makefile.common:1.13
--- pkgsrc/net/transmission/Makefile.common:1.12        Mon Feb 13 11:26:29 2023
+++ pkgsrc/net/transmission/Makefile.common     Tue Feb 14 09:45:39 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2023/02/13 11:26:29 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2023/02/14 09:45:39 wiz Exp $
 #
-# used by net/transmission/Makefile
+# used by net/transmission-common/Makefile
 # used by net/transmission-gtk/Makefile
 # used by net/transmission-qt/Makefile
+# used by net/transmission/Makefile
 
 VERSION=       4.0.0
 DISTNAME=      transmission-${VERSION}
@@ -36,5 +37,4 @@ BUILDLINK_API_DEPENDS.libevent+=      libeven
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/libpsl/buildlink3.mk"
-.include "../../devel/cmake/build.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/net/transmission/PLIST
diff -u pkgsrc/net/transmission/PLIST:1.5 pkgsrc/net/transmission/PLIST:1.6
--- pkgsrc/net/transmission/PLIST:1.5   Mon Feb 13 11:26:29 2023
+++ pkgsrc/net/transmission/PLIST       Tue Feb 14 09:45:39 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/02/13 11:26:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/02/14 09:45:39 wiz Exp $
 bin/transmission-create
 bin/transmission-daemon
 bin/transmission-edit
@@ -43,9 +43,3 @@ share/doc/transmission/news/news-${PKGVE
 share/doc/transmission/news/news-${PKGVERSION}.md
 share/doc/transmission/rpc-spec.md
 share/doc/transmission/send-email-when-torrent-done.sh
-share/transmission/public_html/images/favicon.ico
-share/transmission/public_html/images/favicon.png
-share/transmission/public_html/images/webclip-icon.png
-share/transmission/public_html/index.html
-share/transmission/public_html/transmission-app.js
-share/transmission/public_html/transmission-app.js.LICENSE.txt

Index: pkgsrc/net/transmission-gtk/Makefile
diff -u pkgsrc/net/transmission-gtk/Makefile:1.55 pkgsrc/net/transmission-gtk/Makefile:1.56
--- pkgsrc/net/transmission-gtk/Makefile:1.55   Mon Feb 13 11:26:29 2023
+++ pkgsrc/net/transmission-gtk/Makefile        Tue Feb 14 09:45:39 2023
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.55 2023/02/13 11:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2023/02/14 09:45:39 wiz Exp $
 
 PKGNAME=       transmission-gtk-${VERSION}
+PKGREVISION=   1
 COMMENT=       Free, lightweight BitTorrent client (GTK version)
 
+DEPENDS+=      transmission-common>=${VERSION}:../../net/transmission-common
+
 CONFLICTS+=            Transmission-gui-[0-9]*
 
 .include "../../net/transmission/Makefile.common"
@@ -17,6 +20,7 @@ CMAKE_ARGS+=  -DENABLE_CLI=OFF
 CMAKE_ARGS+=   -DINSTALL_DOC=OFF
 CMAKE_ARGS+=   -DENABLE_TESTS=OFF
 
+# https://github.com/transmission/transmission/issues/4864
 post-install:
        ${RM} -R ${DESTDIR}${PREFIX}/share/transmission/public_html
 
@@ -29,4 +33,5 @@ BUILDLINK_API_DEPENDS.gettext+=       gettext-
 # XXX: so force new gettext-tools, giving us new gettext-lib
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../x11/gtkmm4/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/transmission-qt/Makefile
diff -u pkgsrc/net/transmission-qt/Makefile:1.66 pkgsrc/net/transmission-qt/Makefile:1.67
--- pkgsrc/net/transmission-qt/Makefile:1.66    Mon Feb 13 11:26:29 2023
+++ pkgsrc/net/transmission-qt/Makefile Tue Feb 14 09:45:39 2023
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2023/02/13 11:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2023/02/14 09:45:39 wiz Exp $
 
 PKGNAME=       transmission-qt-${VERSION}
+PKGREVISION=   1
 COMMENT=       Free, lightweight BitTorrent client (QT version)
 
+DEPENDS+=      transmission-common>=${VERSION}:../../net/transmission-common
+
 CMAKE_ARGS+=   -DENABLE_DAEMON=OFF
 CMAKE_ARGS+=   -DENABLE_GTK=OFF
 CMAKE_ARGS+=   -DENABLE_QT=ON
@@ -19,6 +22,7 @@ CONFLICTS+=           Transmission-gui-[0-9]*
 
 INSTALLATION_DIRS=     share/applications
 
+# https://github.com/transmission/transmission/issues/4864
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/transmission-qt.desktop             \
        ${DESTDIR}${PREFIX}/share/applications/transmission-qt.desktop
@@ -26,4 +30,5 @@ post-install:
 
 .include "options.mk"
 .include "../../net/transmission/Makefile.common"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"