Sun Nov 3 18:11:51 2019 UTC ()
lang/erlang: write _VERSIONS variable in a single line

In the previous version, pkglint would want to indent the continuation
line with a tab. To prevent this, the variable assignment is now printed
in its canonical format.

Just like humans, pkglint does not read the "do not edit" notice at the
top of the file. Maybe it should.


(rillig)
diff -r1.95 -r1.96 pkgsrc/lang/erlang/Makefile
diff -r1.13 -r1.14 pkgsrc/lang/erlang/versions.mk
cvs diff -r1.95 -r1.96 pkgsrc/lang/erlang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/erlang/Makefile 2019/08/11 13:21:19 1.95
+++ pkgsrc/lang/erlang/Makefile 2019/11/03 18:11:51 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.95 2019/08/11 13:21:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.96 2019/11/03 18:11:51 rillig Exp $
2 2
3DISTNAME= OTP-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH} 3DISTNAME= OTP-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
4PKGNAME= ${DISTNAME:S/OTP-/erlang-/} 4PKGNAME= ${DISTNAME:S/OTP-/erlang-/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://github.com/erlang/otp/archive/ 7MASTER_SITES= https://github.com/erlang/otp/archive/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.erlang.org/ 10HOMEPAGE= https://www.erlang.org/
11COMMENT= Concurrent functional programming language 11COMMENT= Concurrent functional programming language
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -91,26 +91,25 @@ pre-configure: @@ -91,26 +91,25 @@ pre-configure:
91### 91###
92### Ensure this gets rebuilt. 92### Ensure this gets rebuilt.
93### 93###
94pre-build: 94pre-build:
95 ${RUN} ${RM} -f ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam 95 ${RUN} ${RM} -f ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam
96 96
97### 97###
98### Generate a list of module versions. 98### Generate a list of module versions.
99### 99###
100.PHONY: versions 100.PHONY: versions
101versions: do-extract 101versions: do-extract
102 @${ECHO} "# \$$NetBSD\$$" > ${.CURDIR}/versions.mk 102 @${ECHO} "# \$$NetBSD\$$" > ${.CURDIR}/versions.mk
103 @${ECHO} "# Do not edit, regenerate using 'make versions'" >> ${.CURDIR}/versions.mk 103 @${ECHO} "# Do not edit, regenerate using 'make versions'" >> ${.CURDIR}/versions.mk
104 @${ECHO} "_VERSIONS= \\" >> ${.CURDIR}/versions.mk 
105 ${AWK} -F: '/OTP-${PKGVERSION_NOREV} :/{print $$2}' ${WRKSRC}/otp_versions.table |\ 104 ${AWK} -F: '/OTP-${PKGVERSION_NOREV} :/{print $$2}' ${WRKSRC}/otp_versions.table |\
106 ${SED} -e 's/# //g' -e 's/-/ /g' >> ${.CURDIR}/versions.mk 105 ${SED} -e 's/# //g' -e 's/-/ /g' -e 's,^ ,_VERSIONS= ,' >> ${.CURDIR}/versions.mk
107 106
108post-install: 107post-install:
109 chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib 108 chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib
110 109
111.include "Makefile.versions" 110.include "Makefile.versions"
112 111
113.include "../../security/openssl/buildlink3.mk" 112.include "../../security/openssl/buildlink3.mk"
114.include "../../mk/termcap.buildlink3.mk" 113.include "../../mk/termcap.buildlink3.mk"
115.include "../../mk/pthread.buildlink3.mk" 114.include "../../mk/pthread.buildlink3.mk"
116.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/lang/erlang/versions.mk (expand / switch to unified diff)

--- pkgsrc/lang/erlang/versions.mk 2019/08/01 11:43:00 1.13
+++ pkgsrc/lang/erlang/versions.mk 2019/11/03 18:11:51 1.14
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
1# $NetBSD: versions.mk,v 1.13 2019/08/01 11:43:00 nia Exp $ 1# $NetBSD: versions.mk,v 1.14 2019/11/03 18:11:51 rillig Exp $
2# Do not edit, regenerate using 'make versions' 2# Do not edit, regenerate using 'make versions'
3_VERSIONS= \ 3_VERSIONS= compiler 7.4.4 asn1 5.0.9 common_test 1.17.3 crypto 4.5.1 debugger 4.2.7 dialyzer 4.0.3 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.9.1 erl_interface 3.12 erts 10.4.4 et 1.6.4 eunit 2.3.7 ftp 1.0.2 hipe 3.19.1 inets 7.0.9 jinterface 1.10 kernel 6.4.1 megaco 3.18.5 mnesia 4.16 observer 2.9.1 odbc 2.12.4 os_mon 2.5 parsetools 2.1.8 public_key 1.6.7 reltool 0.8 runtime_tools 1.13.3 sasl 3.4 snmp 5.3 ssh 4.7.7 ssl 9.3.5 stdlib 3.9.2 syntax_tools 2.2 tftp 1.0.1 tools 3.2 wx 1.8.8 xmerl 1.3.21
4 compiler 7.4.4 asn1 5.0.9 common_test 1.17.3 crypto 4.5.1 debugger 4.2.7 dialyzer 4.0.3 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.9.1 erl_interface 3.12 erts 10.4.4 et 1.6.4 eunit 2.3.7 ftp 1.0.2 hipe 3.19.1 inets 7.0.9 jinterface 1.10 kernel 6.4.1 megaco 3.18.5 mnesia 4.16 observer 2.9.1 odbc 2.12.4 os_mon 2.5 parsetools 2.1.8 public_key 1.6.7 reltool 0.8 runtime_tools 1.13.3 sasl 3.4 snmp 5.3 ssh 4.7.7 ssl 9.3.5 stdlib 3.9.2 syntax_tools 2.2 tftp 1.0.1 tools 3.2 wx 1.8.8 xmerl 1.3.21