Cache remote deps. This should help offline builds and prevent PLIST

changes if upstream updates one of the dependencies. Clean up and
reorder Makefile for better readability.

3 files changed, 28 insertions, 16 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index c575f1f2dc5..faa61ff9e08 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/10/15 22:05:40 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2014/10/16 12:47:59 fhajny Exp $
 
 DISTNAME=	ejabberd-14.07
 PKGREVISION=	3
@@ -6,6 +6,9 @@ CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 
+DISTFILES+=	${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
+SITES.${DISTNAME}-deps.tar.gz=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
@@ -83,14 +86,6 @@ SPECIAL_PERMS+=		sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750
 
 REPLACE_SH=		ejabberdctl.template tools/captcha.sh
 
-post-patch:
-	${RM} -f ${WRKSRC}/doc/guide.tex.orig
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths
 SUBST_STAGE.paths=	pre-configure
@@ -105,10 +100,20 @@ SUBST_SED.paths+=	-e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@DISTNAME@,${DISTNAME},g'
 
-post-configure:
-	cd ${WRKSRC} && ${BUILD_MAKE_CMD} deps
-	${PATCH} -p0 ${WRKSRC}/deps/p1_iconv/rebar.config \
-	  < ${FILESDIR}/deps_p1__iconv_rebar.config.patch
+# Helper target to refresh remote deps for tarring up
+fetch-deps:
+	cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps
+
+post-extract:
+	${LN} -s ${WRKDIR}/deps ${WRKSRC}/
+
+post-patch:
+	${RM} -f ${WRKSRC}/doc/guide.tex.orig
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 2e30ba29e32..949cdde1594 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.26 2014/08/21 19:32:27 tron Exp $
+$NetBSD: distinfo,v 1.27 2014/10/16 12:47:59 fhajny Exp $
 
+SHA1 (ejabberd-14.07-deps.tar.gz) = 102a78c428fe587d57385c66a11cc731d2ec434e
+RMD160 (ejabberd-14.07-deps.tar.gz) = 02c28e5a0c234800811d8ff24ca6afab4d3d0eec
+Size (ejabberd-14.07-deps.tar.gz) = 8797259 bytes
 SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0
 RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f
 Size (ejabberd-14.07.tgz) = 3200975 bytes
@@ -7,3 +10,4 @@ SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
 SHA1 (patch-ae) = 542ac36eecc4b679dded78e56903686060fd643a
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
+SHA1 (patch-deps_p1__iconv_rebar.config) = e9252229695195ebfe5aeea7ef3ef2c6cd95bc02
diff --git a/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
index 261000a30cf..fe398386cb7 100644
--- a/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch
+++ b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
@@ -1,5 +1,8 @@
---- rebar.config.orig	2013-10-11 06:52:27.975407457 +0000
-+++ rebar.config	2013-10-11 06:59:26.293793956 +0000
+$NetBSD: patch-deps_p1__iconv_rebar.config,v 1.1 2014/10/16 12:47:59 fhajny Exp $
+
+Fix libiconv linking.
+--- deps/p1_iconv/rebar.config.orig	2013-10-11 06:52:27.975407457 +0000
++++ deps/p1_iconv/rebar.config	2013-10-11 06:59:26.293793956 +0000
 @@ -1,6 +1,7 @@
  {erl_opts, [debug_info]}.