Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Aug 2012 19:19:03 +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: r302255 - head/net/rinetd
Message-ID:  <201208071919.q77JJ3Jf095953@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Tue Aug  7 19:19:02 2012
New Revision: 302255
URL: http://svn.freebsd.org/changeset/ports/302255

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.
  
  This is the same method as suggested in the PR (and that I've used
  previously), just slightly different in the details.
  
  PR:		ports/170441
  Submitted by:	Frank Wall <fw@moov.de>
  Approved by:	maintainer

Modified:
  head/net/rinetd/Makefile

Modified: head/net/rinetd/Makefile
==============================================================================
--- head/net/rinetd/Makefile	Tue Aug  7 18:37:01 2012	(r302254)
+++ head/net/rinetd/Makefile	Tue Aug  7 19:19:02 2012	(r302255)
@@ -19,7 +19,7 @@ COMMENT=	A simple TCP port redirector
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/rinetd/
+WRKSRC=		${WRKDIR}/rinetd-${PORTVERSION}
 
 MAKE_JOBS_SAFE=	yes
 USE_DOS2UNIX=	yes
@@ -32,6 +32,9 @@ USE_RC_SUBR=	rinetd
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	@${MV} ${WRKDIR}/rinetd ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -E "s,(/etc/rinetd.conf),${PREFIX}\1," \
 		${WRKSRC}/rinetd.[8c]



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