CVS commit: pkgsrc/databases/squirrelsql

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

Module Name:    pkgsrc
Committed By:   asau
Date:           Mon Dec 19 15:57:11 UTC 2016

Modified Files:
        pkgsrc/databases/squirrelsql: Makefile

Log Message:
Revert nonsensical changes.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/squirrelsql/Makefile

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

Modified files:

Index: pkgsrc/databases/squirrelsql/Makefile
diff -u pkgsrc/databases/squirrelsql/Makefile:1.4 pkgsrc/databases/squirrelsql/Makefile:1.5
--- pkgsrc/databases/squirrelsql/Makefile:1.4   Sat Dec 17 13:29:39 2016
+++ pkgsrc/databases/squirrelsql/Makefile       Mon Dec 19 15:57:11 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2016/12/17 13:29:39 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2016/12/19 15:57:11 asau 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@localhost
@@ -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"