Fix the fetch problem, bumping the version to 1.8.3.

This port will automatically follow devel/subversion again.

3 files changed, 35 insertions, 21 deletions

diff --git a/devel/svn_load_dirs/Makefile b/devel/svn_load_dirs/Makefile
index a13e573514f1..f3cfcfa82c37 100644
--- a/devel/svn_load_dirs/Makefile
+++ b/devel/svn_load_dirs/Makefile
@@ -1,41 +1,43 @@
-# New ports collection makefile for:	svn_load_dirs
-# Date created:		9 April 2007
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	svn_load_dirs
 PORTVERSION=	${SVN_PORTVERSION}
-PORTREVISION=	0	# You would hardly need to update this!
 CATEGORIES=	devel
-MASTER_SITES=	# none
-DISTFILES=	# none
+MASTER_SITES=	http://svn.apache.org/repos/asf/subversion/tags/${PORTVERSION}/contrib/client-side/svn_load_dirs/
+DISTFILES=	LICENSE_AFL3.txt \
+		svn_load_dirs.README \
+		svn_load_dirs.pl.in \
+		svn_load_dirs_property_table.example
+DIST_SUBDIR=	subversion/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl script to load directories into a Subversion repository
 
 RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion16
+		${LOCALBASE}/bin/svn:${SVN_PORTDIR}
 
 USES=		perl5
-USE_BZIP2=	yes
-
-WRKSRC=		${WRKDIR}/subversion-${SVN_PORTVERSION}/contrib/client-side/svn_load_dirs
 
 PLIST_FILES=	bin/svn_load_dirs
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-PORTEXAMPLES=	*
-.endif
 
 .include <bsd.port.pre.mk>
 
-SVN_PORTDIR=		${PORTSDIR}/devel/subversion16
+.if ${PORT_OPTIONS:MEXAMPLES}
+PORTEXAMPLES=	*
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.endif
+
+SVN_PORTDIR=		${PORTSDIR}/devel/subversion
 SVN_PORTVERSION!=	cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION
 
 do-extract:
-	${MKDIR} ${WRKDIR}
-	cd ${SVN_PORTDIR} && ${MAKE} DISABLE_CONFLICTS=yes WRKDIR=${WRKDIR} extract
+	${MKDIR} ${WRKSRC}
+	for f in ${DISTDIR}/${DIST_SUBDIR}/*; do \
+		${CP} "$$f" ${WRKSRC}/; \
+	done
 
 do-build:
 	${SED} -E \
@@ -45,11 +47,15 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/svn_load_dirs.pl ${PREFIX}/bin/svn_load_dirs
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/svn_load_dirs_property_table.example ${EXAMPLESDIR}/
+.endif
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/svn_load_dirs.README ${DOCSDIR}/
+	for f in LICENSE_AFL3.txt svn_load_dirs.README; do \
+		${INSTALL_DATA} ${WRKSRC}/"$$f" ${DOCSDIR}/; \
+	done
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/svn_load_dirs/distinfo b/devel/svn_load_dirs/distinfo
new file mode 100644
index 000000000000..0c30932a2545
--- /dev/null
+++ b/devel/svn_load_dirs/distinfo
@@ -0,0 +1,8 @@
+SHA256 (subversion/svn_load_dirs-1.8.3/LICENSE_AFL3.txt) = 0fa1d422652bbc26f14482b970b07f147e786ea8fd08fa5ca56eb6a845f46cd2
+SIZE (subversion/svn_load_dirs-1.8.3/LICENSE_AFL3.txt) = 10962
+SHA256 (subversion/svn_load_dirs-1.8.3/svn_load_dirs.README) = 3371751ac3f0f8162db86cd3731d50084ebd59a71fdbda0070e822b0ddff14a8
+SIZE (subversion/svn_load_dirs-1.8.3/svn_load_dirs.README) = 9630
+SHA256 (subversion/svn_load_dirs-1.8.3/svn_load_dirs.pl.in) = 181a7a119625960921de057b858c151ca73dcb7e578df177358e8afa176e1d1d
+SIZE (subversion/svn_load_dirs-1.8.3/svn_load_dirs.pl.in) = 67211
+SHA256 (subversion/svn_load_dirs-1.8.3/svn_load_dirs_property_table.example) = d6152a270cf64a9338b79ec931450ca6f26cf479844ab1f7fffe7b0f0fe60922
+SIZE (subversion/svn_load_dirs-1.8.3/svn_load_dirs_property_table.example) = 1334
diff --git a/devel/svn_load_dirs/pkg-descr b/devel/svn_load_dirs/pkg-descr
index 8c367a401b3a..8ea2a6927596 100644
--- a/devel/svn_load_dirs/pkg-descr
+++ b/devel/svn_load_dirs/pkg-descr
@@ -6,4 +6,4 @@ Subversion.
 This script is part of the Subversion distribution and it is assumed
 that it can be used under the same license terms as Subversion itself.
 
-WWW:	http://subversion.tigris.org/tools_contrib.html#client_side
+WWW: https://svn.apache.org/repos/asf/subversion/branches/scons-build-system/www/tools_contrib.html#svn_load_dirs_pl