diff options
| -rw-r--r-- | databases/squirrelsql/Makefile | 18 | ||||
| -rw-r--r-- | time/projectlibre/Makefile | 14 |
2 files changed, 16 insertions, 16 deletions
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" diff --git a/time/projectlibre/Makefile b/time/projectlibre/Makefile index 686a29dfe00..303c5b7a19e 100644 --- a/time/projectlibre/Makefile +++ b/time/projectlibre/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2016/12/17 13:44:02 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2016/12/19 16:01:19 asau Exp $ DISTNAME= projectlibre-1.6.1 CATEGORIES= time -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=projectlibre/} +MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=projectlibre/) MAINTAINER= asau@inbox.ru HOMEPAGE= http://www.projectlibre.org/ @@ -18,20 +18,20 @@ SUBST_CLASSES+= set-java set-base SUBST_STAGE.set-java= post-configure SUBST_MESSAGE.set-java= Setting Java path. SUBST_FILES.set-java= projectlibre.sh -SUBST_SED.set-java= -e '/^JAVA_EXE=/s,java,${PKG_JAVA_HOME}/bin/java,' +SUBST_SED.set-java= -e '/^JAVA_EXE=/s,java,$(PKG_JAVA_HOME)/bin/java,' SUBST_STAGE.set-base= post-configure SUBST_MESSAGE.set-base= Setting package base path. SUBST_FILES.set-base= projectlibre.sh -SUBST_SED.set-base= -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=${PREFIX}/share/${PKGBASE},' +SUBST_SED.set-base= -e '/^OPENPROJ_HOME0=/s,^.*$$,OPENPROJ_HOME0=$(PREFIX)/share/$(PKGBASE),' NO_BUILD= yes -INSTALLATION_DIRS= bin share/${PKGBASE} +INSTALLATION_DIRS= bin share/$(PKGBASE) do-install: - cd ${WRKSRC} && pax -rwpm . ${DESTDIR}${PREFIX}/share/${PKGBASE} - ${LN} -sf ${PREFIX}/share/${PKGBASE}/projectlibre.sh ${DESTDIR}${PREFIX}/bin/projectlibre + cd $(WRKSRC) && pax -rwpm . $(DESTDIR)$(PREFIX)/share/$(PKGBASE) + $(LN) -sf $(PREFIX)/share/$(PKGBASE)/projectlibre.sh $(DESTDIR)$(PREFIX)/bin/projectlibre .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" |