From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 13 10:22:57 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D87D31065672;
	Mon, 13 Aug 2012 10:22:57 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C358A8FC0A;
	Mon, 13 Aug 2012 10:22:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DAMvTG025022;
	Mon, 13 Aug 2012 10:22:57 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7DAMvAQ025020;
	Mon, 13 Aug 2012 10:22:57 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201208131022.q7DAMvAQ025020@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 13 Aug 2012 10:22:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302462 - head/net-mgmt/ng_ipacct
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Aug 2012 10:22:57 -0000

Author: dougb
Date: Mon Aug 13 10:22:57 2012
New Revision: 302462
URL: http://svn.freebsd.org/changeset/ports/302462

Log:
  Fix problem introduced in r302141. The directory for the  unpacked source
  files is unversioned, so it conflicts with the name of the rc.d script in
  WRKDIR after SUB_FILES is applied.
  
  PR:		ports/170592
  Submitted by:	Eugene Grosbein <eugen@eg.sd.rdtc.ru>

Modified:
  head/net-mgmt/ng_ipacct/Makefile

Modified: head/net-mgmt/ng_ipacct/Makefile
==============================================================================
--- head/net-mgmt/ng_ipacct/Makefile	Mon Aug 13 08:38:27 2012	(r302461)
+++ head/net-mgmt/ng_ipacct/Makefile	Mon Aug 13 10:22:57 2012	(r302462)
@@ -25,7 +25,7 @@ OPTIONS=	MEM_ZONE "Use UMA zone allocato
 KMODDIR=	/boot/modules
 PLIST_SUB+=	KMODDIR=${KMODDIR:S!^/!!}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" KMODDIR=${KMODDIR}
 
 MAN8=		ipacctctl.8
@@ -41,6 +41,9 @@ SUB_FILES=	pkg-message
 CFLAGS+=	-DMEM_USE_ZONE
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-install:
 	@${MKDIR} ${PREFIX}/include/netgraph
 	${INSTALL_DATA} ${WRKSRC}/ng_ipacct/ng_ipacct.h ${PREFIX}/include/netgraph