Attachment 33996 Details for Bug 55416 – file.diff

[patch] file.diff

file.diff (text/plain), 5.90 KB, created by Dominic Marks on 2003-08-09 12:20:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominic Marks

Created: 2003-08-09 12:20:20 UTC

Size: 5.90 KB

patch

obsolete

>diff -ruN /usr/ports/devel/distcc/Makefile ./Makefile
>--- /usr/ports/devel/distcc/Makefile	Thu Jun 26 13:39:51 2003
>+++ ./Makefile	Sat Aug  9 12:00:56 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	distcc
>-PORTVERSION=	2.7
>+PORTVERSION=	2.9
> CATEGORIES=	devel
> MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
> 
>@@ -34,10 +34,8 @@
> .endif
> 
> MAN1=	distcc.1 distccd.1
>-DOC_FILES=	AUTHORS COPYING COPYING.FDL DEPENDENCIES INSTALL NEWS README \
>-		linuxdoc/distcc.sgml doc/protocol-1.txt doc/status-1.txt
>-HTML_DOC_FILES=	distcc.html distcc-1.html distcc-2.html distcc-3.html \
>-		distcc-4.html distcc-5.html
>+DOC_FILES=	AUTHORS COPYING COPYING.FDL INSTALL NEWS README \
>+		doc/protocol-1.txt doc/status-1.txt
> 
> pre-fetch:
> .if !defined(WITHOUT_GNOME)
>@@ -49,6 +47,10 @@
> 	@${ECHO_MSG} ""
> .endif
> 
>+pre-install:
>+	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
>+		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>+
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/distcc ${PREFIX}/bin
> 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin
>@@ -56,8 +58,12 @@
> 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
> .endif
> 	@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
>+	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/distccd.sh.sample \
>+		${PREFIX}/etc/rc.d/distccd.sh.sample
> 
>-post-install: install-doc install-html-doc install-man
>+post-install: install-doc install-man
>+	@${TOUCH} /var/run/distccd.pid
>+	@${CHOWN} distcc:distcc /var/run/distccd.pid
> 	@${CAT} ${PKGMESSAGE}
> 
> install-doc:
>@@ -65,14 +71,6 @@
> 	@${MKDIR} ${DOCSDIR}
> .for file in ${DOC_FILES}
> 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>-.endfor
>-.endif
>-
>-install-html-doc:
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}/html
>-.for file in ${HTML_DOC_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/linuxdoc/html/${file} ${DOCSDIR}/html
> .endfor
> .endif
> 
>diff -ruN /usr/ports/devel/distcc/distinfo ./distinfo
>--- /usr/ports/devel/distcc/distinfo	Tue Jun 17 21:29:45 2003
>+++ ./distinfo	Sat Aug  9 11:32:54 2003
>@@ -1 +1 @@
>-MD5 (distcc-2.7.tar.bz2) = 7f367102fb645b769368b901ec57e159
>+MD5 (distcc-2.9.tar.bz2) = fa4cbb8dbebb0d87b0d1da7d2d34bf57
>diff -ruN /usr/ports/devel/distcc/files/distccd.sh.sample ./files/distccd.sh.sample
>--- /usr/ports/devel/distcc/files/distccd.sh.sample	Thu Jan  1 00:00:00 1970
>+++ ./files/distccd.sh.sample	Sat Aug  9 12:04:28 2003
>@@ -0,0 +1,25 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+if ! PREFIX=$(expr $0 : "$/.*$/etc/rc\.d/$(basename $0)\$"); then
>+    echo "$0: Cannot determine the PREFIX" >&2
>+    exit 1
>+fi
>+
>+case "$1" in
>+start)
>+	[ -x ${PREFIX}/sbin/distccd ] && \
>+		${PREFIX}/sbin/distccd -P /var/run/distccd.pid \
>+		--user distcc --daemon && echo -n ' distcc'
>+	;;
>+stop)
>+	kill -TERM `cat /var/run/distccd.pid` && echo -n ' distcc'
>+	;;
>+*)
>+	echo "Usage: `basename $0` { start | stop }" >&2
>+	;;
>+esac
>+
>+exit 0
>diff -ruN /usr/ports/devel/distcc/files/patch-src::mon-gnome.c ./files/patch-src::mon-gnome.c
>--- /usr/ports/devel/distcc/files/patch-src::mon-gnome.c	Wed Jun 18 04:25:37 2003
>+++ ./files/patch-src::mon-gnome.c	Thu Jan  1 00:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/mon-gnome.c.orig	Mon Jun 16 13:34:03 2003
>-+++ src/mon-gnome.c	Mon Jun 16 13:34:12 2003
>-@@ -33,8 +33,6 @@
>- 
>- #include "config.h"
>- 
>--#include <stdint.h>
>--
>- #include <stdio.h>
>- #include <stdlib.h>
>- #include <string.h>
>diff -ruN /usr/ports/devel/distcc/pkg-install ./pkg-install
>--- /usr/ports/devel/distcc/pkg-install	Thu Jan  1 00:00:00 1970
>+++ ./pkg-install	Sat Aug  9 12:03:13 2003
>@@ -0,0 +1,69 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
>+BATCH=${BATCH:=no}
>+
>+ask() {
>+    local question default answer
>+
>+    question=$1
>+    default=$2
>+    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
>+        read -p "${question} [${default}]? " answer
>+    fi
>+    if [ x${answer} = x ]; then
>+        answer=${default}
>+    fi
>+    echo ${answer}
>+}
>+
>+yesno() {
>+    local question default answer
>+
>+    question=$1
>+    default=$2
>+    while :; do
>+        answer=$(ask "${question}" "${default}")
>+        case "${answer}" in
>+        [Yy]*)	return 0;;
>+        [Nn]*)	return 1;;
>+        esac
>+        echo "Please answer yes or no."
>+    done
>+}
>+
>+if [ x"$2" = xPRE-INSTALL ]; then
>+    USER=distcc
>+    GROUP=distcc
>+
>+    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
>+        echo "You already have a group \"${GROUP}\", so I will use it."
>+    else
>+        if /usr/sbin/pw groupadd ${GROUP} -h -
>+	then
>+	    echo "Added group \"${GROUP}\"."
>+	else
>+	    echo "Adding group \"${GROUP}\" failed..."
>+            echo "Please create it, and try again."
>+            exit 1
>+        fi
>+    fi
>+
>+    if /usr/sbin/pw usershow "${USER}" 2>/dev/null; then
>+        echo "You already have a user \"${USER}\", so I will use it."
>+    else
>+        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
>+           -s /sbin/nologin \
>+           -c "Distcc"
>+	then
>+	    echo "Added user \"${USER}\"."
>+	else
>+	    echo "Adding user \"${USER}\" failed..."
>+            echo "Please create it, and try again."
>+            exit 1
>+        fi
>+    fi
>+fi
>diff -ruN /usr/ports/devel/distcc/pkg-plist ./pkg-plist
>--- /usr/ports/devel/distcc/pkg-plist	Tue Jun 17 21:29:45 2003
>+++ ./pkg-plist	Sat Aug  9 12:01:08 2003
>@@ -2,21 +2,13 @@
> bin/distccmon-text
> %%WITH_GNOME%%bin/distccmon-gnome
> sbin/distccd
>+etc/rc.d/distccd.sh.sample
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/COPYING.FDL
>-%%PORTDOCS%%%%DOCSDIR%%/DEPENDENCIES
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/distcc.sgml
> %%PORTDOCS%%%%DOCSDIR%%/protocol-1.txt
> %%PORTDOCS%%%%DOCSDIR%%/status-1.txt
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc-1.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc-2.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc-3.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc-4.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/distcc-5.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 55416: 33996