Big cleanup

directly specify the pkg-message used instead of trying to manually generate it
avoid using @cwd
Do not touch base and push everything in PREFIX
This port needs way more love

4 files changed, 26 insertions, 29 deletions

diff --git a/emulators/hyperv-is/Makefile b/emulators/hyperv-is/Makefile
index db668ce71d4c..632182156998 100644
--- a/emulators/hyperv-is/Makefile
+++ b/emulators/hyperv-is/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hyperv-is
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	emulators kld
 MASTER_SITES=	https://github.com/${MSLINK}/
 DISTNAME=	${DNAME}
@@ -15,7 +16,8 @@ USES+=		uidfix
 BIS=		${PORTVERSION}
 MSBASE=		FreeBSDonHyper-V/Hyperv-Ports/raw/hyperv-is-master
 MSLINK=		${MSBASE}/BIS-${BIS}/FreeBSD-${OSREL}/ports
-SUB_FILES=	${PMSG}
+MAKE_ARGS=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
+PKGMESSAGE=	${FILESDIR}/${PMSG}
 
 .include <bsd.port.pre.mk>
 
@@ -45,17 +47,18 @@ DNAME=		${FILE_${OSREL:S/.//}}
 IGNORE=		OSREL ${OSREL} not supported
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e "s,/usr/sbin/,${PREFIX}/sbin/,g" \
+		${WRKSRC}/etc/rc.d/hv_kvpd
+
 pre-install:
 	@${MKDIR} ${STAGEDIR}/boot/kernel \
 		${STAGEDIR}/etc/rc.d \
-		${STAGEDIR}/usr/share/man/man1 \
-		${STAGEDIR}/usr/share/man/man4 \
-		${STAGEDIR}/usr/share/man/man8 \
-		${STAGEDIR}/usr/local/hyperv/scripts \
-		${STAGEDIR}/usr/sbin
-	${MV} ${WRKDIR}/${PMSG} ${WRKDIR}/pkg-message
+		${STAGEDIR}/usr/local/hyperv/scripts
 
 post-install:
 	${RM} ${STAGEDIR}/boot/kernel/linker.hints
+	${MV} ${STAGEDIR}/etc/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d
+
 
 .include <bsd.port.post.mk>
diff --git a/emulators/hyperv-is/files/pkg-message.A.in b/emulators/hyperv-is/files/pkg-message.A
index c77e88631902..c77e88631902 100644
--- a/emulators/hyperv-is/files/pkg-message.A.in
+++ b/emulators/hyperv-is/files/pkg-message.A
diff --git a/emulators/hyperv-is/files/pkg-message.B.in b/emulators/hyperv-is/files/pkg-message.B
index 7b58d9abc782..7b58d9abc782 100644
--- a/emulators/hyperv-is/files/pkg-message.B.in
+++ b/emulators/hyperv-is/files/pkg-message.B
diff --git a/emulators/hyperv-is/pkg-plist b/emulators/hyperv-is/pkg-plist
index f1bd1120943d..8f2620c416a7 100644
--- a/emulators/hyperv-is/pkg-plist
+++ b/emulators/hyperv-is/pkg-plist
@@ -1,25 +1,19 @@
 hyperv/scripts/hv_get_dhcp_info
 hyperv/scripts/hv_get_dns_info
 hyperv/scripts/hv_set_ifconfig
-@cwd /boot/kernel
-%%A%%hv_ata_pci_disengage.ko
-%%A%%hv_netvsc.ko
-%%A%%hv_storvsc.ko
-%%A%%hv_utils.ko
-%%A%%hv_vmbus.ko
-%%B%%hv_kvp.ko
-@cwd /etc/rc.d
-hv_kvpd
-%%A%%@cwd /usr/share/man/man1
-%%A%%hyperv-is.1.gz
-%%B%%@cwd /usr/sbin
-%%B%%hv_kvp_daemon
-@cwd /usr/share/man/man4
-%%A%%hv_ata_pci_disengage.4.gz
-hv_kvp.4.gz
-%%A%%hv_netvsc.4.gz
-%%A%%hv_storvsc.4.gz
-%%A%%hv_utils.4.gz
-%%A%%hv_vmbus.4.gz
-%%B%%@cwd /usr/share/man/man8
-%%B%%hv_kvp_daemon.8.gz
+%%A%%/boot/kernel/hv_ata_pci_disengage.ko
+%%A%%/boot/kernel/hv_netvsc.ko
+%%A%%/boot/kernel/hv_storvsc.ko
+%%A%%/boot/kernel/hv_utils.ko
+%%A%%/boot/kernel/hv_vmbus.ko
+%%B%%/boot/kernel/hv_kvp.ko
+etc/rc.d/hv_kvpd
+%%A%%man/man1/hyperv-is.1.gz
+%%B%%sbin/hv_kvp_daemon
+%%A%%man/man4/hv_ata_pci_disengage.4.gz
+man/man4/hv_kvp.4.gz
+%%A%%man/man4/hv_netvsc.4.gz
+%%A%%man/man4/hv_storvsc.4.gz
+%%A%%man/man4/hv_utils.4.gz
+%%A%%man/man4/hv_vmbus.4.gz
+%%B%%man/man8/hv_kvp_daemon.8.gz