From owner-svn-ports-all@freebsd.org Wed Jan 4 06:39:25 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 054C8C96CC5; Wed, 4 Jan 2017 06:39:25 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DACD1D42; Wed, 4 Jan 2017 06:39:24 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v046dNKN033936; Wed, 4 Jan 2017 06:39:23 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v046dN8f033935; Wed, 4 Jan 2017 06:39:23 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201701040639.v046dN8f033935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 4 Jan 2017 06:39:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430541 - head/net/dgd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2017 06:39:25 -0000 Author: antoine Date: Wed Jan 4 06:39:23 2017 New Revision: 430541 URL: https://svnweb.freebsd.org/changeset/ports/430541 Log: Fix installation Reported by: pkg-fallout Modified: head/net/dgd/Makefile Modified: head/net/dgd/Makefile ============================================================================== --- head/net/dgd/Makefile Wed Jan 4 05:37:05 2017 (r430540) +++ head/net/dgd/Makefile Wed Jan 4 06:39:23 2017 (r430541) @@ -21,8 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= dworkin DIST_SUBDIR= dgd -WRKSRC_SUBDIR= src -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= install MAKE_JOBS_UNSAFE= yes MAKE_ENV+= EXTRA_DEFINES="${EXTRA_DEFINES}" @@ -52,10 +51,10 @@ post-patch: @cd ${PATCH_WRKSRC} && ${FIND} . -name '*.orig' -delete do-install: - ${INSTALL_PROGRAM} ${BASE_WRKSRC}/bin/driver ${STAGEDIR}${PREFIX}/sbin/dgd - ${INSTALL_PROGRAM} ${BASE_WRKSRC}/bin/precomp ${STAGEDIR}${PREFIX}/bin/precomp + ${INSTALL_PROGRAM} ${WRKSRC}/bin/driver ${STAGEDIR}${PREFIX}/sbin/dgd + ${INSTALL_PROGRAM} ${WRKSRC}/bin/precomp ${STAGEDIR}${PREFIX}/bin/precomp ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} - ${INSTALL_DATA} ${BASE_WRKSRC}/mud.dgd \ + ${INSTALL_DATA} ${WRKSRC}/mud.dgd \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/mud.dgd.sample @# Install an RC script for DGD ${CAT} ${FILESDIR}/dgd.sh | ${SED} -e "s:%%PREFIX%%:${PREFIX}:" \ @@ -63,8 +62,8 @@ do-install: ${STAGEDIR}${PREFIX}/etc/rc.d/dgd.sh.sample ${CHMOD} a+x ${STAGEDIR}${PREFIX}/etc/rc.d/dgd.sh.sample ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${BASE_WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${BASE_WRKSRC}/README ${STAGEDIR}${DOCSDIR} - cd ${BASE_WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include