CVS commit: pkgsrc/lang/abcl

["Aleksej Saushev" <asau%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   asau
Date:           Mon Dec 19 15:48:33 UTC 2016

Modified Files:
        pkgsrc/lang/abcl: Makefile

Log Message:
Revert nonsensical changes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/abcl/Makefile

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

Modified files:

Index: pkgsrc/lang/abcl/Makefile
diff -u pkgsrc/lang/abcl/Makefile:1.9 pkgsrc/lang/abcl/Makefile:1.10
--- pkgsrc/lang/abcl/Makefile:1.9       Sat Dec 17 13:38:02 2016
+++ pkgsrc/lang/abcl/Makefile   Mon Dec 19 15:48:33 2016
@@ -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 @@ BUILD_DEPENDS=      apache-ant>=1.7.1:../../d
 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"