[pkgsrc/trunk]: pkgsrc Revert nonsensical changes.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Revert nonsensical changes.
From: asau <asau%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:26:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d68c165f474
branches:  trunk
changeset: 356157:2d68c165f474
user:      asau <asau%pkgsrc.org@localhost>
date:      Mon Dec 19 15:43:42 2016 +0000

description:
Revert nonsensical changes.

diffstat:

 lang/abcl/Makefile                        |  24 ++++++++++++------------
 lang/racket/Makefile                      |  22 +++++++++++-----------
 parallel/slurm/Makefile                   |  12 ++++++------
 parallel/threadingbuildingblocks/Makefile |  18 +++++++++---------
 4 files changed, 38 insertions(+), 38 deletions(-)

diffs (177 lines):

diff -r 6fe38b618096 -r 2d68c165f474 lang/abcl/Makefile
--- a/lang/abcl/Makefile        Mon Dec 19 15:37:50 2016 +0000
+++ b/lang/abcl/Makefile        Mon Dec 19 15:43:42 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/12/17 13:38:02 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/19 15:48:33 asau 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 6fe38b618096 -r 2d68c165f474 lang/racket/Makefile
--- a/lang/racket/Makefile      Mon Dec 19 15:37:50 2016 +0000
+++ b/lang/racket/Makefile      Mon Dec 19 15:43:42 2016 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2016/12/17 13:39:41 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2016/12/19 15:43:42 asau 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 6fe38b618096 -r 2d68c165f474 parallel/slurm/Makefile
--- a/parallel/slurm/Makefile   Mon Dec 19 15:37:50 2016 +0000
+++ b/parallel/slurm/Makefile   Mon Dec 19 15:43:42 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/12/17 13:41:57 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2016/12/19 15:47:09 asau 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 6fe38b618096 -r 2d68c165f474 parallel/threadingbuildingblocks/Makefile
--- a/parallel/threadingbuildingblocks/Makefile Mon Dec 19 15:37:50 2016 +0000
+++ b/parallel/threadingbuildingblocks/Makefile Mon Dec 19 15:43:42 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/12/17 13:43:13 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2016/12/19 15:44:44 asau 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)/
Prev by Date: [pkgsrc/trunk]: pkgsrc Revert nonsensical changes.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/php71 call _php_dns_free_res the same way the ori...
Previous by Thread: [pkgsrc/trunk]: pkgsrc Revert nonsensical changes.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/php71 call _php_dns_free_res the same way the ori...
Indexes:
Home | Main Index | Thread Index | Old Index