Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Aug 2012 10:22:57 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302462 - head/net-mgmt/ng_ipacct
Message-ID:  <201208131022.q7DAMvAQ025020@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208131022.q7DAMvAQ025020>