From owner-svn-ports-head@FreeBSD.ORG Mon Aug 20 07:50:26 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 78E921065670; Mon, 20 Aug 2012 07:50:26 +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 5644C8FC14; Mon, 20 Aug 2012 07:50:26 +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 q7K7oQGQ003469; Mon, 20 Aug 2012 07:50:26 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7K7oQdr003467; Mon, 20 Aug 2012 07:50:26 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201208200750.q7K7oQdr003467@svn.freebsd.org> From: Doug Barton Date: Mon, 20 Aug 2012 07:50:26 +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: r302788 - head/sysutils/symon 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2012 07:50:26 -0000 Author: dougb Date: Mon Aug 20 07:50:25 2012 New Revision: 302788 URL: http://svn.freebsd.org/changeset/ports/302788 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. Modified: head/sysutils/symon/Makefile Modified: head/sysutils/symon/Makefile ============================================================================== --- head/sysutils/symon/Makefile Mon Aug 20 07:26:12 2012 (r302787) +++ head/sysutils/symon/Makefile Mon Aug 20 07:50:25 2012 (r302788) @@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= uqs MAINTAINER= uqs@FreeBSD.org COMMENT= Performance and information monitoring tool -WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message USE_PERL5_BUILD= yes @@ -57,6 +56,9 @@ MAKE_ARGS+= SUBDIR="${SUBDIR}" RRDDIR="$ .include +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + .if ${OSVERSION} < 700000 post-patch: @${REINPLACE_CMD} 's/^LIBS+=/LIBS= -pthread /' ${WRKSRC}/symux/Makefile