Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Nov 2016 17:14:45 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r427055 - in branches/2016Q4/devel/distcc: . files
Message-ID:  <201611241714.uAOHEjgU043565@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Thu Nov 24 17:14:45 2016
New Revision: 427055
URL: https://svnweb.freebsd.org/changeset/ports/427055

Log:
  devel/distcc: Update MASTER_SITES to make fetchable, unbreak, regen patches
  MFH:		r427000
  
  PR:		213875
  Submitted by:	Matthieu Volat <mazhe@alkumuna.eu>
  Approved by:	ports-secteam (feld)

Added:
  branches/2016Q4/devel/distcc/files/patch-src_dparent.c
     - copied unchanged from r427000, head/devel/distcc/files/patch-src_dparent.c
Deleted:
  branches/2016Q4/devel/distcc/files/patch-src-dparent.c.diff
Modified:
  branches/2016Q4/devel/distcc/Makefile
  branches/2016Q4/devel/distcc/distinfo
  branches/2016Q4/devel/distcc/files/patch-configure.ac
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/distcc/Makefile
==============================================================================
--- branches/2016Q4/devel/distcc/Makefile	Thu Nov 24 16:30:30 2016	(r427054)
+++ branches/2016Q4/devel/distcc/Makefile	Thu Nov 24 17:14:45 2016	(r427055)
@@ -6,7 +6,6 @@ PORTNAME=	distcc
 PORTVERSION=	3.1
 PORTREVISION=	6
 CATEGORIES=	devel
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
@@ -14,19 +13,20 @@ COMMENT=	Distribute compilation of C(++)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
-
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
-USES=		alias gmake tar:bzip2
+USES=		autoreconf alias gmake libtool pkgconfig tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=     distcc
+GH_TAGNAME=	9a09372
 WANT_GNOME=	yes
 
 GROUPS=		distcc
 USERS=		distcc
 
 CCLINKDIR?=	libexec/distcc
-CONFIGURE_ARGS=	--disable-Werror
+CONFIGURE_ARGS=	--disable-Werror CC=${CC} PTHREAD_CC=${CC}
 CONFIGURE_ENV=	PYTHON="${NONEXISTENT}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -72,7 +72,7 @@ DISTCC_COMPILERS=	CC c++ cc
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLANGLINK}
-CLANG_COMPILERS=	-devel 31 32 33 34 35
+CLANG_COMPILERS=	-devel 31 32 33 34 35 36 37 38 39
 DISTCC_COMPILERS+=	clang++ clang
 DISTCC_COMPILERS+=	${CLANG_COMPILERS:S|^|clang++|}
 DISTCC_COMPILERS+=	${CLANG_COMPILERS:S|^|clang|}

Modified: branches/2016Q4/devel/distcc/distinfo
==============================================================================
--- branches/2016Q4/devel/distcc/distinfo	Thu Nov 24 16:30:30 2016	(r427054)
+++ branches/2016Q4/devel/distcc/distinfo	Thu Nov 24 17:14:45 2016	(r427055)
@@ -1,4 +1,3 @@
-SHA256 (distcc-3.1.tar.bz2) = f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
-SIZE (distcc-3.1.tar.bz2) = 588820
-SHA256 (distcc-avahi-080101.patch) = 4e506a8a2299af18839c443b8665ea4fe4492bf3ecae010d262406c01509058e
-SIZE (distcc-avahi-080101.patch) = 387519
+TIMESTAMP = 1477731710
+SHA256 (distcc-distcc-3.1-9a09372_GH0.tar.gz) = 3d98605a017c0a0e70f30a007801941bec9a87e9f41994bdfa0a9ea613a61e7b
+SIZE (distcc-distcc-3.1-9a09372_GH0.tar.gz) = 908231

Modified: branches/2016Q4/devel/distcc/files/patch-configure.ac
==============================================================================
--- branches/2016Q4/devel/distcc/files/patch-configure.ac	Thu Nov 24 16:30:30 2016	(r427054)
+++ branches/2016Q4/devel/distcc/files/patch-configure.ac	Thu Nov 24 17:14:45 2016	(r427055)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2008-12-03 05:50:31.000000000 +0800
-+++ configure.ac	2010-08-24 21:55:30.000000000 +0800
-@@ -86,9 +86,12 @@
+--- configure.ac.orig	2008-12-02 23:17:13 UTC
++++ configure.ac
+@@ -86,9 +86,12 @@ AC_ARG_WITH(included-popt,
  	AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))
  
  AC_ARG_ENABLE(rfc2553,

Copied: branches/2016Q4/devel/distcc/files/patch-src_dparent.c (from r427000, head/devel/distcc/files/patch-src_dparent.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/devel/distcc/files/patch-src_dparent.c	Thu Nov 24 17:14:45 2016	(r427055, copy of r427000, head/devel/distcc/files/patch-src_dparent.c)
@@ -0,0 +1,20 @@
+--- src/dparent.c.orig	2008-12-02 23:17:13 UTC
++++ src/dparent.c
+@@ -308,6 +308,9 @@ static void dcc_save_pid(pid_t pid)
+  **/
+ void dcc_remove_pid(void)
+ {
++    /* distcc user, we are running as, cannot delete files in /var/run
++     */
++#if 0
+     if (!arg_pid_file)
+         return;
+ 
+@@ -315,6 +318,7 @@ void dcc_remove_pid(void)
+         rs_log_warning("failed to remove pid file %s: %s",
+                        arg_pid_file, strerror(errno));
+     }
++#endif
+ }
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611241714.uAOHEjgU043565>