pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Changes 3.1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/e5c71eda198b
branches: trunk
changeset: 553201:e5c71eda198b
user: adam <adam%pkgsrc.org@localhost>
date: Sat Jan 17 13:27:48 2009 +0000
description:
Changes 3.1:
* New options: --scan-includes, --disable-Werror
* Document all of the exit codes in the man page.
* Handle "-Wp,-MMD,...".
* Report a better error message if a host specification contains ",cpp"
but not ",lzo".
* Fix a bug where the "m4" directory wasn't included in the
source distribution tarball, which caused it to stop working
if you ran autogen.sh.
* Fixed a bug where the pump script was hard-coding /etc/distcc/hosts
rather than using the prefix specified to configure.
* Fixed build errors on Gentoo Linux and some other systems.
Changes 3.0:
* New "--without-avahi" option to configure.
* Fixed a problem where pump mode was falling back to local compilation
when compiling with -I options that refer to a subdirectory of one
of the default system include directories (Nils Klarlund, Fergus Henderson).
* Allow distcc to distribute commands that use "-MF<filename>"
rather than "-MF <filename>", and likewise for "-MT<target>".
* Fixed a build problem on ARM and Solaris systems.
* Fixed a build problem on some Linux systems.
* Fixed failure of "make install" on Cygwin.
* Fallback to local compilation for "-march=native" or "mtune=native"
* Fix for deadlock in pump mode.
* New protocol, version 3, allowing for preprocessing on distcc
servers ("pump" mode).
* New component: an include server for incremental static analysis of include
dependencies. This software is written in Python 2.4.
* Support for getting hosts via avahi.
* gcc debug option -d must be run locally because it produces secondary files.
* Improved checking for errors on socket connection.
diffstat:
devel/distcc/Makefile | 22 +++++++++-------------
devel/distcc/Makefile.common | 25 +++++++++++++------------
devel/distcc/PLIST | 6 +++++-
devel/distcc/distinfo | 15 ++++++++-------
devel/distcc/patches/patch-aa | 17 ++++++++---------
devel/distcc/patches/patch-ab | 6 +++---
devel/distcc/patches/patch-ad | 6 +++---
devel/distcc/patches/patch-ae | 31 +++++++++++++++++++++++++++++++
devel/distccmon-gnome/Makefile | 24 ++++++++++--------------
devel/distccmon-gtk/Makefile | 22 +++++++++-------------
10 files changed, 99 insertions(+), 75 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/Makefile
--- a/devel/distcc/Makefile Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/Makefile Sat Jan 17 13:27:48 2009 +0000
@@ -1,33 +1,29 @@
-# $NetBSD: Makefile,v 1.32 2008/02/20 10:16:52 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2009/01/17 13:27:48 adam Exp $
-PKGNAME= ${DISTNAME}
-PKGREVISION= 2
-COMMENT= Tool for distributed C/C++ compiling
+PKGNAME= ${DISTNAME}
+COMMENT= Tool for distributed C/C++ compiling
.include "Makefile.common"
PKG_SYSCONFSUBDIR= distcc
RCD_SCRIPTS= distccd
-CHECK_PORTABILITY_SKIP+= contrib/redhat/init
-
.include "../../mk/bsd.prefs.mk"
DISTCC_USER?= distcc
DISTCC_GROUP?= distcc
PKG_GROUPS= ${DISTCC_GROUP}
-PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q}
+PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}
PKG_GROUPS_VARS+= DISTCC_GROUP
PKG_USERS_VARS+= DISTCC_USER
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
-OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750
+OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750
-FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR:Q}
-FILES_SUBST+= DISTCC_USER=${DISTCC_USER:Q}
-FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP:Q}
+FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR}
+FILES_SUBST+= DISTCC_USER=${DISTCC_USER}
+FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP}
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/distcc
+INSTALLATION_DIRS+= share/distcc
.include "../../mk/bsd.pkg.mk"
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/Makefile.common
--- a/devel/distcc/Makefile.common Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/Makefile.common Sat Jan 17 13:27:48 2009 +0000
@@ -1,25 +1,28 @@
-# $NetBSD: Makefile.common,v 1.6 2008/04/07 16:58:50 joerg Exp $
-#
+# $NetBSD: Makefile.common,v 1.7 2009/01/17 13:27:48 adam Exp $
-### XXX: See the other 'XXX' comment below when updating this package.
-DISTCC_VERSION= 2.18.3
+DISTCC_VERSION= 3.1
DISTNAME= distcc-${DISTCC_VERSION}
CATEGORIES= devel
-MASTER_SITES= http://distcc.samba.org/ftp/distcc/
+MASTER_SITES= http://distcc.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://distcc.samba.org/
+HOMEPAGE= http://distcc.org/
DISTINFO_FILE= ${.CURDIR}/../../devel/distcc/distinfo
PATCHDIR= ${.CURDIR}/../../devel/distcc/patches
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+PKG_DESTDIR_SUPPORT= user-destdir
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-Werror
CONFIGURE_ARGS+= --enable-rfc2553
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+#CONFIGURE_ENV+= ac_cv_path_PYTHON=/dev/null
+
+CHECK_PORTABILITY_SKIP+= contrib/redhat/*
SUBST_CLASSES+= doc
SUBST_STAGE.doc= post-patch
@@ -28,9 +31,7 @@
SUBST_MESSAGE.doc= Fixing paths.
.if empty(PKGNAME:Mdistcc-[0-9]*)
-### XXX: Remove 'nb1' from the line below during the next update.
-DEPENDS+= distcc>=${DISTCC_VERSION}nb1:../../devel/distcc
-
+DEPENDS+= distcc>=${DISTCC_VERSION}:../../devel/distcc
PRINT_PLIST_AWK+= /^@dirrm share\/distcc$$/ \
{ print "@comment in distcc: " $$0; next }
.endif
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/PLIST
--- a/devel/distcc/PLIST Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/PLIST Sat Jan 17 13:27:48 2009 +0000
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.12 2005/10/10 09:53:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/01/17 13:27:48 adam Exp $
bin/distcc
bin/distccd
bin/distccmon-text
+bin/lsdistcc
man/man1/distcc.1
man/man1/distccd.1
man/man1/distccmon-text.1
+man/man1/include_server.1
+man/man1/pump.1
share/doc/distcc/AUTHORS
share/doc/distcc/COPYING
share/doc/distcc/INSTALL
share/doc/distcc/NEWS
share/doc/distcc/README
+share/doc/distcc/README.pump
share/doc/distcc/TODO
share/doc/distcc/example/init
share/doc/distcc/example/init-suse
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/distinfo
--- a/devel/distcc/distinfo Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/distinfo Sat Jan 17 13:27:48 2009 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.17 2006/01/12 07:12:31 martti Exp $
+$NetBSD: distinfo,v 1.18 2009/01/17 13:27:48 adam Exp $
-SHA1 (distcc-2.18.3.tar.bz2) = 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d
-RMD160 (distcc-2.18.3.tar.bz2) = c7ac6f3e161dccf39b841b57a3328b4208d28c2d
-Size (distcc-2.18.3.tar.bz2) = 341601 bytes
-SHA1 (patch-aa) = a0bc240ba8ffe312b71ff6f3599f273a9d37bb53
-SHA1 (patch-ab) = 47ca76054fbf9a9337d51ab5386b1fc76aa13634
+SHA1 (distcc-3.1.tar.bz2) = 30663e8ff94f13c0553fbfb928adba91814e1b3a
+RMD160 (distcc-3.1.tar.bz2) = 82229c230e6917b0df7db275460579b02dbf6b60
+Size (distcc-3.1.tar.bz2) = 588820 bytes
+SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372
+SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca
SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647
-SHA1 (patch-ad) = 4b0a0c5f820bca2c3c79ddf7b2c53e022635f4bf
+SHA1 (patch-ad) = 79ce3ea1b7dd75dce1654dd31eaa372174f8f5d1
+SHA1 (patch-ae) = d4e5eba767f08a1c346c0223ddf88e98a5ed7c59
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/patches/patch-aa
--- a/devel/distcc/patches/patch-aa Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/patches/patch-aa Sat Jan 17 13:27:48 2009 +0000
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.9 2004/11/15 17:03:32 xtraeme Exp $
+$NetBSD: patch-aa,v 1.10 2009/01/17 13:27:48 adam Exp $
---- src/mon-text.c.orig 2004-11-15 17:56:44.000000000 +0100
-+++ src/mon-text.c 2004-11-15 17:57:00.000000000 +0100
-@@ -105,8 +105,8 @@
-
+--- src/mon-text.c.orig 2008-06-20 17:26:04.000000000 +0200
++++ src/mon-text.c
+@@ -106,7 +106,8 @@ int main(int argc, char *argv[])
printf("\n");
-- /* XXX: usleep() is probably not very portable */
+ /* XXX: usleep() is probably not very portable */
- usleep(delay * 1000000);
-+ sleep(delay);
-+ usleep((delay - (int)delay) * 1000000);
-
++ sleep(delay);
++ usleep((delay - (int)delay) * 1000000);
+
dcc_task_state_free(list);
} while (delay);
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/patches/patch-ab
--- a/devel/distcc/patches/patch-ab Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/patches/patch-ab Sat Jan 17 13:27:48 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/01/12 07:12:31 martti Exp $
+$NetBSD: patch-ab,v 1.4 2009/01/17 13:27:48 adam Exp $
---- src/sendfile.c.orig 2004-10-24 07:05:49.000000000 +0200
+--- src/sendfile.c.orig 2008-06-20 17:26:04.000000000 +0200
+++ src/sendfile.c
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
**/
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/patches/patch-ad
--- a/devel/distcc/patches/patch-ad Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distcc/patches/patch-ad Sat Jan 17 13:27:48 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/12 07:12:31 martti Exp $
+$NetBSD: patch-ad,v 1.2 2009/01/17 13:27:48 adam Exp $
---- configure.orig 2004-11-30 12:34:40.000000000 +0100
+--- configure.orig 2008-12-02 22:50:34.000000000 +0100
+++ configure
-@@ -7133,6 +7133,7 @@ _ACEOF
+@@ -7968,6 +7968,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
diff -r f203d026ca5d -r e5c71eda198b devel/distcc/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/distcc/patches/patch-ae Sat Jan 17 13:27:48 2009 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.1 2009/01/17 13:27:48 adam Exp $
+
+--- Makefile.in.orig 2008-12-02 22:50:31.000000000 +0100
++++ Makefile.in
+@@ -447,7 +447,7 @@ check_include_server_PY = \
+
+ ## NOTE: "all" must be the first (default) rule, aside from patterns.
+
+-all: $(bin_PROGRAMS) pump include-server
++all: $(bin_PROGRAMS)
+
+ # src/config.h.in is used by config.status
+ Makefile: Makefile.in src/config.h.in config.status
+@@ -1010,7 +1010,7 @@ showpaths:
+ # tricky features so mkinstalldirs and cp will do
+
+ install: showpaths install-doc install-man install-programs \
+- install-include-server install-example @INSTALL_GNOME@ install-conf
++ install-example @INSTALL_GNOME@
+
+ install-programs: $(bin_PROGRAMS)
+ $(mkinstalldirs) "$(DESTDIR)$(bindir)"
+@@ -1064,7 +1064,7 @@ install-include-server: include-server p
+ INCLUDE_SERVER=`grep '/include_server.py$$' "$(include_server_builddir)/install.log"` && \
+ sed "s,^include_server='',include_server='$$INCLUDE_SERVER'," \
+ pump > "$(include_server_builddir)/pump" && \
+- $(INSTALL_PROGRAM) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
++ $(INSTALL_SCRIPT) "$(include_server_builddir)/pump" "$(DESTDIR)$(bindir)"; \
+ fi
+
+ install-man: $(man1_MEN)
diff -r f203d026ca5d -r e5c71eda198b devel/distccmon-gnome/Makefile
--- a/devel/distccmon-gnome/Makefile Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distccmon-gnome/Makefile Sat Jan 17 13:27:48 2009 +0000
@@ -1,33 +1,29 @@
-# $NetBSD: Makefile,v 1.17 2008/03/06 14:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/01/17 13:27:48 adam Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 11
+CATEGORIES+= gnome
COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../devel/distcc/Makefile.common"
-USE_TOOLS+= pkg-config
-
-CATEGORIES+= gnome
-
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --with-gnome
BUILD_TARGET= distccmon-gnome
-CHECK_PORTABILITY_SKIP+= contrib/redhat/*
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/distccmon-gnome ${DESTDIR}${PREFIX:Q}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/distcc
- ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome-icon.png \
- ${DESTDIR}${PREFIX:Q}/share/distcc
- ${INSTALL_DATA} ${WRKSRC:Q}/gnome/distccmon-gnome.desktop \
- ${DESTDIR}${PREFIX:Q}/share/distcc
+ ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/distcc
+ ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \
+ ${DESTDIR}${PREFIX}/share/distcc
+ ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \
+ ${DESTDIR}${PREFIX}/share/distcc
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
+.include "../../net/avahi/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f203d026ca5d -r e5c71eda198b devel/distccmon-gtk/Makefile
--- a/devel/distccmon-gtk/Makefile Sat Jan 17 13:05:01 2009 +0000
+++ b/devel/distccmon-gtk/Makefile Sat Jan 17 13:27:48 2009 +0000
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2009/01/17 13:27:48 adam Exp $
PKGNAME= ${DISTNAME:S/-/-gtk-/}
-PKGREVISION= 3
COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../devel/distcc/Makefile.common"
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --with-gtk
Home |
Main Index |
Thread Index |
Old Index