Update net/erlang-p1_sip to 1.0.0

Change to use erlang/module.mk.
No upstream changes.

4 files changed, 38 insertions, 48 deletions

diff --git a/net/erlang-p1_sip/Makefile b/net/erlang-p1_sip/Makefile
index 1cade7b176e..1aab01701f5 100644
--- a/net/erlang-p1_sip/Makefile
+++ b/net/erlang-p1_sip/Makefile
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.1 2015/11/04 13:45:45 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/16 18:46:30 fhajny Exp $
 
-DISTNAME=	p1_sip-0.20150622
-PKGNAME=	erlang-${DISTNAME}
+DISTNAME=	p1_sip-1.0.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=processone/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://github.com/processone/p1_esip/
+HOMEPAGE=	http://github.com/processone/p1_sip/
 COMMENT=	ProcessOne SIP server component
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=	rebar-[0-9]*:../../devel/rebar
-DEPENDS+=	erlang-p1_stun-[0-9]*:../../net/erlang-p1_stun
-DEPENDS+=	erlang-p1_tls-[0-9]*:../../security/erlang-p1_tls
-DEPENDS+=	erlang-p1_utils-[0-9]*:../../misc/erlang-p1_utils
+DEPENDS+=	erlang-p1_stun-0.9.0{nb*,}:../../net/erlang-p1_stun
+DEPENDS+=	erlang-p1_tls>=1.0.0:../../security/erlang-p1_tls
+DEPENDS+=	erlang-p1_utils>=1.0.2:../../misc/erlang-p1_utils
 
 GITHUB_PROJECT=	p1_sip
-GITHUB_TAG=	d662d3fe7f6288b444ea321d854de0bd6d40e022
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
@@ -26,13 +22,7 @@ SUBST_MESSAGE.path=	Fixing include path
 SUBST_VARS.path=	LOCALBASE
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	pax
+ERL_MOD_NAME=	esip
 
-INSTALLATION_DIRS+=	lib/erlang/lib/esip
-
-do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pp ebin include priv \
-		${DESTDIR}${PREFIX}/lib/erlang/lib/esip/
-
-.include "../../lang/erlang/buildlink3.mk"
+.include "../../lang/erlang/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/erlang-p1_sip/PLIST b/net/erlang-p1_sip/PLIST
index b79d602527b..98afbda4321 100644
--- a/net/erlang-p1_sip/PLIST
+++ b/net/erlang-p1_sip/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1 2015/11/04 13:45:45 fhajny Exp $
-lib/erlang/lib/esip/ebin/esip.app
-lib/erlang/lib/esip/ebin/esip.beam
-lib/erlang/lib/esip/ebin/esip_app.beam
-lib/erlang/lib/esip/ebin/esip_client_transaction.beam
-lib/erlang/lib/esip/ebin/esip_codec.beam
-lib/erlang/lib/esip/ebin/esip_dialog.beam
-lib/erlang/lib/esip/ebin/esip_listener.beam
-lib/erlang/lib/esip/ebin/esip_server_transaction.beam
-lib/erlang/lib/esip/ebin/esip_socket.beam
-lib/erlang/lib/esip/ebin/esip_sup.beam
-lib/erlang/lib/esip/ebin/esip_tmp_sup.beam
-lib/erlang/lib/esip/ebin/esip_transaction.beam
-lib/erlang/lib/esip/ebin/esip_transport.beam
-lib/erlang/lib/esip/ebin/esip_udp_sup.beam
-lib/erlang/lib/esip/ebin/examples/.gitignore
-lib/erlang/lib/esip/include/esip.hrl
-lib/erlang/lib/esip/include/esip_lib.hrl
-lib/erlang/lib/esip/priv/esip_drv.so
+@comment $NetBSD: PLIST,v 1.2 2016/01/16 18:46:30 fhajny Exp $
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip.app
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_app.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_client_transaction.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_codec.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_dialog.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_listener.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_server_transaction.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_socket.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_sup.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_tmp_sup.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_transaction.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_transport.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/esip_udp_sup.beam
+lib/erlang/lib/esip-${PKGVERSION}/ebin/examples/.gitignore
+lib/erlang/lib/esip-${PKGVERSION}/include/esip.hrl
+lib/erlang/lib/esip-${PKGVERSION}/include/esip_lib.hrl
+lib/erlang/lib/esip-${PKGVERSION}/priv/esip_drv.so
diff --git a/net/erlang-p1_sip/distinfo b/net/erlang-p1_sip/distinfo
index 973dfe464f7..4dcd4443956 100644
--- a/net/erlang-p1_sip/distinfo
+++ b/net/erlang-p1_sip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/11/04 13:45:45 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2016/01/16 18:46:30 fhajny Exp $
 
