Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jan 2017 06:39:23 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430541 - head/net/dgd
Message-ID:  <201701040639.v046dN8f033935@repo.freebsd.org>

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



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