From a4d0fa353ad57f5d677d3ff1e871ad7a16157ba5 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 22 May 2011 14:03:39 +0000 Subject: [PATCH] using PKGNAME to construct WRKDIST is bad practice. --- databases/architect/Makefile | 4 ++-- net/sipsak/Makefile | 4 ++-- security/chntpw/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/databases/architect/Makefile b/databases/architect/Makefile index 5acd31cc29c..34d4d1b8bca 100644 --- a/databases/architect/Makefile +++ b/databases/architect/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2011/05/10 23:44:54 ian Exp $ +# $OpenBSD: Makefile,v 1.13 2011/05/22 14:03:39 jasper Exp $ PKG_ARCH= * @@ -9,7 +9,7 @@ DISTNAME= SQL-Power-Architect-generic-jdbc-${V} MASTER_SITES= http://power-architect.googlecode.com/files/ PKGNAME= architect-${V} CATEGORIES= databases -WRKDIST= ${WRKDIR}/${PKGNAME} +WRKDIST= ${WRKDIR}/architect-${V}/ HOMEPAGE= http://www.sqlpower.ca/page/architect diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index 0a99299c612..f344f659ee0 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/11/19 22:31:38 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2011/05/22 14:03:40 jasper Exp $ COMMENT = SIP swiss army knife @@ -6,7 +6,7 @@ DISTNAME = sipsak-0.9.6-1 CATEGORIES = net PKGNAME = ${DISTNAME:S/-1//} -WRKDIST = ${WRKDIR}/${PKGNAME} +WRKDIST = ${WRKDIR}/${DISTNAME:S/-1//}/ HOMEPAGE = http://sipsak.org/ diff --git a/security/chntpw/Makefile b/security/chntpw/Makefile index 91ce46b7256..d6afccc3388 100644 --- a/security/chntpw/Makefile +++ b/security/chntpw/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/06 17:47:11 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2011/05/22 14:03:40 jasper Exp $ ONLY_FOR_ARCHS = i386 amd64 @@ -30,7 +30,7 @@ USE_GMAKE = Yes NO_REGRESS = Yes -WRKDIST = ${WRKDIR}/${PKGNAME} +WRKDIST = ${WRKDIR}/chntpw-${V}/ PROGS = chntpw chntpw.static cpnt reged reged.static DOCDIR = $(PREFIX)/share/doc/chntpw