CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jun  4 18:54:38 UTC 2022

Modified Files:
        pkgsrc/devel/distcc: Makefile.common distinfo
        pkgsrc/devel/distcc-pump: Makefile
        pkgsrc/devel/distcc/patches: patch-Makefile.in
        pkgsrc/devel/distccmon-gnome: Makefile PLIST
        pkgsrc/devel/distccmon-gtk: Makefile PLIST

Log Message:
distcc: updated to 3.4

3.4

distccmon-gnome ported from gtk2 to gtk3

Remove debug lag in spawning new threads. (better multi-core performance)

Bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/distcc/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/distcc/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/distcc-pump/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/distcc/patches/patch-Makefile.in
cvs rdiff -u -r1.74 -r1.75 pkgsrc/devel/distccmon-gnome/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/distccmon-gnome/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/distccmon-gtk/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/distccmon-gtk/PLIST

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

Modified files:

Index: pkgsrc/devel/distcc/Makefile.common
diff -u pkgsrc/devel/distcc/Makefile.common:1.13 pkgsrc/devel/distcc/Makefile.common:1.14
--- pkgsrc/devel/distcc/Makefile.common:1.13    Wed Jul 11 07:30:40 2018
+++ pkgsrc/devel/distcc/Makefile.common Sat Jun  4 18:54:38 2022
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile.common,v 1.13 2018/07/11 07:30:40 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2022/06/04 18:54:38 adam Exp $
 # used by devel/distcc-pump/Makefile
 # used by devel/distccmon-gnome/Makefile
 # used by devel/distccmon-gtk/Makefile
 
-DISTNAME=      distcc-3.3
+DISTNAME=      distcc-3.4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=distcc/}
-GITHUB_PROJECT=        distcc
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/distcc/distcc
+HOMEPAGE=      https://www.distcc.org/
 LICENSE=       gnu-gpl-v2
 
 DISTINFO_FILE=         ${.CURDIR}/../../devel/distcc/distinfo

Index: pkgsrc/devel/distcc/distinfo
diff -u pkgsrc/devel/distcc/distinfo:1.26 pkgsrc/devel/distcc/distinfo:1.27
--- pkgsrc/devel/distcc/distinfo:1.26   Tue Oct 26 10:14:33 2021
+++ pkgsrc/devel/distcc/distinfo        Sat Jun  4 18:54:38 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 10:14:33 nia Exp $
+$NetBSD: distinfo,v 1.27 2022/06/04 18:54:38 adam Exp $
 
-BLAKE2s (distcc-3.3.tar.gz) = afa92b9ece31c95050599a0f90cecc8e798902430bf378cc998bb29c9e82ab57
-SHA512 (distcc-3.3.tar.gz) = 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc
-Size (distcc-3.3.tar.gz) = 1171281 bytes
-SHA1 (patch-Makefile.in) = c5da08b6269413857b04854592b0271d76337982
+BLAKE2s (distcc-3.4.tar.gz) = 40708a4d4ad89735599859bcddb1212cf81f1790b926970b4702e00a23932e0f
+SHA512 (distcc-3.4.tar.gz) = de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef
+Size (distcc-3.4.tar.gz) = 1239519 bytes
+SHA1 (patch-Makefile.in) = eab49edbb4a434e8bc9af11d0c873ce27757614c
 SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372
 SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca
 SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647

Index: pkgsrc/devel/distcc-pump/Makefile
diff -u pkgsrc/devel/distcc-pump/Makefile:1.16 pkgsrc/devel/distcc-pump/Makefile:1.17
--- pkgsrc/devel/distcc-pump/Makefile:1.16      Tue Mar 29 18:16:25 2022
+++ pkgsrc/devel/distcc-pump/Makefile   Sat Jun  4 18:54:38 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/03/29 18:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/06/04 18:54:38 adam Exp $
 
