Page MenuHomeFreeBSD
Files F137250052

D21259.id60773.diff
No OneTemporary
Actions

D21259.id60773.diff
View Options

Index: devel/distcc/Makefile
===================================================================
--- devel/distcc/Makefile
+++ devel/distcc/Makefile
@@ -4,28 +4,29 @@
PORTNAME= distcc
PORTVERSION= 3.3.2
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
-COMMENT= Distribute compilation of C(++) code acrosss machines on a network
+COMMENT= Distribute compilation of C(++) code across machines on a network
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= ${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty
LIB_DEPENDS= libpopt.so:devel/popt
GNU_CONFIGURE= yes
USES= autoreconf alias gmake libtool pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= distcc
-GH_TAGNAME= 9a09372
+GH_TAGNAME= 8600f08
GROUPS= distcc
USERS= distcc
CCLINKDIR?= libexec/distcc
CONFIGURE_ARGS= --disable-Werror CC=${CC} PTHREAD_CC=${CC}
-CONFIGURE_ENV= PYTHON="${NONEXISTENT}"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -45,7 +46,7 @@
PLIST_FILES+= ${MAN_FILES:S|^|man/man1/|:S|$|.gz|}
PLIST_FILES+= ${SBIN_FILES:S|^|sbin/|}
-OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK
+OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK PUMP
OPTIONS_RADIO= GUI
OPTIONS_RADIO_GUI= GNOME GTK
@@ -54,6 +55,7 @@
GNOME_DESC= Monitor based on GNOME
GTK_DESC= Monitor based on GTK
LLVMLINK_DESC= Create llvm compiler links if llvm is installed
+PUMP_DESC= Pump mode
AVAHI_CONFIGURE_WITH= avahi
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
@@ -64,6 +66,7 @@
GTK_CONFIGURE_WITH= gtk
GTK_USE= GNOME=gtk20
IPV6_CONFIGURE_ENABLE= rfc2553
+PUMP_CONFIGURE_OFF= --disable-pump-mode
DISTCC_COMPILERS= CC c++ cc
@@ -104,30 +107,31 @@
${WRKSRC}/src/mon-gnome.c
.endif
-do-install:
- cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BIN_FILES} \
- ${STAGEDIR}${PREFIX}/bin
- cd ${WRKSRC} && ${INSTALL_PROGRAM} ${SBIN_FILES} \
- ${STAGEDIR}${PREFIX}/sbin
- ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}
+.if ${PORT_OPTIONS:MPUMP}
+BIN_FILES+= pump
+MAN_FILES+= include_server.1 pump.1
+INCLUDE_SERVER_FILES+= \
+ include_server-${PORTVERSION}-py${PYTHON_VER}.egg-info \
+ include_server/distcc_pump_c_extensions.so \
+ include_server/include_server.py \
+ include_server/include_server_test.py \
+ include_server/include_analyzer_test.py \
+ include_server/include_analyzer_memoizing_node_test.py \
+ include_server/include_analyzer_memoizing_node.py \
+ include_server/include_analyzer.py
+
+PLIST_FILES+= ${INCLUDE_SERVER_FILES:S|^|lib/python${PYTHON_VER}/site-packages/|}
+.endif
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}
.for link in ${DISTCC_COMPILERS}
- ${LN} -sf ${PREFIX}/bin/distcc \
+ @${LN} ${STAGEDIR}${PREFIX}/bin/distcc \
${STAGEDIR}${PREFIX}/${CCLINKDIR}/${link}
.endfor
-.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK}
- cd ${WRKSRC}/gnome && ${INSTALL_DATA} distccmon-gnome.desktop \
- ${STAGEDIR}${DESKTOPDIR}
- cd ${WRKSRC}/gnome && ${INSTALL_DATA} distccmon-gnome-icon.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps
-.endif
- cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN_FILES} \
- ${STAGEDIR}${MANPREFIX}/man/man1
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${README_FILES} \
- ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOC_FILES} \
- ${STAGEDIR}${DOCSDIR}
+
+.if ${PORT_OPTIONS:MPUMP}
+USES+= python:3.1+ shebangfix
+.endif
.include <bsd.port.mk>
Index: devel/distcc/distinfo
===================================================================
--- devel/distcc/distinfo
+++ devel/distcc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532697406
-SHA256 (distcc-distcc-3.3.2-9a09372_GH0.tar.gz) = 3d98605a017c0a0e70f30a007801941bec9a87e9f41994bdfa0a9ea613a61e7b
-SIZE (distcc-distcc-3.3.2-9a09372_GH0.tar.gz) = 908231
+TIMESTAMP = 1565751334
+SHA256 (distcc-distcc-3.3.2-8600f08_GH0.tar.gz) = 25b66338170e516615e94eca47e99d1fdcc5c1c366e6d3768a5bfd3c282501cf
+SIZE (distcc-distcc-3.3.2-8600f08_GH0.tar.gz) = 999088
Index: devel/distcc/files/patch-Makefile.in
===================================================================
--- /dev/null
+++ devel/distcc/files/patch-Makefile.in
@@ -0,0 +1,42 @@
+--- Makefile.in.orig 2018-07-27 05:08:29 UTC
++++ Makefile.in
+@@ -184,7 +184,7 @@ include_server_PY = \
+ include_server_SRC = \
+ include_server/c_extensions/distcc_pump_c_extensions_module.c
+
+-update_distcc_symlinks_PY = update-distcc-symlinks.py
++update_distcc_symlinks_PY =
+
+ # These are included in the distribution but not installed anywhere.
+ dist_extra = \
+@@ -415,13 +415,12 @@ popt_EXTRA = popt/README.popt popt/.stam
+
+ bin_PROGRAMS = \
+ distcc@EXEEXT@ \
+- distccd@EXEEXT@ \
+ distccmon-text@EXEEXT@ \
+ lsdistcc@EXEEXT@ \
+ @GNOME_BIN@
+
+ sbin_PROGRAMS = \
+- update-distcc-symlinks
++ distccd@EXEEXT@ \
+
+ check_PROGRAMS = \
+ h_argvtostr@EXEEXT@ \
+@@ -1098,13 +1097,13 @@ 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)
+ $(mkinstalldirs) "$(DESTDIR)$(man1dir)"
+ for p in $(man1_MEN); do \
+- if $(GZIP_BIN) --help >/dev/null; then \
++ if $(GZIP_BIN) --help >/dev/null 2>&1; then \
+ mkdir -p "`dirname $$p`"; \
+ if [ -e "$(DESTDIR)$(man1dir)$$p" ]; then rm -fv "$(DESTDIR)$(man1dir)$$p"; fi; \
+ $(GZIP_BIN) < "$(srcdir)/$$p" > "$$p.gz"; \
Index: devel/distcc/files/patch-configure.ac
===================================================================
--- devel/distcc/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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,
-- AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]),
-- AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]))
-+ AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]))
-
-+if test x"$enable_rfc2553" = xyes
-+then
-+ AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc])
-+fi
-
- AC_ARG_WITH(gnome,
- AC_HELP_STRING([--with-gnome], [build GNOME-based monitor]))
Index: devel/distcc/files/patch-src_dparent.c
===================================================================
--- devel/distcc/files/patch-src_dparent.c
+++ devel/distcc/files/patch-src_dparent.c
@@ -1,6 +1,6 @@
---- src/dparent.c.orig 2008-12-02 23:17:13 UTC
+--- src/dparent.c.orig 2018-07-27 05:08:29 UTC
+++ src/dparent.c
-@@ -308,6 +308,9 @@ static void dcc_save_pid(pid_t pid)
+@@ -321,6 +321,9 @@ static void dcc_save_pid(pid_t pid)
**/
void dcc_remove_pid(void)
{
@@ -10,7 +10,7 @@
if (!arg_pid_file)
return;
-@@ -315,6 +318,7 @@ void dcc_remove_pid(void)
+@@ -330,6 +333,7 @@ void dcc_remove_pid(void)
rs_log_warning("failed to remove pid file %s: %s",
arg_pid_file, strerror(errno));
}
Index: devel/distcc/files/patch-src_util.c
===================================================================
--- /dev/null
+++ devel/distcc/files/patch-src_util.c
@@ -0,0 +1,16 @@
+From 7791f9e38d7510c3728dc8f456ff6f8a6d1c0c64 Mon Sep 17 00:00:00 2001
+From: Rebecca Cran <rebecca@bluestop.org>
+Date: Tue, 25 Sep 2018 17:23:12 -0600
+Subject: [PATCH] Include netinet/in.h in src/util.c for sockaddr_in structure
+
+--- src/util.c.orig 2018-07-27 05:08:29 UTC
++++ src/util.c
+@@ -39,6 +39,8 @@
+ #include <sys/un.h>
+ #include <sys/socket.h>
+
++#include <netinet/in.h>
++
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 22, 7:59 PM (4 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25985335
Default Alt Text
D21259.id60773.diff (7 KB)

Event Timeline