Index: head/devel/distcc/Makefile =================================================================== --- head/devel/distcc/Makefile (revision 357544) +++ head/devel/distcc/Makefile (revision 357545) @@ -1,118 +1,112 @@ # 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= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE MAINTAINER= skreuzer@FreeBSD.org COMMENT= Distribute compilation of C(++) code acrosss machines on a network LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt -USE_BZIP2= yes -USES= gmake +USES= gmake tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gprof --disable-Werror WANT_GNOME= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DISTCCD_PIDFILE=/var/run/distccd.pid USE_RC_SUBR= distccd -SUB_LIST= DISTCCD_PIDFILE=${DISTCCD_PIDFILE} OPTIONS_DEFINE= GNOME GTK IPV6 AVAHI COMPILER_LINKS 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 OPTIONS_DEFAULT= COMPILER_LINKS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-glib.1:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= libavahi-glib.1.so:${PORTSDIR}/net/avahi-app .else CONFIGURE_ARGS+= --without-avahi .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-rfc2553 .else CONFIGURE_ARGS+= --disable-rfc2553 .endif .if ${PORT_OPTIONS:MCOMPILER_LINKS} CCLINKDIR?= libexec/distcc PLIST_DIRS= ${CCLINKDIR} -GNU_COMPILERS= 34 42 43 44 45 46 -ooo +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++ .if ${ARCH} == "i386" DISTCC_COMPILERS+= icc icpc .endif .if defined(EXTRA_COMPILERS) DISTCC_COMPILERS+= ${EXTRA_COMPILERS} .endif PLIST_FILES+= ${DISTCC_COMPILERS:S|^|${CCLINKDIR}/|} .endif .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="" .else PLIST_SUB+= WITH_GNOME="@comment " .endif -MAN1= distcc.1 distccd.1 distccmon-text.1 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 ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/lsdistcc ${PREFIX}/bin + @${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 ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${STAGEDIR}${PREFIX}/bin .endif - @${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin + @${INSTALL_PROGRAM} ${WRKSRC}/distccd ${STAGEDIR}${PREFIX}/sbin post-install: - @${TOUCH} ${DISTCCD_PIDFILE} .if ${PORT_OPTIONS:MCOMPILER_LINKS} - @${MKDIR} ${PREFIX}/${CCLINKDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR} .for link in ${DISTCC_COMPILERS} - ${LN} -sf ${PREFIX}/bin/distcc ${PREFIX}/${CCLINKDIR}/${link} + ${LN} -sf ${PREFIX}/bin/distcc ${STAGEDIR}${PREFIX}/${CCLINKDIR}/${link} .endfor .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .endif -.for f in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/man/${f} ${MANPREFIX}/man/man1 +.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 .include Index: head/devel/distcc/files/distccd.in =================================================================== --- head/devel/distcc/files/distccd.in (revision 357544) +++ head/devel/distcc/files/distccd.in (revision 357545) @@ -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:-%%DISTCCD_PIDFILE%%} +pidfile=${pidfile:-/var/run/distccd.pid} 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/pkg-plist =================================================================== --- head/devel/distcc/pkg-plist (revision 357544) +++ head/devel/distcc/pkg-plist (revision 357545) @@ -1,14 +1,18 @@ 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 %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%WITH_GNOME%%@dirrm %%DATADIR%%