From nobody@FreeBSD.org  Wed Sep 25 06:06:44 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 110A037B401
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 25 Sep 2002 06:06:44 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BB10543E6E
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 25 Sep 2002 06:06:43 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.6/8.12.6) with ESMTP id g8PD6h7R041121
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 25 Sep 2002 06:06:43 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.6/8.12.6/Submit) id g8PD6hQm041120;
	Wed, 25 Sep 2002 06:06:43 -0700 (PDT)
Message-Id: <200209251306.g8PD6hQm041120@www.freebsd.org>
Date: Wed, 25 Sep 2002 06:06:43 -0700 (PDT)
From: Frerich Raabe <frerich.raabe@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: devel/distcc to version 0.11
X-Send-Pr-Version: www-1.0

>Number:         43360
>Category:       ports
>Synopsis:       Update port: devel/distcc to version 0.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lioux
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 25 06:10:01 PDT 2002
>Closed-Date:    Sat Oct 05 12:18:21 PDT 2002
>Last-Modified:  Sat Oct 05 12:18:21 PDT 2002
>Originator:     Frerich Raabe
>Release:        FreeBSD 4.7-RC
>Organization:
>Environment:
FreeBSD daedalus.lan 4.7-RC FreeBSD 4.7-RC #21: Mon Sep 23 11:34:37 CEST 2002     root@daedalus.lan:/usr/obj/usr/src/sys/SWIFT  i386

>Description:
This port updates the devel/distcc port to use version 0.11, which made it necessary that it also uses the --with-extra-libs and --with-extra-includes configure arguments instead of passing -L and -I arguments via CFLAGS/LDFLAGS.

Note that all patchfiles (files/patch-src::daemon.c, files/patch-src::distcc.h, files/patch-src::srvnet.c) have disappeared in this version; distcc 0.11 compiles on FreeBSD out of the box :-)
>How-To-Repeat:
      
>Fix:
diff -ruN distcc.orig/Makefile distcc/Makefile
--- distcc.orig/Makefile	Wed Sep 25 13:47:04 2002
+++ distcc/Makefile	Wed Sep 25 13:53:15 2002
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -18,8 +17,8 @@
 PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CONFIGURE_ARGS+=	--with-extra-includes="${LOCALBASE}/include" \
+	--with-extra-libs="${LOCALBASE}/lib"
 
 MAN1=	distcc.1 distccd.1
 DOC_FILES=	AUTHORS COPYING COPYING.FDL NEWS OLDNEWS README \
diff -ruN distcc.orig/distinfo distcc/distinfo
--- distcc.orig/distinfo	Wed Sep 25 13:47:04 2002
+++ distcc/distinfo	Wed Sep 25 13:48:23 2002
@@ -1 +1 @@
-MD5 (distcc-0.10.1.tar.gz) = 2ca79e14a2d15da07aa4b3b181b28ad3
+MD5 (distcc-0.11.tar.gz) = b985678ef3c237c6373a4f80cf37db0e
diff -ruN distcc.orig/files/patch-src::daemon.c distcc/files/patch-src::daemon.c
--- distcc.orig/files/patch-src::daemon.c	Wed Sep 25 13:47:03 2002
+++ distcc/files/patch-src::daemon.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/daemon.c.orig	Mon Sep 23 11:15:29 2002
-+++ src/daemon.c	Mon Sep 23 11:15:37 2002
-@@ -170,7 +170,7 @@
- int dcc_refuse_root(void)
- {
-     /* Just be careful */
--    if (getuid() == 0  ||  geteuid() == 0  ||  getgid() == 0 || getegid() == 0) {
-+    if (getuid() == 0  ||  geteuid() == 0) {
-         rs_log_crit("distccd must not be run as root!");
-         return EXIT_DISTCC_FAILED;
-     }
diff -ruN distcc.orig/files/patch-src::distcc.h distcc/files/patch-src::distcc.h
--- distcc.orig/files/patch-src::distcc.h	Wed Sep 25 13:47:03 2002
+++ distcc/files/patch-src::distcc.h	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- src/distcc.h.orig	Sun Sep 15 18:20:01 2002
-+++ src/distcc.h	Sun Sep 15 18:18:53 2002
-@@ -102,6 +102,7 @@
- 
- 
- /* bulk.c */
-+#include <sys/stat.h>
- int dcc_open_read(const char *fname, int *ifd, off_t *fsize);
- 
- 
diff -ruN distcc.orig/files/patch-src::srvnet.c distcc/files/patch-src::srvnet.c
--- distcc.orig/files/patch-src::srvnet.c	Wed Sep 25 13:47:03 2002
+++ distcc/files/patch-src::srvnet.c	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- src/srvnet.c.orig	Sun Sep 15 18:20:11 2002
-+++ src/srvnet.c	Sun Sep 15 18:19:16 2002
-@@ -43,7 +43,6 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <netdb.h>
--#include <resolv.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->lioux 
Responsible-Changed-By: lioux 
Responsible-Changed-When: Wed Sep 25 06:19:45 PDT 2002 
Responsible-Changed-Why:  
I will handle this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43360 
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Sat Oct 5 12:18:19 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43360 
>Unformatted:
