Index: head/devel/distcc/pkg-message =================================================================== --- head/devel/distcc/pkg-message (revision 376665) +++ head/devel/distcc/pkg-message (nonexistent) @@ -1,26 +0,0 @@ -WARNING: distcc[d] performs NO AUTHENTICATION at all and should -ONLY be used in trusted networks! - -Distccd now requires the --allow (-a) argument when running -in daemon mode. This option restricts distcc to a specific -network, by default this port uses 127.0.0.0/8, you should -change this by specifying your own distccd_flags in -/etc/rc.conf, see the script in etc/rc.d/distccd.sh for a -template. - -Additionally it is recommended that you add entries to -/etc/syslog.conf to record all distccd log messages to a file -such as /var/log/distccd.log. - -Example syslog.conf entry: - -!distccd -*.* /var/log/distccd.log - -The daemon runs on port 3632 by default. You can change that -value by calling distccd with the -p parameter, e.g. -`distccd -p 4711'. Do not edit the rc.d script to achieve this -instead override the value of distccd_flags in /etc/rc.conf. - -Note that remote daemons currently won't work if they cannot -resolve the reverse DNS of the master machine Property changes on: head/devel/distcc/pkg-message ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/devel/distcc/pkg-plist (revision 376665) +++ head/devel/distcc/pkg-plist (nonexistent) @@ -1,16 +0,0 @@ -bin/distcc -bin/distccmon-text -bin/lsdistcc -%%WITH_GNOME%%bin/distccmon-gnome -sbin/distccd -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/protocol-1.txt -%%PORTDOCS%%%%DOCSDIR%%/protocol-2.txt -%%PORTDOCS%%%%DOCSDIR%%/status-1.txt -%%PORTDOCS%%%%DOCSDIR%%/reporting-bugs.txt -man/man1/distcc.1.gz -man/man1/distccd.1.gz -man/man1/distccmon-text.1.gz Property changes on: head/devel/distcc/pkg-plist ___________________________________________________________________ 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/pkg-install =================================================================== --- head/devel/distcc/pkg-install (revision 376665) +++ head/devel/distcc/pkg-install (nonexistent) @@ -1,36 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - USER=distcc - GROUP=${USER} - UID=561 - GID=${UID} - PW=/usr/sbin/pw - CHOWN=/usr/sbin/chown - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /usr/sbin/nologin -c "Distcc user" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - exit 0 - ;; -esac Property changes on: head/devel/distcc/pkg-install ___________________________________________________________________ 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/Makefile =================================================================== --- head/devel/distcc/Makefile (revision 376665) +++ head/devel/distcc/Makefile (revision 376666) @@ -1,111 +1,131 @@ # 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= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE -MAINTAINER= skreuzer@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Distribute compilation of C(++) code acrosss machines on a network LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt -USES= alias gmake tar:bzip2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-gprof --disable-Werror WANT_GNOME= yes +USES= alias gmake tar:bzip2 + +CCLINKDIR?= libexec/distcc +CONFIGURE_ARGS= --disable-Werror +CONFIGURE_ENV= PYTHON="${NONEXISTENT}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib + +SUB_FILES= pkg-install pkg-message +SUB_LIST= DISTCCD_PIDFILE=/var/run/distccd.pid +SUB_LIST+= NONEXISTENT="${NONEXISTENT}" USE_RC_SUBR= distccd -OPTIONS_DEFINE= GNOME GTK IPV6 AVAHI COMPILER_LINKS DOCS -GNOME_DESC= GUI monitor based on GNOME -GTK_DESC= Build GUI monitor based on GTK -AVAHI_DESC= Avahi Zeroconf/mDNS/Bonjour support -COMPILER_LINKS= Create symlinks to distcc +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 -OPTIONS_DEFAULT= COMPILER_LINKS +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/|} -.include +OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GNOME GTK -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= libavahi-glib.1.so:${PORTSDIR}/net/avahi-app -.else -CONFIGURE_ARGS+= --without-avahi -.endif +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 -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-rfc2553 -.else -CONFIGURE_ARGS+= --disable-rfc2553 -.endif +AVAHI_CONFIGURE_WITH= avahi +AVAHI_LIB_DEPENDS= libavahi-glib.1.so:${PORTSDIR}/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 -.if ${PORT_OPTIONS:MCOMPILER_LINKS} -CCLINKDIR?= libexec/distcc -GNU_COMPILERS= 34 42 43 44 45 46 47 48 -ooo -DISTCC_COMPILERS= cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} -DISTCC_COMPILERS+= clang clang++ llvm-gcc llvm-c++ llvm-g++ +DISTCC_COMPILERS= CC c++ cc + +.include + +.if ${PORT_OPTIONS:MCLANGLINK} +CLANG_COMPILERS= -devel 31 32 33 34 35 +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 defined(EXTRA_COMPILERS) -DISTCC_COMPILERS+= ${EXTRA_COMPILERS} +.if ${PORT_OPTIONS:MLLVMLINK} +DISTCC_COMPILERS+= llvm-c++ llvm-g++ llvm-gcc .endif -PLIST_FILES+= ${DISTCC_COMPILERS:S|^|${CCLINKDIR}/|} -.endif +DISTCC_COMPILERS+= ${EXTRA_COMPILERS} +.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK} .if ${PORT_OPTIONS:MGNOME} -USE_GNOME= libgnomeui -CONFIGURE_ARGS+= --with-gnome -PKGNAMESUFFIX= -gnome -PLIST_SUB+= WITH_GNOME="" -.elif ${PORT_OPTIONS:MGTK} -USE_GNOME= gtk20 -CONFIGURE_ARGS+= --with-gtk -PKGNAMESUFFIX= -gtk -PLIST_SUB+= WITH_GNOME="" +PKGNAMESUFFIX= -gnome .else -PLIST_SUB+= WITH_GNOME="@comment " +PKGNAMESUFFIX= -gtk .endif +BIN_FILES+= distccmon-gnome +PLIST_FILES+= ${DESKTOPDIR}/distccmon-gnome.desktop +PLIST_FILES+= share/pixmaps/distccmon-gnome-icon.png +.endif -DOC_FILES= AUTHORS INSTALL NEWS README \ - doc/protocol-1.txt doc/status-1.txt \ - doc/protocol-2.txt doc/reporting-bugs.txt - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/distcc ${STAGEDIR}${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${STAGEDIR}${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/lsdistcc ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK} - @${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${STAGEDIR}${PREFIX}/bin +post-patch: + ${REINPLACE_CMD} -e 's|PKGDATADIR "|"${PREFIX}/share/pixmaps|' \ + ${WRKSRC}/src/mon-gnome.c .endif - @${INSTALL_PROGRAM} ${WRKSRC}/distccd ${STAGEDIR}${PREFIX}/sbin -post-install: -.if ${PORT_OPTIONS:MCOMPILER_LINKS} - @${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR} +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} + ${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} -.for FILE in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} -.endfor + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${README_FILES} \ + ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOC_FILES} \ + ${STAGEDIR}${DOCSDIR} .endif -.for man in distcc.1 distccd.1 distccmon-text.1 - ${INSTALL_MAN} ${WRKSRC}/man/${man} ${STAGEDIR}${MANPREFIX}/man/man1 -.endfor - @${CAT} ${PKGMESSAGE} -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif + cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN_FILES} \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/devel/distcc/files/distccd.in =================================================================== --- head/devel/distcc/files/distccd.in (revision 376665) +++ head/devel/distcc/files/distccd.in (revision 376666) @@ -1,46 +1,46 @@ #!/bin/sh # # $FreeBSD$ # $MCom: ports/devel/distcc/files/distccd.sh.in,v 1.1 2007/05/19 17:43:14 ahze Exp $ # PROVIDE: distccd # REQUIRE: NETWORKING ldconfig # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable distccd: # # distccd_enable (bool): Set to YES to enable distccd. # distccd_flags (str): Arguments passed to distccd. # distccd_path (str): DISTCCD_PATH environment value for distccd.. # distccd_enable=${distccd_enable-"NO"} distccd_flags=${distccd_flags-"-a 127.0.0.0/8 --user distcc --daemon -P %%DISTCCD_PIDFILE%%"} . /etc/rc.subr name=distccd rcvar=distccd_enable command=%%PREFIX%%/sbin/${name} # extract pid file from distccd_flags (if any) pidfile="`echo ${distccd_flags} |sed -nE -e 's/^.*-P ([^ ]+).*$/\1/p'`" # set default value -pidfile=${pidfile:-/var/run/distccd.pid} +pidfile=${pidfile:-%%DISTCCD_PIDFILE%%} distccd_precmd() { # distccd drops root privileges and then attempts to create the pid file touch ${pidfile} chown distcc:distcc ${pidfile} if [ -n "${distccd_path}" ] then export DISTCCD_PATH="${distccd_path}" fi } start_precmd="distccd_precmd" load_rc_config ${name} run_rc_command "$1" Index: head/devel/distcc/files/pkg-install.in =================================================================== --- head/devel/distcc/files/pkg-install.in (nonexistent) +++ head/devel/distcc/files/pkg-install.in (revision 376666) @@ -0,0 +1,36 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + USER=distcc + GROUP=${USER} + UID=561 + GID=${UID} + PW=/usr/sbin/pw + CHOWN=/usr/sbin/chown + if ${PW} group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if ${PW} groupadd ${GROUP} -g ${GID}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if ${PW} user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ + -d %%NONEXISTENT%% -s /usr/sbin/nologin -c "Distcc user" + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi + exit 0 + ;; +esac Property changes on: head/devel/distcc/files/pkg-install.in ___________________________________________________________________ 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 Index: head/devel/distcc/files/pkg-message.in =================================================================== --- head/devel/distcc/files/pkg-message.in (nonexistent) +++ head/devel/distcc/files/pkg-message.in (revision 376666) @@ -0,0 +1,26 @@ +WARNING: distcc[d] performs NO AUTHENTICATION at all and should +ONLY be used in trusted networks! + +Distccd now requires the --allow (-a) argument when running +in daemon mode. This option restricts distcc to a specific +network, by default this port uses 127.0.0.0/8, you should +change this by specifying your own distccd_flags in +/etc/rc.conf, see the script in %%PREFIX%%/etc/rc.d/distccd +for a template. + +Additionally it is recommended that you add entries to +/etc/syslog.conf to record all distccd log messages to a file +such as /var/log/distccd.log. + +Example syslog.conf entry: + +!distccd +*.* /var/log/distccd.log + +The daemon runs on port 3632 by default. You can change that +value by calling distccd with the -p parameter, e.g. +`distccd -p 4711'. Do not edit the rc.d script to achieve this +instead override the value of distccd_flags in /etc/rc.conf. + +Note that remote daemons currently won't work if they cannot +resolve the reverse DNS of the master machine Property changes on: head/devel/distcc/files/pkg-message.in ___________________________________________________________________ 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