CVS commit: pkgsrc/lang/squeak

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

Module Name:    pkgsrc
Committed By:   asau
Date:           Mon Dec 19 15:37:50 UTC 2016

Modified Files:
        pkgsrc/lang/squeak: Makefile

Log Message:
Revert purely cosmetic changes.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/squeak/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/squeak/Makefile
diff -u pkgsrc/lang/squeak/Makefile:1.50 pkgsrc/lang/squeak/Makefile:1.51
--- pkgsrc/lang/squeak/Makefile:1.50    Sat Dec 17 13:40:33 2016
+++ pkgsrc/lang/squeak/Makefile Mon Dec 19 15:37:50 2016
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.50 2016/12/17 13:40:33 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2016/12/19 15:37:50 asau 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 @@ DEPENDS=    squeak-vm-[0-9]*:../../lang/squ
 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"