Date: Wed, 15 Aug 2012 00:37:55 +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: r302549 - in head: dns/inadyn games/cave9 net-mgmt/ng_ipacct net/rinetd Message-ID: <201208150037.q7F0btfP074704@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Wed Aug 15 00:37:55 2012 New Revision: 302549 URL: http://svn.freebsd.org/changeset/ports/302549 Log: danfe was kind enough to remind me that: WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} is already the default, so for those ports where we are doing: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} to avoid the problem of conflicts with the rc.d script of the same name it is not necessary to define WRKSRC separately. Clean up this mistake of mine, and standardize for the others. Modified: head/dns/inadyn/Makefile head/games/cave9/Makefile head/net-mgmt/ng_ipacct/Makefile head/net/rinetd/Makefile Modified: head/dns/inadyn/Makefile ============================================================================== --- head/dns/inadyn/Makefile Wed Aug 15 00:20:31 2012 (r302548) +++ head/dns/inadyn/Makefile Wed Aug 15 00:37:55 2012 (r302549) @@ -17,7 +17,6 @@ DISTNAME= ${PORTNAME}.v${PORTVERSION} MAINTAINER= samm@os2.kiev.ua COMMENT= INADYN - Simple DYNAMIC DNS client -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_RC_SUBR= inadyn USE_ZIP= yes USE_DOS2UNIX= yes @@ -33,7 +32,7 @@ PORTDOCS= readme.html PLIST_FILES= bin/inadyn post-extract: - @${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION} + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-patch: @${REINPLACE_CMD} -e 's|gcc|$$\(CC\)|g' ${WRKSRC}/makefile Modified: head/games/cave9/Makefile ============================================================================== --- head/games/cave9/Makefile Wed Aug 15 00:20:31 2012 (r302548) +++ head/games/cave9/Makefile Wed Aug 15 00:37:55 2012 (r302549) @@ -22,7 +22,6 @@ DATAVER= 4 USE_GMAKE= yes USE_SDL= sdl ttf image -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src MAKEFILE= GNUmakefile @@ -31,7 +30,7 @@ CFLAGS+= -DDATADIR=\\\"${DATADIR}\\\" PORTDOCS= * post-extract: - @${MV} ${WRKDIR}/data ${WRKSRC}/ + @${MV} ${WRKDIR}/data ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cave9 ${PREFIX}/bin Modified: head/net-mgmt/ng_ipacct/Makefile ============================================================================== --- head/net-mgmt/ng_ipacct/Makefile Wed Aug 15 00:20:31 2012 (r302548) +++ head/net-mgmt/ng_ipacct/Makefile Wed Aug 15 00:37:55 2012 (r302549) @@ -25,7 +25,6 @@ OPTIONS= MEM_ZONE "Use UMA zone allocato KMODDIR= /boot/modules PLIST_SUB+= KMODDIR=${KMODDIR:S!^/!!} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_ENV= BINDIR="${PREFIX}/sbin" KMODDIR=${KMODDIR} MAN8= ipacctctl.8 Modified: head/net/rinetd/Makefile ============================================================================== --- head/net/rinetd/Makefile Wed Aug 15 00:20:31 2012 (r302548) +++ head/net/rinetd/Makefile Wed Aug 15 00:37:55 2012 (r302549) @@ -19,8 +19,6 @@ COMMENT= A simple TCP port redirector OPTIONS_DEFINE= DOCS -WRKSRC= ${WRKDIR}/rinetd-${PORTVERSION} - MAKE_JOBS_SAFE= yes USE_DOS2UNIX= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208150037.q7F0btfP074704>