-PKGNAME=       ${DISTNAME:S/-/-pump-/:S/rc1//}
-PKGREVISION=   3
+PKGNAME=       ${DISTNAME:S/-/-pump-/}
 COMMENT=       Accelerated remote compilation with distcc
 
 .include "../../devel/distcc/Makefile.common"
@@ -12,7 +11,7 @@ PY_PATCHPLIST=                yes
 PLIST_SUBST+=          PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-# check patch-ae for build and install targets
+# check patch-Makefile.in for build and install targets
 BUILD_TARGET=          pump include-server
 INSTALL_TARGET=                install-include-server
 

Index: pkgsrc/devel/distcc/patches/patch-Makefile.in
diff -u pkgsrc/devel/distcc/patches/patch-Makefile.in:1.1 pkgsrc/devel/distcc/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/distcc/patches/patch-Makefile.in:1.1   Wed Jul 11 07:30:40 2018
+++ pkgsrc/devel/distcc/patches/patch-Makefile.in       Sat Jun  4 18:54:38 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/07/11 07:30:40 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2022/06/04 18:54:38 adam Exp $
 
 Do not install stuff that requires Python.
 
---- Makefile.in.orig   2018-03-07 23:03:59.000000000 +0000
+--- Makefile.in.orig   2021-05-11 17:29:22.000000000 +0000
 +++ Makefile.in
-@@ -420,8 +420,7 @@ bin_PROGRAMS = \
+@@ -421,8 +421,7 @@ bin_PROGRAMS = \
        lsdistcc@EXEEXT@ \
        @GNOME_BIN@ 
  
@@ -14,7 +14,7 @@ Do not install stuff that requires Pytho
  
  check_PROGRAMS = \
        h_argvtostr@EXEEXT@ \
-@@ -465,7 +464,7 @@ check_include_server_PY = \
+@@ -466,7 +465,7 @@ check_include_server_PY = \
  
  ## NOTE: "all" must be the first (default) rule, aside from patterns.
  
@@ -23,7 +23,7 @@ Do not install stuff that requires Pytho
  
  #  src/config.h.in is used by config.status
  Makefile: Makefile.in src/config.h.in config.status
-@@ -1040,7 +1039,7 @@ showpaths:
+@@ -1039,7 +1038,7 @@ showpaths:
  # tricky features so mkinstalldirs and cp will do
  
  install: showpaths install-doc install-man install-programs \
@@ -32,12 +32,3 @@ Do not install stuff that requires Pytho
  
  install-programs: $(bin_PROGRAMS) $(sbin_PROGRAMS)
        $(mkinstalldirs) "$(DESTDIR)$(bindir)"
-@@ -1098,7 +1097,7 @@ install-include-server: include-server p
-         INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \
-         sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
-           pump > "$(include_server_builddir)/pump" && \
--        $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
-+        $(INSTALL_SCRIPT) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
-       fi
- 
- install-man: $(man1_MEN)

Index: pkgsrc/devel/distccmon-gnome/Makefile
diff -u pkgsrc/devel/distccmon-gnome/Makefile:1.74 pkgsrc/devel/distccmon-gnome/Makefile:1.75
--- pkgsrc/devel/distccmon-gnome/Makefile:1.74  Mon Apr 18 19:10:48 2022
+++ pkgsrc/devel/distccmon-gnome/Makefile       Sat Jun  4 18:54:38 2022
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.74 2022/04/18 19:10:48 adam Exp $
+# $NetBSD: Makefile,v 1.75 2022/06/04 18:54:38 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
-PKGREVISION=   13
 CATEGORIES+=   gnome
 COMMENT=       Graphical monitor for distcc, the distributed C/C++ compiler
 
 .include "../../devel/distcc/Makefile.common"
 
+BROKEN=                        "Requires libgnome-3.0 and libgnomeui-3.0"
 USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --with-gnome
 
@@ -15,7 +15,7 @@ INSTALLATION_DIRS+=   share/distcc
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \
+       ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.png \
                ${DESTDIR}${PREFIX}/share/distcc
        ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \
                ${DESTDIR}${PREFIX}/share/distcc
@@ -24,5 +24,5 @@ do-install:
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/distccmon-gnome/PLIST
diff -u pkgsrc/devel/distccmon-gnome/PLIST:1.2 pkgsrc/devel/distccmon-gnome/PLIST:1.3
--- pkgsrc/devel/distccmon-gnome/PLIST:1.2      Sun Jun 14 17:48:41 2009
+++ pkgsrc/devel/distccmon-gnome/PLIST  Sat Jun  4 18:54:38 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/06/04 18:54:38 adam Exp $
 bin/distccmon-gnome
-share/distcc/distccmon-gnome-icon.png
+share/distcc/distccmon-gnome.png
 share/distcc/distccmon-gnome.desktop

Index: pkgsrc/devel/distccmon-gtk/Makefile
diff -u pkgsrc/devel/distccmon-gtk/Makefile:1.46 pkgsrc/devel/distccmon-gtk/Makefile:1.47
--- pkgsrc/devel/distccmon-gtk/Makefile:1.46    Wed Dec  8 16:03:55 2021
+++ pkgsrc/devel/distccmon-gtk/Makefile Sat Jun  4 18:54:38 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2021/12/08 16:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.47 2022/06/04 18:54:38 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-gtk-/}
-PKGREVISION=   7
 COMMENT=       Graphical monitor for distcc, the distributed C/C++ compiler
 
 .include "../../devel/distcc/Makefile.common"
@@ -21,10 +20,10 @@ INSTALLATION_DIRS+= share/distcc
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome \
                ${DESTDIR}${PREFIX}/bin/distccmon-gtk
-       ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \
-               ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk-icon.png
+       ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.png \
+               ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk.png
        ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \
                ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk.desktop
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/distccmon-gtk/PLIST
diff -u pkgsrc/devel/distccmon-gtk/PLIST:1.2 pkgsrc/devel/distccmon-gtk/PLIST:1.3
--- pkgsrc/devel/distccmon-gtk/PLIST:1.2        Sun Jun 14 17:48:41 2009
+++ pkgsrc/devel/distccmon-gtk/PLIST    Sat Jun  4 18:54:38 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/06/04 18:54:38 adam Exp $
 bin/distccmon-gtk
-share/distcc/distccmon-gtk-icon.png
 share/distcc/distccmon-gtk.desktop
+share/distcc/distccmon-gtk.png