CVS commit: pkgsrc/lang/erlang

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Dec 17 13:06:18 UTC 2016

Modified Files:
        pkgsrc/lang/erlang: Makefile Makefile.versions options.mk

Log Message:
Fixed pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/lang/erlang/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/erlang/Makefile.versions
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/erlang/options.mk

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

Modified files:

Index: pkgsrc/lang/erlang/Makefile
diff -u pkgsrc/lang/erlang/Makefile:1.79 pkgsrc/lang/erlang/Makefile:1.80
--- pkgsrc/lang/erlang/Makefile:1.79    Sun Oct  2 10:12:36 2016
+++ pkgsrc/lang/erlang/Makefile Sat Dec 17 13:06:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2016/10/02 10:12:36 fhajny Exp $
+# $NetBSD: Makefile,v 1.80 2016/12/17 13:06:18 rillig Exp $
 
 DISTNAME=              otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
 PKGNAME=               ${DISTNAME:S/otp_src_/erlang-/}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=      --enable-threads
 .if !empty(MACHINE_PLATFORM:MNetBSD-[56].*)
 
 # a machine without native ethread implementation?
-.if    empty(MACHINE_PLATFORM:M*i386)  &&\
+.  if  empty(MACHINE_PLATFORM:M*i386)  &&\
        empty(MACHINE_PLATFORM:M*sparc) &&\
        empty(MACHINE_PLATFORM:M*sparc64) &&\
        empty(MACHINE_PLATFORM:M*powerpc) &&\
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=      --enable-threads
 CONFIGURE_ARGS+=       --disable-native-ethr-impls\
                        --disable-smp-require-native-atomics
 
-.endif
+.  endif
 .endif
 
 MAKE_ENV+=             DESTDIR=${DESTDIR}

Index: pkgsrc/lang/erlang/Makefile.versions
diff -u pkgsrc/lang/erlang/Makefile.versions:1.24 pkgsrc/lang/erlang/Makefile.versions:1.25
--- pkgsrc/lang/erlang/Makefile.versions:1.24   Sun Oct  2 10:12:36 2016
+++ pkgsrc/lang/erlang/Makefile.versions        Sat Dec 17 13:06:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.versions,v 1.24 2016/10/02 10:12:36 fhajny Exp $
+# $NetBSD: Makefile.versions,v 1.25 2016/12/17 13:06:18 rillig Exp $
 
 DIST_VERSION_MAJOR=            19
 DIST_VERSION_MINOR=            1
@@ -62,11 +62,11 @@ PLIST_SUBST+=       VERSION.${name}=${version}
 .endfor
 
 # Generate PLIST
-.for _pkg_ _version_ in $(_VERSIONS)
-PRINT_PLIST_AWK+=      {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
+.for pkg version in ${_VERSIONS}
+PRINT_PLIST_AWK+=      {if ($$0 ~ /\/${pkg}-${version}\//) {sub(/\/${pkg}-${version}\//,"/${pkg}-$${VERSION.${pkg}}/", $$0);}}
 # documentation:
-PRINT_PLIST_AWK+=      {gsub(/\/$(_pkg_)-$(_version_)\.pdf/,"/$(_pkg_)-$${VERSION.$(_pkg_)}.pdf", $$0);}
+PRINT_PLIST_AWK+=      {gsub(/\/${pkg}-${version}\.pdf/,"/${pkg}-$${VERSION.${pkg}}.pdf", $$0);}
 .endfor
 PRINT_PLIST_AWK+=      {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
 # documentation:
-PRINT_PLIST_AWK+=      {gsub(/\/otp-system-documentation-$(VERSION.erts)\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}
+PRINT_PLIST_AWK+=      {gsub(/\/otp-system-documentation-${VERSION.erts}\.pdf/,"/otp-system-documentation-$${VERSION.erts}.pdf", $$0);}

Index: pkgsrc/lang/erlang/options.mk
diff -u pkgsrc/lang/erlang/options.mk:1.8 pkgsrc/lang/erlang/options.mk:1.9
--- pkgsrc/lang/erlang/options.mk:1.8   Tue Apr 28 14:34:20 2015
+++ pkgsrc/lang/erlang/options.mk       Sat Dec 17 13:06:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.8 2015/04/28 14:34:20 fhajny Exp $
+# $NetBSD: options.mk,v 1.9 2016/12/17 13:06:18 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.erlang
-PKG_SUPPORTED_OPTIONS= java erlang-hipe
+PKG_OPTIONS_VAR=               PKG_OPTIONS.erlang
+PKG_SUPPORTED_OPTIONS=         java erlang-hipe
 PKG_OPTIONS_OPTIONAL_GROUPS=   odbc
 PKG_OPTIONS_GROUP.odbc=                iodbc unixodbc