pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fixed pkglint warnings.
details: https://anonhg.NetBSD.org/pkgsrc/rev/84085102c3e5
branches: trunk
changeset: 356015:84085102c3e5
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Dec 17 13:38:02 2016 +0000
description:
Fixed pkglint warnings.
diffstat:
lang/abcl/Makefile | 24 ++++++++++++------------
lang/maude/Makefile | 8 ++++----
lang/racket/Makefile | 22 +++++++++++-----------
lang/squeak/Makefile | 22 +++++++++++-----------
parallel/slurm/Makefile | 12 ++++++------
parallel/threadingbuildingblocks/Makefile | 18 +++++++++---------
time/projectlibre/Makefile | 14 +++++++-------
7 files changed, 60 insertions(+), 60 deletions(-)
diffs (291 lines):
diff -r ae7b05bd6bd2 -r 84085102c3e5 lang/abcl/Makefile
--- a/lang/abcl/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/lang/abcl/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2016/10/25 17:41:16 asau Exp $
+# $NetBSD: Makefile,v 1.9 2016/12/17 13:38:02 rillig Exp $
DISTNAME= abcl-src-1.4.0
-PKGNAME= $(DISTNAME:C/-src//)
+PKGNAME= ${DISTNAME:C/-src//}
CATEGORIES= lang
-MASTER_SITES= http://abcl.org/releases/$(PKGVERSION_NOREV)/
+MASTER_SITES= http://abcl.org/releases/${PKGVERSION_NOREV}/
MAINTAINER= asau%NetBSD.org@localhost
HOMEPAGE= http://abcl.org/
@@ -14,20 +14,20 @@
INSTALLATION_DIRS= bin lib/abcl
do-build:
- $(RUN)$(_ULIMIT_CMD) cd $(WRKSRC) && \
- $(PKGSRC_SETENV) $(MAKE_ENV) \
- ant -nouserlib -Dabcl.runtime.jar.path=$(PREFIX)/lib/abcl/abcl.jar
+ ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \
+ ${PKGSRC_SETENV} ${MAKE_ENV} \
+ ant -nouserlib -Dabcl.runtime.jar.path=${PREFIX}/lib/abcl/abcl.jar
do-install:
- $(INSTALL_SCRIPT) $(WRKSRC)/abcl $(DESTDIR)$(PREFIX)/bin
- $(INSTALL_DATA) $(WRKSRC)/dist/abcl.jar $(DESTDIR)$(PREFIX)/lib/abcl
- $(INSTALL_DATA) $(WRKSRC)/dist/abcl-contrib.jar $(DESTDIR)$(PREFIX)/lib/abcl
+ ${INSTALL_SCRIPT} ${WRKSRC}/abcl ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${DESTDIR}${PREFIX}/lib/abcl
+ ${INSTALL_DATA} ${WRKSRC}/dist/abcl-contrib.jar ${DESTDIR}${PREFIX}/lib/abcl
# TODO: requires network connectivity to fetch dependencies (e.g. JUnit)
do-test:
- $(RUN)$(_ULIMIT_CMD) cd $(WRKSRC) && \
- $(PKGSRC_SETENV) $(MAKE_ENV) \
- ant -nouserlib -Dabcl.runtime.jar.path=$(PREFIX)/lib/abcl/abcl.jar abcl.test
+ ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \
+ ${PKGSRC_SETENV} ${MAKE_ENV} \
+ ant -nouserlib -Dabcl.runtime.jar.path=${PREFIX}/lib/abcl/abcl.jar abcl.test
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ae7b05bd6bd2 -r 84085102c3e5 lang/maude/Makefile
--- a/lang/maude/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/lang/maude/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/02 20:11:45 asau Exp $
+# $NetBSD: Makefile,v 1.26 2016/12/17 13:38:55 rillig Exp $
#
DISTNAME= Maude-2.6
@@ -15,14 +15,14 @@
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --datadir=$(PREFIX)/share/$(PKGBASE)
+CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE}
USE_LANGUAGES= c c++
USE_TOOLS+= flex bison
TEST_TARGET= check
post-install:
- cd $(WRKSRC)/src/Main && $(INSTALL_DATA) *.maude \
- $(DESTDIR)$(PREFIX)/share/$(PKGBASE)
+ cd ${WRKSRC}/src/Main && ${INSTALL_DATA} *.maude \
+ ${DESTDIR}${PREFIX}/share/${PKGBASE}
.include "../../devel/buddy/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
diff -r ae7b05bd6bd2 -r 84085102c3e5 lang/racket/Makefile
--- a/lang/racket/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/lang/racket/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.54 2016/12/12 12:08:57 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/12/17 13:39:41 rillig Exp $
PKGNAME= racket-6.7
-DISTNAME= $(PKGNAME_NOREV)-src
+DISTNAME= ${PKGNAME_NOREV}-src
CATEGORIES= lang
-MASTER_SITES_PLT= http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \
- http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/ \
- http://www.cs.utah.edu/plt/installers/$(PKGVERSION_NOREV)/ \
- http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
- ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/
+MASTER_SITES_PLT= http://download.racket-lang.org/installers/${PKGVERSION_NOREV}/ \
+ http://www.eecs.northwestern.edu/racket/${PKGVERSION_NOREV}/ \
+ http://www.cs.utah.edu/plt/installers/${PKGVERSION_NOREV}/ \
+ http://mirror.informatik.uni-tuebingen.de/mirror/racket/${PKGVERSION_NOREV}/ \
+ ftp://infogroep.be/pub/racket/installers/${PKGVERSION_NOREV}/
# Pre-release:
#MASTER_SITES_PLT= http://pre-release.racket-lang.org/installers/
-MASTER_SITES= $(MASTER_SITES_PLT)
+MASTER_SITES= ${MASTER_SITES_PLT}
EXTRACT_SUFX= .tgz
MAINTAINER= asau%inbox.ru@localhost
@@ -20,7 +20,7 @@
CONFLICTS+= drscheme-[0-9]* mzscheme-[0-9]* racket-textual-[0-9]*
-WRKSRC= $(WRKDIR)/$(PKGNAME_NOREV)
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= yes
CONFIGURE_DIRS= src
@@ -47,8 +47,8 @@
REPLACE_INTERPRETER+= racket
REPLACE.racket.old= .*racket
-REPLACE.racket.new= $(LOCALBASE)/bin/racket
-REPLACE_FILES.racket= $(REPLACE_RACKET)
+REPLACE.racket.new= ${LOCALBASE}/bin/racket
+REPLACE_FILES.racket= ${REPLACE_RACKET}
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff -r ae7b05bd6bd2 -r 84085102c3e5 lang/squeak/Makefile
--- a/lang/squeak/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/lang/squeak/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.49 2016/10/03 07:57:24 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2016/12/17 13:40:33 rillig Exp $
SQUEAK_VERSION= 4.5
IMAGE_VERSION= 13680
SQUEAK_SOURCES= SqueakV41.sources
-DISTNAME= Squeak$(SQUEAK_VERSION)-$(IMAGE_VERSION)
-PKGNAME= squeak-$(SQUEAK_VERSION)
+DISTNAME= Squeak${SQUEAK_VERSION}-${IMAGE_VERSION}
+PKGNAME= squeak-${SQUEAK_VERSION}
CATEGORIES= lang
-MASTER_SITES= http://ftp.squeak.org/$(SQUEAK_VERSION)/
+MASTER_SITES= http://ftp.squeak.org/${SQUEAK_VERSION}/
EXTRACT_SUFX= .zip
-DISTFILES= ${DEFAULT_DISTFILES} $(SQUEAK_SOURCES).gz
+DISTFILES= ${DEFAULT_DISTFILES} ${SQUEAK_SOURCES}.gz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://squeak.org/
@@ -21,16 +21,16 @@
DIST_SUBDIR= squeak
USE_TOOLS+= gzip unzip
NO_BUILD= yes
-PLIST_SUBST+= IMAGE_VERSION=$(IMAGE_VERSION)
+PLIST_SUBST+= IMAGE_VERSION=${IMAGE_VERSION}
-INSTALLATION_DIRS= share/squeak/$(SQUEAK_VERSION)
+INSTALLATION_DIRS= share/squeak/${SQUEAK_VERSION}
post-extract:
- $(GZIP_CMD) -dc $(DISTDIR)/$(DIST_SUBDIR)/$(SQUEAK_SOURCES).gz > $(WRKDIR)/$(SQUEAK_SOURCES)
+ ${GZIP_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SOURCES}.gz > ${WRKDIR}/${SQUEAK_SOURCES}
do-install:
- $(INSTALL_DATA) $(WRKDIR)/$(DISTNAME:=.image) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/
- $(INSTALL_DATA) $(WRKDIR)/$(DISTNAME:=.changes) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/
- $(INSTALL_DATA) $(WRKDIR)/$(SQUEAK_SOURCES) $(DESTDIR)$(PREFIX)/share/squeak/$(SQUEAK_VERSION)/$(SQUEAK_SOURCES)
+ ${INSTALL_DATA} ${WRKDIR}/${DISTNAME:=.image} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/
+ ${INSTALL_DATA} ${WRKDIR}/${DISTNAME:=.changes} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/
+ ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/share/squeak/${SQUEAK_VERSION}/${SQUEAK_SOURCES}
.include "../../mk/bsd.pkg.mk"
diff -r ae7b05bd6bd2 -r 84085102c3e5 parallel/slurm/Makefile
--- a/parallel/slurm/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/parallel/slurm/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/07/09 06:38:48 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/12/17 13:41:57 rillig Exp $
DISTNAME= slurm-2.6.4
PKGREVISION= 9
@@ -20,7 +20,7 @@
CONFIGURE_ARGS+= --with-hdf5=no
# Fix installation:
-CONFIGURE_ARGS+= --htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
+CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
REPLACE_PYTHON= doc/html/shtml2html.py
@@ -28,18 +28,18 @@
PKG_USERS= slurm:slurm
PKG_GECOS.slurm= SLURM user
-PKG_SHELL.slurm= $(NOLOGIN)
+PKG_SHELL.slurm= ${NOLOGIN}
RCD_SCRIPTS+= slurmd slurmctld
post-install:
- $(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)
- $(INSTALL_DATA) $(WRKSRC)/etc/* $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/tool.mk"
-CONFIGURE_ARGS+= --with-munge=$(BUILDLINK_PREFIX.munge:Q)
+CONFIGURE_ARGS+= --with-munge=${BUILDLINK_PREFIX.munge:Q}
.include "../../security/munge/buildlink3.mk" # optional
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff -r ae7b05bd6bd2 -r 84085102c3e5 parallel/threadingbuildingblocks/Makefile
--- a/parallel/threadingbuildingblocks/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/parallel/threadingbuildingblocks/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/10/20 17:58:05 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/12/17 13:43:13 rillig Exp $
DISTNAME= tbb30_20110325oss_src
PKGNAME= threadingbuildingblocks-3.0.6 # for "3.0 update 6"
@@ -10,7 +10,7 @@
HOMEPAGE= http://www.threadingbuildingblocks.org/
COMMENT= Threading Buildling Blocks
-WRKSRC= $(WRKDIR)/$(DISTNAME:_src=) #tbb30_20101215oss
+WRKSRC= ${WRKDIR}/${DISTNAME:_src=} #tbb30_20101215oss
USE_LANGUAGES= c c++
USE_TOOLS= gmake pax
@@ -19,16 +19,16 @@
TEST_TARGET= test
pre-configure:
- cd $(WRKSRC)/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
+ cd ${WRKSRC}/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
-INSTALLATION_DIRS= include lib share/doc/$(PKGBASE)
+INSTALLATION_DIRS= include lib share/doc/${PKGBASE}
do-install:
- $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbb.so $(DESTDIR)$(PREFIX)/lib/
- $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbbmalloc.so $(DESTDIR)$(PREFIX)/lib/
- $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbb_debug.so $(DESTDIR)$(PREFIX)/lib/
- $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbbmalloc_debug.so $(DESTDIR)$(PREFIX)/lib/
- (cd $(WRKSRC)/include && pax -rw tbb $(DESTDIR)$(PREFIX)/include/)
+ ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbb.so ${DESTDIR}${PREFIX}/lib/
+ ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbbmalloc.so ${DESTDIR}${PREFIX}/lib/
+ ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbb_debug.so ${DESTDIR}${PREFIX}/lib/
+ ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbbmalloc_debug.so ${DESTDIR}${PREFIX}/lib/
+ (cd ${WRKSRC}/include && pax -rw tbb ${DESTDIR}${PREFIX}/include/)
# documentation:
# (cd $(WRKSRC)/doc/html && pax -rw . $(DESTDIR)$(PREFIX)/share/doc/html/$(PKGBASE)/)
# $(INSTALL_DATA) $(WRKSRC)/doc/Release_Notes.txt $(DESTDIR)$(PREFIX)/share/doc/$(PKGBASE)/
diff -r ae7b05bd6bd2 -r 84085102c3e5 time/projectlibre/Makefile
--- a/time/projectlibre/Makefile Sat Dec 17 13:35:43 2016 +0000
+++ b/time/projectlibre/Makefile Sat Dec 17 13:38:02 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/07/21 23:33:11 asau Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/17 13:44:02 rillig Exp $
DISTNAME= projectlibre-1.6.1
CATEGORIES= time
-MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=projectlibre/)
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=projectlibre/}
MAINTAINER= asau%inbox.ru@localhost
HOMEPAGE= http://www.projectlibre.org/
@@ -18,20 +18,20 @@
SUBST_STAGE.set-java= post-configure
SUBST_MESSAGE.set-java= Setting Java path.
SUBST_FILES.set-java= projectlibre.sh
-SUBST_SED.set-java= -e '/^JAVA_EXE=/s,java,$(PKG_JAVA_HOME)/bin/java,'
+SUBST_SED.set-java= -e '/^JAVA_EXE=/s,java,${PKG_JAVA_HOME}/bin/java,'
SUBST_STAGE.set-base= post-configure
SUBST_MESSAGE.set-base= Setting package base path.
SUBST_FILES.set-base= projectlibre.sh
-SUBST_SED.set-base= -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=$(PREFIX)/share/$(PKGBASE),'
+SUBST_SED.set-base= -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=${PREFIX}/share/${PKGBASE},'
NO_BUILD= yes
-INSTALLATION_DIRS= bin share/$(PKGBASE)
+INSTALLATION_DIRS= bin share/${PKGBASE}
do-install:
- cd $(WRKSRC) && pax -rwpm . $(DESTDIR)$(PREFIX)/share/$(PKGBASE)
- $(LN) -sf $(PREFIX)/share/$(PKGBASE)/projectlibre.sh $(DESTDIR)$(PREFIX)/bin/projectlibre
+ cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/${PKGBASE}
+ ${LN} -sf ${PREFIX}/share/${PKGBASE}/projectlibre.sh ${DESTDIR}${PREFIX}/bin/projectlibre
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index