Index: devel/distcc/Makefile =================================================================== --- devel/distcc/Makefile +++ devel/distcc/Makefile @@ -3,29 +3,30 @@ # $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $ PORTNAME= distcc -PORTVERSION= 3.3.2 +PORTVERSION= 3.3.3 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= 4cde9bc GROUPS= distcc USERS= distcc CCLINKDIR?= libexec/distcc -CONFIGURE_ARGS= --disable-Werror CC=${CC} PTHREAD_CC=${CC} -CONFIGURE_ENV= PYTHON="${NONEXISTENT}" +CONFIGURE_ARGS= --disable-Werror --sysconfdir=${ETCDIR} \ + CC=${CC} PTHREAD_CC=${CC} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -36,8 +37,8 @@ BIN_FILES= distcc distccmon-text lsdistcc DOC_FILES= protocol-1.txt status-1.txt \ protocol-2.txt reporting-bugs.txt -MAN_FILES= distcc.1 distccd.1 distccmon-text.1 -README_FILES= AUTHORS INSTALL NEWS README +MAN_FILES= distcc.1 distccd.1 distccmon-text.1 lsdistcc.1 +README_FILES= AUTHORS INSTALL NEWS README TODO SBIN_FILES= distccd PLIST_FILES= ${BIN_FILES:S|^|bin/|} @@ -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= Distribute compilation as well as preprocessing to distcc servers AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app @@ -64,6 +66,10 @@ GTK_CONFIGURE_WITH= gtk GTK_USE= GNOME=gtk20 IPV6_CONFIGURE_ENABLE= rfc2553 +PUMP_CONFIGURE_ENABLE= pump-mode +PUMP_USES= python:3.1+ shebangfix + +SHEBANG_FILES+= update-distcc-symlinks.py DISTCC_COMPILERS= CC c++ cc @@ -104,30 +110,33 @@ ${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 +DOC_FILES+= protocol-3-impl.txt protocol-3.txt \ + protocol-gssapi.txt survey.txt +MAN_FILES+= include_server.1 pump.1 +README_FILES+= README.pump +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} + +do-test: + @cd ${WRKSRC} && ${MAKE} check .include 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 = 1566574521 +SHA256 (distcc-distcc-3.3.3-4cde9bc_GH0.tar.gz) = 4749283d795f50504961bccbf87e049b6602f170499618a88fbeddeaf5880701 +SIZE (distcc-distcc-3.3.3-4cde9bc_GH0.tar.gz) = 1000058 Index: devel/distcc/files/patch-Makefile.in =================================================================== --- /dev/null +++ devel/distcc/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2019-08-23 15:46:38 UTC ++++ Makefile.in +@@ -1046,7 +1046,7 @@ install-programs: $(bin_PROGRAMS) $(sbin + $(INSTALL_PROGRAM) "$$p" "$(DESTDIR)$(bindir)" || exit 1; \ + done + for p in $(sbin_PROGRAMS); do \ +- $(INSTALL_PROGRAM) "$$p" "$(DESTDIR)$(sbindir)" || exit 1; \ ++ $(INSTALL_SCRIPT) "$$p" "$(DESTDIR)$(sbindir)" || exit 1; \ + done + + # See comments for the include-server target. Also, we work around an issue in 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 +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 - } - -