- Properly fetch all required files in the fetch phase, and feed them to the

upstream build system. Since multiple files are fetched now, move all
distfiles to DIST_SUBDIR.
- Re-enable cluster build.
- Return pointy hat to pool.

Tested with:	offline laptop doing 'make'
Blames:		fast connection to upstream site and
		too summarized upstream build logs.

8 files changed, 76 insertions, 32 deletions

diff --git a/devel/ros-documentation/Makefile b/devel/ros-documentation/Makefile
index 0e9ac4ebdff3..7298ebe80755 100644
--- a/devel/ros-documentation/Makefile
+++ b/devel/ros-documentation/Makefile
@@ -7,7 +7,10 @@
 PORTNAME=	ros
 PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
+MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	rene@freebsd.org
 COMMENT=	Robot Operating System - core utilities
@@ -16,8 +19,6 @@ LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
-
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx \
 		boost_python:${PORTSDIR}/devel/boost-python-libs
 # we need cmake and gmake for the build, but the build is triggered by make
@@ -50,7 +51,6 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
 .if ${OSVERSION} < 700000
 BROKEN=Does not link, librt missing
 .endif
@@ -81,6 +81,11 @@ post-extract:
 	    ${WRKSRC}/3rdparty/wxswig/manifest.xml
 	${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \
 	    ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
+	# move 3rdparty distfiles into place
+	${MKDIR} ${WRKSRC}/3rdparty/gtest/build
+	${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
+	${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
+	${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
 
 pre-build:
 .if exists(${LOCALBASE}/lib/libgtest.so)
@@ -104,7 +109,7 @@ post-build:
 	${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} -p ${PREFIX}/${PORTNAME}/bin
+	${MKDIR} ${PREFIX}/${PORTNAME}/bin
 
 .for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel
 	${LOCALBASE}/bin/chrpath -d ${WRKSRC}/bin/${f}
diff --git a/devel/ros-documentation/distinfo b/devel/ros-documentation/distinfo
index ca3b19b14c48..575d1666f2a2 100644
--- a/devel/ros-documentation/distinfo
+++ b/devel/ros-documentation/distinfo
@@ -1,3 +1,9 @@
-MD5 (ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
-SHA256 (ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
-SIZE (ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
+SHA256 (ros/ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
+SIZE (ros/ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
+SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
+SIZE (ros/gtest-1.3.0.tar.gz) = 636326
+MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
+SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
+SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
diff --git a/devel/ros-rx/Makefile b/devel/ros-rx/Makefile
index 0e9ac4ebdff3..7298ebe80755 100644
--- a/devel/ros-rx/Makefile
+++ b/devel/ros-rx/Makefile
@@ -7,7 +7,10 @@
 PORTNAME=	ros
 PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
+MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	rene@freebsd.org
 COMMENT=	Robot Operating System - core utilities
@@ -16,8 +19,6 @@ LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
-
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx \
 		boost_python:${PORTSDIR}/devel/boost-python-libs
 # we need cmake and gmake for the build, but the build is triggered by make
@@ -50,7 +51,6 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
 .if ${OSVERSION} < 700000
 BROKEN=Does not link, librt missing
 .endif
@@ -81,6 +81,11 @@ post-extract:
 	    ${WRKSRC}/3rdparty/wxswig/manifest.xml
 	${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \
 	    ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
+	# move 3rdparty distfiles into place
+	${MKDIR} ${WRKSRC}/3rdparty/gtest/build
+	${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
+	${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
+	${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
 
 pre-build:
 .if exists(${LOCALBASE}/lib/libgtest.so)
@@ -104,7 +109,7 @@ post-build:
 	${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} -p ${PREFIX}/${PORTNAME}/bin
+	${MKDIR} ${PREFIX}/${PORTNAME}/bin
 
 .for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel
 	${LOCALBASE}/bin/chrpath -d ${WRKSRC}/bin/${f}
diff --git a/devel/ros-rx/distinfo b/devel/ros-rx/distinfo
index ca3b19b14c48..575d1666f2a2 100644
--- a/devel/ros-rx/distinfo
+++ b/devel/ros-rx/distinfo
@@ -1,3 +1,9 @@
-MD5 (ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
-SHA256 (ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
-SIZE (ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
+SHA256 (ros/ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
+SIZE (ros/ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
+SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
+SIZE (ros/gtest-1.3.0.tar.gz) = 636326
+MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
+SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
+SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
diff --git a/devel/ros/Makefile b/devel/ros/Makefile
index 0e9ac4ebdff3..7298ebe80755 100644
--- a/devel/ros/Makefile
+++ b/devel/ros/Makefile
@@ -7,7 +7,10 @@
 PORTNAME=	ros
 PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
+MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	rene@freebsd.org
 COMMENT=	Robot Operating System - core utilities
@@ -16,8 +19,6 @@ LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
-
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx \
 		boost_python:${PORTSDIR}/devel/boost-python-libs
 # we need cmake and gmake for the build, but the build is triggered by make
@@ -50,7 +51,6 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
 .if ${OSVERSION} < 700000
 BROKEN=Does not link, librt missing
 .endif
@@ -81,6 +81,11 @@ post-extract:
 	    ${WRKSRC}/3rdparty/wxswig/manifest.xml
 	${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \
 	    ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
+	# move 3rdparty distfiles into place
+	${MKDIR} ${WRKSRC}/3rdparty/gtest/build
+	${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
+	${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
+	${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
 
 pre-build:
 .if exists(${LOCALBASE}/lib/libgtest.so)
@@ -104,7 +109,7 @@ post-build:
 	${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} -p ${PREFIX}/${PORTNAME}/bin
+	${MKDIR} ${PREFIX}/${PORTNAME}/bin
 
 .for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel
 	${LOCALBASE}/bin/chrpath -d ${WRKSRC}/bin/${f}
diff --git a/devel/ros/distinfo b/devel/ros/distinfo
index ca3b19b14c48..575d1666f2a2 100644
--- a/devel/ros/distinfo
+++ b/devel/ros/distinfo
@@ -1,3 +1,9 @@
-MD5 (ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
-SHA256 (ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
-SIZE (ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
+SHA256 (ros/ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
+SIZE (ros/ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
+SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
+SIZE (ros/gtest-1.3.0.tar.gz) = 636326
+MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
+SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
+SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
diff --git a/devel/ros_comm/Makefile b/devel/ros_comm/Makefile
index 0e9ac4ebdff3..7298ebe80755 100644
--- a/devel/ros_comm/Makefile
+++ b/devel/ros_comm/Makefile
@@ -7,7 +7,10 @@
 PORTNAME=	ros
 PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
+MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/${PORTNAME}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 gtest-1.3.0.tar.gz SWIG-1.3.29-wx.tar.gz
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	rene@freebsd.org
 COMMENT=	Robot Operating System - core utilities
@@ -16,8 +19,6 @@ LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
-
 LIB_DEPENDS=	log4cxx.10:${PORTSDIR}/devel/log4cxx \
 		boost_python:${PORTSDIR}/devel/boost-python-libs
 # we need cmake and gmake for the build, but the build is triggered by make
@@ -50,7 +51,6 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-MANUAL_PACKAGE_BUILDING=	downloads file after fetch
 .if ${OSVERSION} < 700000
 BROKEN=Does not link, librt missing
 .endif
@@ -81,6 +81,11 @@ post-extract:
 	    ${WRKSRC}/3rdparty/wxswig/manifest.xml
 	${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \
 	    ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|"
+	# move 3rdparty distfiles into place
+	${MKDIR} ${WRKSRC}/3rdparty/gtest/build
+	${CP} ${_DISTDIR}/gtest-1.3.0.tar.gz ${WRKSRC}/3rdparty/gtest/build
+	${MKDIR} ${WRKSRC}/3rdparty/wxswig/build
+	${CP} ${_DISTDIR}/SWIG-1.3.29-wx.tar.gz ${WRKSRC}/3rdparty/wxswig/build
 
 pre-build:
 .if exists(${LOCALBASE}/lib/libgtest.so)
@@ -104,7 +109,7 @@ post-build:
 	${MV} ${WRKSRC}/Makefile.bak ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} -p ${PREFIX}/${PORTNAME}/bin
+	${MKDIR} ${PREFIX}/${PORTNAME}/bin
 
 .for f in rospack rosplay rosrecord rosstack rxconsole rxloggerlevel
 	${LOCALBASE}/bin/chrpath -d ${WRKSRC}/bin/${f}
diff --git a/devel/ros_comm/distinfo b/devel/ros_comm/distinfo
index ca3b19b14c48..575d1666f2a2 100644
--- a/devel/ros_comm/distinfo
+++ b/devel/ros_comm/distinfo
@@ -1,3 +1,9 @@
-MD5 (ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
-SHA256 (ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
-SIZE (ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/ros-1.2.3.tar.bz2) = 0f7e04efb2f4ae16b76c237a250208f6
+SHA256 (ros/ros-1.2.3.tar.bz2) = 4061e746a45f90592a01b22db04849a3e2c8201c0cc3009206c32c23962f7478
+SIZE (ros/ros-1.2.3.tar.bz2) = 1534842
+MD5 (ros/gtest-1.3.0.tar.gz) = 714e9c00c0616ea72ba076c6c5f401d2
+SHA256 (ros/gtest-1.3.0.tar.gz) = 03a4c85cb7cf1754e052317b289625daa73485da664ede18ba21cf754d3e8bd7
+SIZE (ros/gtest-1.3.0.tar.gz) = 636326
+MD5 (ros/SWIG-1.3.29-wx.tar.gz) = db156f40bddb3875d1363a0b29c753f0
+SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
+SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417