CVS commit: pkgsrc/sysutils/erlang-lager

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri May 21 11:24:16 UTC 2021

Modified Files:
        pkgsrc/sysutils/erlang-lager: Makefile distinfo
        pkgsrc/sysutils/erlang-lager/patches: patch-Makefile

Log Message:
erlang-lager: Go back on rebar

pkgsrc changes:
---------------
  * Go back on devel/rebar instead of devel/rebar3.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/erlang-lager/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/erlang-lager/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/erlang-lager/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/erlang-lager/Makefile
diff -u pkgsrc/sysutils/erlang-lager/Makefile:1.8 pkgsrc/sysutils/erlang-lager/Makefile:1.9
--- pkgsrc/sysutils/erlang-lager/Makefile:1.8   Thu May 20 21:02:16 2021
+++ pkgsrc/sysutils/erlang-lager/Makefile       Fri May 21 11:24:16 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/05/20 21:02:16 triaxx Exp $
+# $NetBSD: Makefile,v 1.9 2021/05/21 11:24:16 triaxx Exp $
 
 DISTNAME=      lager-3.9.2
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=erlang-lager/}
 
@@ -9,28 +10,14 @@ HOMEPAGE=    https://github.com/erlang-lage
 COMMENT=       Logging framework for Erlang/OTP
 LICENSE=       apache-2.0
 
-BUILD_DEPENDS+=        rebar3-[0-9]*:../../devel/rebar3
 DEPENDS+=      erlang-goldrush>=0.1.9:../../sysutils/erlang-goldrush
 
 GITHUB_PROJECT=        lager
 GITHUB_TAG=    ${PKGVERSION_NOREV}
 
-REBAR=         ${PREFIX}/bin/rebar3
-
-SUBST_CLASSES+=                rebar
-SUBST_STAGE.rebar=     pre-configure
-SUBST_MESSAGE.rebar=   Using rebar3 to compile.
-SUBST_FILES.rebar=     Makefile
-SUBST_VARS.rebar=      REBAR
-
 post-extract:
        # Remove dependency handling
        ${RM} -f ${WRKSRC}/rebar.config.script
 
-pre-install:
-       # Move rebar3 build tree to make working the do-install rule of module.mk
-       ${MV} ${WRKSRC}/_build/default/lib/lager/ebin ${WRKSRC}
-       ${RM} -rf ${WRKSRC}/_build
-
 .include "../../lang/erlang/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/erlang-lager/distinfo
diff -u pkgsrc/sysutils/erlang-lager/distinfo:1.7 pkgsrc/sysutils/erlang-lager/distinfo:1.8
--- pkgsrc/sysutils/erlang-lager/distinfo:1.7   Thu May 20 21:02:16 2021
+++ pkgsrc/sysutils/erlang-lager/distinfo       Fri May 21 11:24:16 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/05/20 21:02:16 triaxx Exp $
+$NetBSD: distinfo,v 1.8 2021/05/21 11:24:16 triaxx Exp $
 
 SHA1 (lager-3.9.2.tar.gz) = 30a93b3a004285fab7036ca1fc84cc581606d6e0
 RMD160 (lager-3.9.2.tar.gz) = 439094a15c676ae7eddb2d5152cc24bef658cfa4
 SHA512 (lager-3.9.2.tar.gz) = 13b08145ab2316215f95de34838445f2922513e44f6800f338cd6941e6854653a9f8657447b439d5d508cb4569fbf4a0e03dc508d7c5d2ad48c9d4d14e17ca50
 Size (lager-3.9.2.tar.gz) = 273894 bytes
-SHA1 (patch-Makefile) = 8c71466df8a7ea55e4eef9f99ab6de05d32b428f
+SHA1 (patch-Makefile) = 179393d96e6bdee4b2e18f2d9f0f2f1ba9271ac2
 SHA1 (patch-rebar.config) = cc8c5503c026a5610b982773f52a38ee26385a27

Index: pkgsrc/sysutils/erlang-lager/patches/patch-Makefile
diff -u pkgsrc/sysutils/erlang-lager/patches/patch-Makefile:1.1 pkgsrc/sysutils/erlang-lager/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/erlang-lager/patches/patch-Makefile:1.1     Sat Jan 16 00:10:51 2021
+++ pkgsrc/sysutils/erlang-lager/patches/patch-Makefile Fri May 21 11:24:16 2021
@@ -1,27 +1,32 @@
-$NetBSD: patch-Makefile,v 1.1 2021/01/16 00:10:51 triaxx Exp $
+$NetBSD: patch-Makefile,v 1.2 2021/05/21 11:24:16 triaxx Exp $
 
-Use pkgsrc rebar.
+Localize rebar path.
 
---- Makefile.orig      2020-08-28 17:41:26.000000000 +0000
+--- Makefile.orig      2021-05-14 15:02:36.000000000 +0000
 +++ Makefile
-@@ -4,16 +4,16 @@
+@@ -1,19 +1,21 @@
++REBAR ?= ./rebar
++
+ .PHONY: all compile deps clean distclean test check_plt build_plt dialyzer \
+           cleanplt
+ 
  all: deps compile
  
  compile: deps
 -      ./rebar compile
-+      @REBAR@ compile
++      $(REBAR) compile
  
  deps:
 -      test -d deps || ./rebar get-deps
-+      test -d deps || @REBAR@ get-deps
++      test -d deps || $(REBAR) get-deps
  
  clean:
 -      ./rebar clean
-+      @REBAR@ clean
++      $(REBAR) clean
  
  distclean: clean
 -      ./rebar delete-deps
-+      @REBAR@ delete-deps
++      $(REBAR) delete-deps
  
  DIALYZER_APPS = kernel stdlib erts sasl eunit syntax_tools compiler crypto \
                                common_test