From a4f8fcbce4c21f8c3d5c6026e583e093bb7a1eab Mon Sep 17 00:00:00 2001
From: asau <asau>
Date: Mon, 19 Dec 2016 15:57:11 +0000
Subject: Revert nonsensical changes.

---
 databases/squirrelsql/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'databases/squirrelsql')

diff --git a/databases/squirrelsql/Makefile b/databases/squirrelsql/Makefile
index 091fd6c4ec3..d6e05e830af 100644
--- a/databases/squirrelsql/Makefile
+++ b/databases/squirrelsql/Makefile
@@ -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
@@ -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"
-- 
cgit v1.2.3