Date: Wed, 11 Jun 2014 22:19:31 +0000 (UTC) From: Steven Kreuzer <skreuzer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357545 - in head/devel/distcc: . files Message-ID: <201406112219.s5BMJVOa032043@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skreuzer Date: Wed Jun 11 22:19:30 2014 New Revision: 357545 URL: http://svnweb.freebsd.org/changeset/ports/357545 QAT: https://qat.redports.org/buildarchive/r357545/ Log: Add staging support Convert to new USES framework Convert to new LIB_DEPENDS framework Add support for gcc47 and gcc48 Modified: head/devel/distcc/Makefile head/devel/distcc/files/distccd.in head/devel/distcc/pkg-plist Modified: head/devel/distcc/Makefile ============================================================================== --- head/devel/distcc/Makefile Wed Jun 11 21:53:30 2014 (r357544) +++ head/devel/distcc/Makefile Wed Jun 11 22:19:30 2014 (r357545) @@ -4,7 +4,7 @@ PORTNAME= distcc PORTVERSION= 3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE @@ -14,18 +14,15 @@ COMMENT= Distribute compilation of C(++) 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 @@ -35,11 +32,10 @@ COMPILER_LINKS= Create symlinks to distc OPTIONS_DEFAULT= COMPILER_LINKS -NO_STAGE= yes .include <bsd.port.options.mk> .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 @@ -53,7 +49,7 @@ CONFIGURE_ARGS+= --disable-rfc2553 .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" @@ -79,36 +75,34 @@ PLIST_SUB+= WITH_GNOME="" 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) Modified: head/devel/distcc/files/distccd.in ============================================================================== --- head/devel/distcc/files/distccd.in Wed Jun 11 21:53:30 2014 (r357544) +++ head/devel/distcc/files/distccd.in Wed Jun 11 22:19:30 2014 (r357545) @@ -27,7 +27,7 @@ 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() { Modified: head/devel/distcc/pkg-plist ============================================================================== --- head/devel/distcc/pkg-plist Wed Jun 11 21:53:30 2014 (r357544) +++ head/devel/distcc/pkg-plist Wed Jun 11 22:19:30 2014 (r357545) @@ -11,4 +11,8 @@ sbin/distccd %%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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406112219.s5BMJVOa032043>