Date: Wed, 31 May 2006 09:21:49 +0900 (JST) From: Makoto Matsushita <matusita@jp.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98157: Request for Repocopy: ports/emulators/vmware-guestd[45]/files/vmware-guestd.sh.in Message-ID: <200605310021.k4V0LnCV030783@syvalion.matatabi.or.jp> Resent-Message-ID: <200605301530.k4UFUEGi055619@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98157
>Category: ports
>Synopsis: Request for Repocopy: ports/emulators/vmware-guestd[45]/files/vmware-guestd.sh.in
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 30 15:30:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Makoto Matsushita
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
FreeBSD.org
>Environment:
System: FreeBSD galtvalion.matatabi.or.jp 7.0-CURRENT FreeBSD 7.0-CURRENT #15: Mon May 29 15:52:39 JST 2006 root@galtvalion.matatabi.or.jp:/pub/FreeBSD/obj/pub/FreeBSD/src/sys/GALTVALION i386
>Description:
Since RCng-ify ${PREFIX}/etc/rc.d startup files are established,
I'd like to change my two ports, emulators/vmware-guestd[45],
to use 'USE_RC_SUBR=vmware-guestd.sh' in their Makefiles.
However, "simply rm vmware-guestd.sh and add vmware-guestd.sh.in"
kills the revision history of vmware-guestd.sh. To avoid to kill
history, commit-after-repocopy is the best known practice.
>How-To-Repeat:
% cd /usr/ports/emulators/vmware-guestd5
% make install
% ls /usr/local/etc/rc.d
(and you'll find vmware-guestd.sh instead of vmware-guestd)
>Fix:
repocopy ports/emulators/vmware-guestd4/files/vmware-guestd.sh \
ports/emulators/vmware-guestd4/files/vmware-guestd.sh.in
repocopy ports/emulators/vmware-guestd5/files/vmware-guestd.sh \
ports/emulators/vmware-guestd5/files/vmware-guestd.sh.in
Then apply following patch:
Index: vmware-guestd4/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/vmware-guestd4/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- vmware-guestd4/Makefile 7 May 2006 10:55:46 -0000 1.23
+++ vmware-guestd4/Makefile 30 May 2006 15:08:33 -0000
@@ -25,9 +25,7 @@
WRKSRC= ${WRKDIR}/vmware-tools-distrib
ONLY_FOR_ARCHS= i386
-USE_RC_SUBR= yes
-RC_SCRIPT= ${PREFIX}/etc/rc.d/vmware-guestd.sh
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR= vmware-guestd.sh
.if !defined(BATCH)
IS_INTERACTIVE= yes
.endif
@@ -149,15 +147,16 @@
.endif
do-install:
+ @if [ -f ${PREFIX}/etc/rc.d/${USE_RC_SUBR} ]; then \
+ ${ECHO_CMD} "Remove old ${PREFIX}/etc/rc.d/${USE_RC_SUBR} before install."; \
+ exit 1; \
+ fi
${INSTALL_PROGRAM} ${WRKSRC}/sbin/vmware-guestd ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/sbin/vmware-checkvm ${PREFIX}/sbin
.if defined(WITH_VMWARE_VMMEMCTL)
${MKDIR} ${VMWARE_KMODDIR}
${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
.endif
- @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
- @${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
.endif
${MKDIR} ${PREFIX}/share/vmware-tools
Index: vmware-guestd4/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/vmware-guestd4/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- vmware-guestd4/pkg-plist 22 Jan 2006 05:52:16 -0000 1.5
+++ vmware-guestd4/pkg-plist 30 May 2006 15:08:33 -0000
@@ -1,6 +1,5 @@
sbin/vmware-checkvm
sbin/vmware-guestd
-etc/rc.d/vmware-guestd.sh
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMMEMCTL:%%@dirrmtry lib/vmware-tools/modules
%%VMWARE_VMMEMCTL:%%@dirrmtry lib/vmware-tools
Index: vmware-guestd5/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/vmware-guestd5/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- vmware-guestd5/Makefile 7 May 2006 10:55:46 -0000 1.31
+++ vmware-guestd5/Makefile 30 May 2006 15:08:33 -0000
@@ -25,9 +25,7 @@
WRKSRC= ${WRKDIR}/vmware-tools-distrib
ONLY_FOR_ARCHS= i386 amd64
-USE_RC_SUBR= yes
-RC_SCRIPT= ${PREFIX}/etc/rc.d/vmware-guestd.sh
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR= vmware-guestd.sh
.if !defined(BATCH)
IS_INTERACTIVE= yes
.endif
@@ -226,6 +224,10 @@
.endif
do-install:
+ @if [ -f ${PREFIX}/etc/rc.d/${USE_RC_SUBR} ]; then \
+ ${ECHO_CMD} "Remove old ${PREFIX}/etc/rc.d/${USE_RC_SUBR} before install."; \
+ exit 1; \
+ fi
${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-guestd ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-checkvm ${PREFIX}/sbin
.if defined(WITH_VMWARE_VMMEMCTL)
@@ -236,9 +238,6 @@
${MKDIR} ${VMWARE_KMODDIR}
${INSTALL_PROGRAM} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
.endif
- @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/vmware-guestd.sh > ${WRKDIR}/vmware-guestd.sh
- @${INSTALL_SCRIPT} ${WRKDIR}/vmware-guestd.sh ${RC_SCRIPT}
-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
${MKDIR} ${PREFIX}/share/vmware-tools
${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default
Index: vmware-guestd5/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/vmware-guestd5/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- vmware-guestd5/pkg-plist 11 Feb 2006 17:23:18 -0000 1.9
+++ vmware-guestd5/pkg-plist 30 May 2006 15:08:33 -0000
@@ -1,5 +1,4 @@
@unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
-etc/rc.d/vmware-guestd.sh
sbin/vmware-checkvm
sbin/vmware-guestd
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605310021.k4V0LnCV030783>