Fixed pkglint warnings.

7 files changed, 30 insertions, 30 deletions

diff --git a/biology/plinkseq/Makefile b/biology/plinkseq/Makefile
index 52e7e6c74ff..ef923b1bdb6 100644
--- a/biology/plinkseq/Makefile
+++ b/biology/plinkseq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/02/08 12:27:14 wiedi Exp $
+# $NetBSD: Makefile,v 1.4 2016/12/17 12:55:29 rillig Exp $
 
 DISTNAME=	plinkseq-0.08
 PKGREVISION=	1
@@ -20,19 +20,19 @@ LDFLAGS.SunOS+=	-lsocket -lnsl
 
 .include "../../mk/bsd.prefs.mk"
 
-.if $(OPSYS) != "Linux"
+.if ${OPSYS} != "Linux"
 BUILDLINK_TRANSFORM=	rm:-ldl
 .endif
 
 # Put missing protocol description files in place:
 post-extract:
-	$(CP) $(FILESDIR)/pp.proto $(WRKSRC)/lib/
-	$(CP) $(FILESDIR)/variant.proto $(WRKSRC)/lib/
+	${CP} ${FILESDIR}/pp.proto ${WRKSRC}/lib/
+	${CP} ${FILESDIR}/variant.proto ${WRKSRC}/lib/
 
 # Regenerate:
 pre-build:
-	cd $(WRKSRC)/lib && protoc --cpp_out=. pp.proto && mv pp.pb.cc pp.pb.cpp
-	cd $(WRKSRC)/lib && protoc --cpp_out=. variant.proto && mv variant.pb.cc variant.pb.cpp
+	cd ${WRKSRC}/lib && protoc --cpp_out=. pp.proto && mv pp.pb.cc pp.pb.cpp
+	cd ${WRKSRC}/lib && protoc --cpp_out=. variant.proto && mv variant.pb.cc variant.pb.cpp
 
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/biology/plinkseq/distinfo b/biology/plinkseq/distinfo
index 61c42b9752c..f1ad19b880b 100644
--- a/biology/plinkseq/distinfo
+++ b/biology/plinkseq/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2015/11/02 18:42:22 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/12/17 12:55:29 rillig Exp $
 
 SHA1 (plinkseq-0.08.tar.gz) = 8bff6b32750eee85559dda2c7c3cf9aea423a3d7
 RMD160 (plinkseq-0.08.tar.gz) = bce0966ea5f25d8c1091157561aaf533a98595ec
 SHA512 (plinkseq-0.08.tar.gz) = c82db774df26988f9af377d5493cf579bbf1a219b43987f74381f795ade2340dd486c8d7d629612fd6068a023ea605540f2c972bf7fb71d665730262ef94cb80
 Size (plinkseq-0.08.tar.gz) = 2991871 bytes
 SHA1 (patch-browser_main.c) = 2bbeed764180b0a0e30f134b40c650cfa20bdcec
-SHA1 (patch-browser_mongoose.c) = 02233e0dd1f4c7923ffabf1a16b30c374253d87e
+SHA1 (patch-browser_mongoose.c) = 02716eb71171edd37ae483d98a045c261e65defe
 SHA1 (patch-lib_annot.cpp) = b405bca26186ea08241ad5936c2a1b43212d8dec
 SHA1 (patch-lib_annot.h) = 5efccddf878b4628ae7186d59a726a157d356196
 SHA1 (patch-lib_token.cpp) = 848e7b790db6a4784697482ea330b4d474731368
diff --git a/biology/plinkseq/patches/patch-browser_mongoose.c b/biology/plinkseq/patches/patch-browser_mongoose.c
index a42087a4b64..a74d5554dde 100644
--- a/biology/plinkseq/patches/patch-browser_mongoose.c
+++ b/biology/plinkseq/patches/patch-browser_mongoose.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-browser_mongoose.c,v 1.2 2014/04/17 21:23:19 asau Exp $
+$NetBSD: patch-browser_mongoose.c,v 1.3 2016/12/17 12:55:29 rillig Exp $
 
 __BSD_VISIBLE is needed on FreeBSD.
 _XOPEN_SOURCE is not needed on sunos.
@@ -16,7 +16,7 @@ _XOPEN_SOURCE is not needed on sunos.
  #define _LARGEFILE_SOURCE // Enable 64-bit file offsets

  #define __STDC_FORMAT_MACROS // <inttypes.h> wants this for C++

  #endif

-@@ -213,6 +216,10 @@ typedef int SOCKET;

+@@ -213,6 +216,10 @@ typedef int SOCKET;
  

  #endif // End of Windows and UNIX specific includes

  

diff --git a/databases/squirrelsql/Makefile b/databases/squirrelsql/Makefile
index 23f083b6aef..091fd6c4ec3 100644
--- a/databases/squirrelsql/Makefile
+++ b/databases/squirrelsql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/09 17:41:06 asau Exp $
+# $NetBSD: Makefile,v 1.4 2016/12/17 13:29:39 rillig Exp $
 
 DISTNAME=	squirrelsql-3.7-standard
 PKGNAME=	squirrelsql-3.7
 CATEGORIES=	databases
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=squirrel-sql/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrel-sql/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	asau@inbox.ru
@@ -14,24 +14,24 @@ SUBST_CLASSES+=			set-java set-base
 SUBST_STAGE.set-java=		pre-configure
 SUBST_MESSAGE.set-java=		Setting JAVA_HOME path.
 SUBST_FILES.set-java=		squirrel-sql.sh
-SUBST_SED.set-java=		-e 's,%JAVA_HOME,$(PKG_JAVA_HOME),g'
+SUBST_SED.set-java=		-e 's,%JAVA_HOME,${PKG_JAVA_HOME},g'
 
 SUBST_STAGE.set-base=		pre-configure
 SUBST_MESSAGE.set-base=		Setting package base path.
 SUBST_FILES.set-base=		squirrel-sql.sh
-SUBST_SED.set-base=		-e 's,@SQUIRREL_SQL_HOME@,$(PREFIX)/share/$(PKGBASE),g'
+SUBST_SED.set-base=		-e 's,@SQUIRREL_SQL_HOME@,${PREFIX}/share/${PKGBASE},g'
 
 USE_JAVA=	run
 USE_JAVA2=	6
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin share/$(PKGBASE)
+INSTALLATION_DIRS=	bin share/${PKGBASE}
 
 do-install:
-	cd $(WRKSRC) && pax -rwpm . $(DESTDIR)$(PREFIX)/share/$(PKGBASE)
-	$(RM) -f $(DESTDIR)$(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh.orig
-	$(CHMOD) +x $(DESTDIR)$(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh
-	$(LN) -sf $(PREFIX)/share/$(PKGBASE)/squirrel-sql.sh $(DESTDIR)$(PREFIX)/bin/squirrel-sql
+	cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	${RM} -f ${DESTDIR}${PREFIX}/share/${PKGBASE}/squirrel-sql.sh.orig
+	${CHMOD} +x ${DESTDIR}${PREFIX}/share/${PKGBASE}/squirrel-sql.sh
+	${LN} -sf ${PREFIX}/share/${PKGBASE}/squirrel-sql.sh ${DESTDIR}${PREFIX}/bin/squirrel-sql
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2b585e74b7f..8e4a343c9d1 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -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}
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 070db61e7a3..10e677fc32d 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -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);}
diff --git a/lang/erlang/options.mk b/lang/erlang/options.mk
index 2bc4e75aacb..788eddf236a 100644
--- a/lang/erlang/options.mk
+++ b/lang/erlang/options.mk
@@ -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