Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Oct 2016 09:50:50 +0000
From:      bugzilla-noreply@freebsd.org
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   [Bug 213875] devel/distcc: Update MASTER_SITES, Remove BROKEN (Google Code -> GitHub)
Message-ID:  <bug-213875-13-3yVNfrNIEq@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-213875-13@https.bugs.freebsd.org/bugzilla/>
References:  <bug-213875-13@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D213875

Matthieu Volat <mazhe@alkumuna.eu> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #176262|0                           |1
        is obsolete|                            |

--- Comment #4 from Matthieu Volat <mazhe@alkumuna.eu> ---
Created attachment 176264
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D176264&action=
=3Dedit
Update master site, fix issues with new github archives, regenerate patches

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile    (revision 424807)
+++ Makefile    (working copy)
@@ -6,7 +6,6 @@
 PORTVERSION=3D   3.1
 PORTREVISION=3D  6
 CATEGORIES=3D    devel
-MASTER_SITES=3D  GOOGLE_CODE

 MAINTAINER=3D    ports@FreeBSD.org
 COMMENT=3D       Distribute compilation of C(++) code acrosss machines on a
network
@@ -14,12 +13,13 @@
 LICENSE=3D       GPLv2
 LICENSE_FILE=3D  ${WRKSRC}/COPYING

-BROKEN=3D                Unfetchable (google code has gone away)
-
 LIB_DEPENDS=3D   libpopt.so:devel/popt

 GNU_CONFIGURE=3D yes
-USES=3D          alias gmake tar:bzip2
+USES=3D          autoreconf alias gmake libtool pkgconfig tar:bzip2
+USE_GITHUB=3D    yes
+GH_ACCOUNT=3D     distcc
+GH_TAGNAME=3D    9a09372
 WANT_GNOME=3D    yes

 GROUPS=3D                distcc
@@ -26,7 +26,7 @@
 USERS=3D         distcc

 CCLINKDIR?=3D    libexec/distcc
-CONFIGURE_ARGS=3D        --disable-Werror
+CONFIGURE_ARGS=3D        --disable-Werror CC=3D${CC} PTHREAD_CC=3D${CC}
 CONFIGURE_ENV=3D PYTHON=3D"${NONEXISTENT}"
 CPPFLAGS+=3D     -I${LOCALBASE}/include
 LDFLAGS+=3D      -L${LOCALBASE}/lib
@@ -72,7 +72,7 @@
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MCLANGLINK}
-CLANG_COMPILERS=3D       -devel 31 32 33 34 35
+CLANG_COMPILERS=3D       -devel 31 32 33 34 35 36 37 38 39
 DISTCC_COMPILERS+=3D     clang++ clang
 DISTCC_COMPILERS+=3D     ${CLANG_COMPILERS:S|^|clang++|}
 DISTCC_COMPILERS+=3D     ${CLANG_COMPILERS:S|^|clang|}
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- distinfo    (revision 424807)
+++ distinfo    (working copy)
@@ -1,4 +1,3 @@
-SHA256 (distcc-3.1.tar.bz2) =3D
f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
-SIZE (distcc-3.1.tar.bz2) =3D 588820
-SHA256 (distcc-avahi-080101.patch) =3D
4e506a8a2299af18839c443b8665ea4fe4492bf3ecae010d262406c01509058e
-SIZE (distcc-avahi-080101.patch) =3D 387519
+TIMESTAMP =3D 1477731710
+SHA256 (distcc-distcc-3.1-9a09372_GH0.tar.gz) =3D
3d98605a017c0a0e70f30a007801941bec9a87e9f41994bdfa0a9ea613a61e7b
+SIZE (distcc-distcc-3.1-9a09372_GH0.tar.gz) =3D 908231
Index: files/patch-configure.ac
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-configure.ac    (revision 424807)
+++ files/patch-configure.ac    (working copy)
@@ -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, n=
ot
from system]))

  AC_ARG_ENABLE(rfc2553,
Index: files/patch-src-dparent.c.diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-src-dparent.c.diff      (revision 424807)
+++ files/patch-src-dparent.c.diff      (nonexistent)
@@ -1,20 +0,0 @@
---- src/dparent.c.orig Sun Oct 24 08:05:48 2004
-+++ src/dparent.c      Fri Nov  4 17:35:09 2005
-@@ -285,6 +285,9 @@
-  **/
- void dcc_remove_pid(void)
- {
-+    /* distcc user, we are running as, cannot delete files in /var/run
-+     */
-+#if 0
-     if (!arg_pid_file)
-         return;
-=20
-@@ -292,6 +295,7 @@
-         rs_log_warning("failed to remove pid file %s: %s",
-                        arg_pid_file, strerror(errno));
-     }
-+#endif
- }
-=20
-=20

Property changes on: files/patch-src-dparent.c.diff
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-src_dparent.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-src_dparent.c   (nonexistent)
+++ files/patch-src_dparent.c   (working copy)
@@ -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;
+=20
+@@ -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
+ }
+=20
+=20

Property changes on: files/patch-src_dparent.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-213875-13-3yVNfrNIEq>