-SHA1 (p1_sip-0.20150622-d662d3fe7f6288b444ea321d854de0bd6d40e022.tar.gz) = bf374eae06fea02cbbd460129003e3d10d8625bc
-RMD160 (p1_sip-0.20150622-d662d3fe7f6288b444ea321d854de0bd6d40e022.tar.gz) = fae36950346938ec699db57de5b79fd97b3ce2c9
-SHA512 (p1_sip-0.20150622-d662d3fe7f6288b444ea321d854de0bd6d40e022.tar.gz) = 3ca2cdaeb221fcc1bc5c91d58c2b3e4fca10eb5ecf6c5724d2f9d4adffe53b8422065a46e57d43cad8eebcb4e229cbbc526ce8c43527473ca2aade6c5482dd55
-Size (p1_sip-0.20150622-d662d3fe7f6288b444ea321d854de0bd6d40e022.tar.gz) = 234688 bytes
-SHA1 (patch-rebar.config) = d6cdd67e8a4b1f737e89b7e07d063a9e9c7869d8
+SHA1 (p1_sip-1.0.0.tar.gz) = 9ffc0b8b554bd4e73f97f5f52fa1e5f423db715f
+RMD160 (p1_sip-1.0.0.tar.gz) = 1f321c4ccb53f8e8b2b9287dd581ec1b232d61af
+SHA512 (p1_sip-1.0.0.tar.gz) = e467e5a0eb8f349d092283ab45a880f4901684097d2ffd6caed4ed09ead26784152186656d6bca82faef3c444947951ae19b78db11e4d363bab2209a1cf3af76
+Size (p1_sip-1.0.0.tar.gz) = 234620 bytes
+SHA1 (patch-rebar.config) = f4601575d2c3467ab1ed10109ef2b13af6049f14
diff --git a/net/erlang-p1_sip/patches/patch-rebar.config b/net/erlang-p1_sip/patches/patch-rebar.config
index bd6c34635ee..fbe5f1664da 100644
--- a/net/erlang-p1_sip/patches/patch-rebar.config
+++ b/net/erlang-p1_sip/patches/patch-rebar.config
@@ -1,9 +1,9 @@
-$NetBSD: patch-rebar.config,v 1.1 2015/11/04 13:45:45 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.2 2016/01/16 18:46:30 fhajny Exp $
 
 Deps are handled by pkgsrc.
 Look up p1_stun includes properly.
 
---- rebar.config.orig	2015-07-22 08:42:22.000000000 +0000
+--- rebar.config.orig	2016-01-05 14:09:44.000000000 +0000
 +++ rebar.config
 @@ -1,11 +1,7 @@
  {erl_opts, [{i, "include"},
@@ -11,9 +11,9 @@ Look up p1_stun includes properly.
 +	    {i, "@LOCALBASE@/lib/erlang/lib/p1_stun/include"},
  	    {i, "../p1_stun/include"}]}.
  
--{deps, [{p1_stun, ".*", {git, "https://github.com/processone/stun"}},
--	{p1_tls, ".*", {git, "https://github.com/processone/tls"}},
--	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils"}}]}.
+-{deps, [{p1_stun, ".*", {git, "https://github.com/processone/stun", {tag, "0.9.0"}}},
+-	{p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
+-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}}]}.
 -
  %% Local Variables:
  %% mode: erlang