Index: head/devel/distcc/Makefile =================================================================== --- head/devel/distcc/Makefile (revision 426999) +++ head/devel/distcc/Makefile (revision 427000) @@ -1,135 +1,135 @@ # Created by: Frerich Raabe # $FreeBSD$ # $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $ 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 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 SUB_FILES= pkg-message SUB_LIST= DISTCCD_PIDFILE=/var/run/distccd.pid USE_RC_SUBR= distccd 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 SBIN_FILES= distccd PLIST_FILES= ${BIN_FILES:S|^|bin/|} PLIST_FILES+= ${DISTCC_COMPILERS:S|^|${CCLINKDIR}/|} PLIST_FILES+= ${MAN_FILES:S|^|man/man1/|:S|$|.gz|} PLIST_FILES+= ${SBIN_FILES:S|^|sbin/|} OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GNOME GTK CLANGLINK_DESC= Create clang compiler links if clang is installed GUI_DESC= Build GUI for distcc monitor GNOME_DESC= Monitor based on GNOME GTK_DESC= Monitor based on GTK LLVMLINK_DESC= Create llvm compiler links if llvm is installed AVAHI_CONFIGURE_WITH= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app DOCS_PLIST_FILES= ${README_FILES:S|^|${DOCSDIR_REL}/|} DOCS_PLIST_FILES+= ${DOC_FILES:S|^|${DOCSDIR_REL}/|} GNOME_CONFIGURE_WITH= gnome GNOME_USE= GNOME=gtk20,libgnome,libgnomeui,pango GTK_CONFIGURE_WITH= gtk GTK_USE= GNOME=gtk20 IPV6_CONFIGURE_ENABLE= rfc2553 DISTCC_COMPILERS= CC c++ cc .include .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|} .endif GNU_COMPILERS= 34 42 43 44 45 46 47 48 49 5 DISTCC_COMPILERS+= gcc g++ DISTCC_COMPILERS+= ${GNU_COMPILERS:S|^|g++|} DISTCC_COMPILERS+= ${GNU_COMPILERS:S|^|gcc|} .if ${ARCH} == "i386" DISTCC_COMPILERS+= icc icpc .endif .if ${PORT_OPTIONS:MLLVMLINK} DISTCC_COMPILERS+= llvm-c++ llvm-g++ llvm-gcc .endif DISTCC_COMPILERS+= ${EXTRA_COMPILERS} .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK} .if ${PORT_OPTIONS:MGNOME} PKGNAMESUFFIX= -gnome .else PKGNAMESUFFIX= -gtk .endif BIN_FILES+= distccmon-gnome PLIST_FILES+= ${DESKTOPDIR}/distccmon-gnome.desktop PLIST_FILES+= share/pixmaps/distccmon-gnome-icon.png .endif .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK} post-patch: ${REINPLACE_CMD} -e 's|PKGDATADIR "|"${PREFIX}/share/pixmaps|' \ ${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} .for link in ${DISTCC_COMPILERS} ${LN} -sf ${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 .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${README_FILES} \ ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOC_FILES} \ ${STAGEDIR}${DOCSDIR} .endif cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN_FILES} \ ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/devel/distcc/distinfo =================================================================== --- head/devel/distcc/distinfo (revision 426999) +++ head/devel/distcc/distinfo (revision 427000) @@ -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 Index: head/devel/distcc/files/patch-src-dparent.c.diff =================================================================== --- head/devel/distcc/files/patch-src-dparent.c.diff (revision 426999) +++ head/devel/distcc/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; - -@@ -292,6 +295,7 @@ - rs_log_warning("failed to remove pid file %s: %s", - arg_pid_file, strerror(errno)); - } -+#endif - } - - Property changes on: head/devel/distcc/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: head/devel/distcc/files/patch-configure.ac =================================================================== --- head/devel/distcc/files/patch-configure.ac (revision 426999) +++ head/devel/distcc/files/patch-configure.ac (revision 427000) @@ -1,17 +1,17 @@ ---- 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, - 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: head/devel/distcc/files/patch-src_dparent.c =================================================================== --- head/devel/distcc/files/patch-src_dparent.c (nonexistent) +++ head/devel/distcc/files/patch-src_dparent.c (revision 427000) @@ -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 + } + + Property changes on: head/devel/distcc/files/patch-src_dparent.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property