Update to 0.7

PR:		40873
Submitted by:	maintainer

4 files changed, 49 insertions, 12 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index aa2e5ec116d8..fc814f2cc1ff 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -14,26 +14,39 @@ MAINTAINER=	frerich.raabe@gmx.de
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 MAN1=	distcc.1 distccd.1
-DOC_FILES=	AUTHORS COPYING COPYING.FDL NEWS OLDNEWS README
+DOC_FILES=	AUTHORS COPYING COPYING.FDL NEWS OLDNEWS README \
+		linuxdoc/distcc.info.gz linuxdoc/distcc.pdf \
+		linuxdoc/distcc.ps.gz
+HTML_DOC_FILES=	distcc.html distcc-1.html distcc-2.html distcc-3.html \
+		distcc-4.html distcc-5.html distcc-6.html distcc-7.html
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/distcc ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/distccd ${PREFIX}/sbin
 
-post-install: install-doc install-man
+post-install: install-doc install-html-doc install-man
 	@${CAT} ${PKGMESSAGE}
 
 install-doc:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
-	@${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+	@${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 --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 374cbbc9c269..4c8bf146a11d 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1 +1 @@
-MD5 (distcc-0.6.tar.gz) = 3bafb6e4af5045e0356ec4ec73793ba6
+MD5 (distcc-0.7.tar.gz) = 955fba5feab8ed99defbeda8da4e4415
diff --git a/devel/distcc/files/patch-src::distcc.h b/devel/distcc/files/patch-src::distcc.h
new file mode 100644
index 000000000000..98993690b7e1
--- /dev/null
+++ b/devel/distcc/files/patch-src::distcc.h
@@ -0,0 +1,12 @@
+--- src/distcc.h.orig	Sat Aug 10 21:53:27 2002
++++ src/distcc.h	Sat Aug 10 21:53:41 2002
+@@ -43,9 +43,6 @@
+ #  define UNUSED(x) x
+ #endif				/* !__GNUC__ && !__LCLINT__ */
+ 
+-#ifndef HAVE_SA_FAMILY_T
+-typedef int sa_family_t;
+-#endif
+ 
+ 
+ struct dcc_hostdef;
diff --git a/devel/distcc/pkg-plist b/devel/distcc/pkg-plist
index 6ee767b27e51..f352872e56aa 100644
--- a/devel/distcc/pkg-plist
+++ b/devel/distcc/pkg-plist
@@ -1,9 +1,21 @@
 bin/distcc
 sbin/distccd
-%%PORTDOCS%%share/doc/distcc/AUTHORS
-%%PORTDOCS%%share/doc/distcc/COPYING
-%%PORTDOCS%%share/doc/distcc/COPYING.FDL
-%%PORTDOCS%%share/doc/distcc/NEWS
-%%PORTDOCS%%share/doc/distcc/OLDNEWS
-%%PORTDOCS%%share/doc/distcc/README
-%%PORTDOCS%%@dirrm share/doc/distcc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.FDL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/OLDNEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/distcc.info.gz
+%%PORTDOCS%%%%DOCSDIR%%/distcc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/distcc.ps.gz
+%%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%%%%DOCSDIR%%/html/distcc-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/distcc-7.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%