From owner-svn-ports-head@freebsd.org  Tue Sep 26 14:14:50 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76C6DE0CBBB;
 Tue, 26 Sep 2017 14:14:50 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F41A67489;
 Tue, 26 Sep 2017 14:14:50 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8QEEnBB079631;
 Tue, 26 Sep 2017 14:14:49 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8QEEnHN079629;
 Tue, 26 Sep 2017 14:14:49 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201709261414.v8QEEnHN079629@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 26 Sep 2017 14:14:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450664 - in head: net/py-miniupnpc www/geronimo
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: in head: net/py-miniupnpc www/geronimo
X-SVN-Commit-Revision: 450664
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Sep 2017 14:14:50 -0000

Author: mat
Date: Tue Sep 26 14:14:49 2017
New Revision: 450664
URL: https://svnweb.freebsd.org/changeset/ports/450664

Log:
  Fix ports setting WRKDIR themselves to use the new _WRKDIR instead of
  the litteral "work".
  
  I think it should be really safe to remove both instances because they
  they point to directories that are empty anyway.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/net/py-miniupnpc/Makefile   (contents, props changed)
  head/www/geronimo/Makefile   (contents, props changed)

Modified: head/net/py-miniupnpc/Makefile
==============================================================================
--- head/net/py-miniupnpc/Makefile	Tue Sep 26 14:14:44 2017	(r450663)
+++ head/net/py-miniupnpc/Makefile	Tue Sep 26 14:14:49 2017	(r450664)
@@ -12,7 +12,7 @@ MASTERDIR=	${.CURDIR}/../miniupnpc
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-WRKDIR=		${WRKDIRPREFIX}${MASTERDIR}/work
+WRKDIR=		${WRKDIRPREFIX}${MASTERDIR}/${_WRKDIR}
 PLIST=		${.CURDIR}/pkg-plist
 
 post-patch:

Modified: head/www/geronimo/Makefile
==============================================================================
--- head/www/geronimo/Makefile	Tue Sep 26 14:14:44 2017	(r450663)
+++ head/www/geronimo/Makefile	Tue Sep 26 14:14:49 2017	(r450664)
@@ -47,7 +47,7 @@ GERONIMO_USER?=	www
 GERONIMO_GROUP?=www
 GERONIMO_OUT=	${LOG_DIR}/geronimo.out
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
+WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-bin//}
 JAR_FILE=	bin/server.jar
 PLIST_FILES=	"@(${GERONIMO_USER},${GERONIMO_GROUP},) ${GERONIMO_OUT:S,^${PREFIX}/,,}"