From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 13 10:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5710106567C for ; Sat, 13 Sep 2008 10:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7FD3A8FC17 for ; Sat, 13 Sep 2008 10:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8DAU1di012336 for ; Sat, 13 Sep 2008 10:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8DAU1wd012333; Sat, 13 Sep 2008 10:30:01 GMT (envelope-from gnats) Resent-Date: Sat, 13 Sep 2008 10:30:01 GMT Resent-Message-Id: <200809131030.m8DAU1wd012333@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Angelo Turetta Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C80351065674 for ; Sat, 13 Sep 2008 10:22:15 +0000 (UTC) (envelope-from aturetta@bestunion.it) Received: from cp-out9.libero.it (cp-out9.libero.it [212.52.84.109]) by mx1.freebsd.org (Postfix) with ESMTP id 3E8238FC14 for ; Sat, 13 Sep 2008 10:22:15 +0000 (UTC) (envelope-from aturetta@bestunion.it) Received: from [192.168.44.64] (151.51.14.122) by cp-out9.libero.it (8.5.014) id 48AD9E6103C7ACAD for FreeBSD-gnats-submit@freebsd.org; Sat, 13 Sep 2008 12:10:46 +0200 Message-Id: <48CB91A1.6060807@bestunion.it> Date: Sat, 13 Sep 2008 12:10:41 +0200 From: Angelo Turetta To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/127346: emulators/open-vm-tools UNBREAK pkg-plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Angelo Turetta List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2008 10:30:01 -0000 >Number: 127346 >Category: ports >Synopsis: emulators/open-vm-tools UNBREAK pkg-plist >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Sep 13 10:30:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Angelo Turetta >Release: FreeBSD 6.3-STABLE i386 >Organization: Best Union COmpany S.p.A. http://www.bestunion.it/ >Environment: System: FreeBSD mail.bestunion.it 6.3-STABLE FreeBSD 6.3-STABLE #0: Tue Jul 15 22:07:25 CEST 2008 aturetta@proxy.lan.bestunion.it:/usr/obj/usr/src/sys/SMP i386 >Description: - fix packing list (thus unbreaking the port) - pet portlint(1) - add info on the rc.conf settings - don't reinstall files twice - on 5.x, the scripts won't try to load unsupported kmods - kldxref should be run also on 5.x - bump PORTREVISION >How-To-Repeat: >Fix: --- unbreak-open-vm-tools.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/open-vm-tools/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- Makefile 20 Aug 2008 08:12:12 -0000 1.12 +++ Makefile 12 Sep 2008 17:53:37 -0000 @@ -7,16 +7,14 @@ PORTNAME= open-vm-tools PORTVERSION= ${BUILD_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators -DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} MASTER_SITES= SF +DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} MAINTAINER= mbr@freebsd.org COMMENT?= Open VMware tools for FreeBSD VMware guests -BROKEN= leaves files behind on deinstall - RELEASE_DATE= 2008.07.01 BUILD_VER= 102166 @@ -25,6 +23,7 @@ CONFIGURE_ARGS+= --without-procps .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x +PLIST_SUB+= X11="@comment " .else CONFIGURE_ARGS+= --with-x CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ @@ -32,10 +31,10 @@ USE_XORG= x11 ice xineramaproto xinerama xrandr xtst USE_GNOME= gtk20 PLIST_SUB+= X11="" -PLIST= ${PKGDIR}/pkg-plist-x11 .endif -CONFLICTS= vmware-guestd* vmware-tools* +CONFLICTS= vmware-guestd[0-9]* vmware-tools[0-9]* +SUB_FILES= pkg-message .if defined(WITHOUT_DNET) CONFIGURE_ARGS+= --without-dnet @@ -55,35 +54,30 @@ .if ${OSVERSION} < 600000 PLIST_SUB+= FIVEONLY="@comment " +SUB_LIST+= NOTON5="@comment " .else PLIST_SUB+= FIVEONLY="" +SUB_LIST+= NOTON5="" .endif post-patch: .if defined(WITHOUT_X11) - cd ${WRKSRC} && patch < ${FILESDIR}/optpatch-nox11 + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/optpatch-nox11 .endif post-build: cd ${WRKSRC}/modules && make post-install: - ${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/drivers - ${MKDIR} -p ${PREFIX}/lib/vmware-tools/modules/input - ${MKDIR} -p ${PREFIX}/share/vmware-tools -.if ${OSREL} >= 6 - ${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs -.endif + ${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers + ${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko .if ${OSREL} >= 6 ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko - @-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null -.endif -.if !defined(WITHOUT_X11) - ${INSTALL} ${WRKSRC}/toolbox/vmware-toolbox ${LOCALBASE}/sbin/vmware-toolbox - ${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${LOCALBASE}/sbin/vmware-user .endif + @-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null + @${CAT} ${PKGMESSAGE} .include Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/emulators/open-vm-tools/pkg-plist,v retrieving revision 1.9 diff -u -r1.9 pkg-plist --- pkg-plist 4 Aug 2008 18:51:14 -0000 1.9 +++ pkg-plist 12 Sep 2008 17:01:30 -0000 @@ -7,6 +7,11 @@ %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko @exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true +%%X11%%bin/vmware-toolbox +%%X11%%bin/vmware-user +%%X11%%share/applications/vmware-user.desktop +%%X11%%share/applications/vmware-toolbox.desktop +%%X11%%share/pixmaps/vmware/vmware-toolbox.xpm share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default @@ -27,3 +32,5 @@ @dirrmtry etc/vmware-tools @dirrmtry share/vmware-tools @dirrmtry share/applications +@dirrmtry share/pixmaps/vmware +@dirrmtry share/pixmaps Index: pkg-plist-x11 =================================================================== RCS file: pkg-plist-x11 diff -N pkg-plist-x11 --- pkg-plist-x11 4 Aug 2008 18:51:14 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -lib/libguestlib.a -lib/libguestlib.la -lib/libguestlib.so -lib/libguestlib.so.0 -lib/vmware-tools/modules/drivers/vmmemctl.ko -lib/vmware-tools/modules/drivers/vmxnet.ko -%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko -%%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko -@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true -share/vmware-tools/poweroff-vm-default -share/vmware-tools/poweron-vm-default -share/vmware-tools/resume-vm-default -share/vmware-tools/suspend-vm-default -share/vmware-tools/vm-support -share/pixmaps/vmware/vmware-toolbox.xpm -bin/vmware-toolbox -bin/vmware-user -bin/vmware-checkvm -bin/vmware-xferlogs -bin/vmware-hgfsclient -sbin/vmware-guestd -etc/vmware-tools/tools.conf -%%FIVEONLY%%sbin/mount_vmhgfs -%%X11%%sbin/vmware-toolbox -%%X11%%sbin/vmware-user -share/applications/vmware-user.desktop -share/applications/vmware-toolbox.desktop -@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi -@dirrmtry lib/vmware-tools/modules/drivers -@dirrmtry lib/vmware-tools/modules/input -@unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi -@dirrmtry lib/vmware-tools/modules -@dirrmtry lib/vmware-tools -@dirrmtry etc/vmware-tools -@dirrmtry share/vmware-tools -@dirrmtry share/applications Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 12 Sep 2008 17:41:58 -0000 @@ -0,0 +1,11 @@ +******************************************************************* +To run the Open Virtual Machine tools at startup, add the following +settings to your /etc/rc.conf + +%%NOTON5%%vmware_guest_vmblock_enable="YES" +%%NOTON5%%vmware_guest_vmhgfs_enable="YES" +vmware_guest_vmmemctl_enable="YES" +vmware_guest_vmxnet_enable="YES" +vmware_guestd_enable="YES" + +******************************************************************* Index: files/vmware-kmod.sh.in =================================================================== RCS file: /home/ncvs/ports/emulators/open-vm-tools/files/vmware-kmod.sh.in,v retrieving revision 1.2 diff -u -r1.2 vmware-kmod.sh.in --- files/vmware-kmod.sh.in 5 Aug 2008 16:36:38 -0000 1.2 +++ files/vmware-kmod.sh.in 12 Sep 2008 17:25:23 -0000 @@ -24,16 +24,16 @@ echo 'Loading vmxnet kernel module.' kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1 } -vmware_guest_vmblock_start() -{ - echo 'Loading vmblock kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1 -} -vmware_guest_vmhgfs_start() -{ - echo 'Loading vmhgfs kernel module.' - kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1 -} +%%NOTON5%%vmware_guest_vmblock_start() +%%NOTON5%%{ +%%NOTON5%% echo 'Loading vmblock kernel module.' +%%NOTON5%% kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1 +%%NOTON5%%} +%%NOTON5%%vmware_guest_vmhgfs_start() +%%NOTON5%%{ +%%NOTON5%% echo 'Loading vmhgfs kernel module.' +%%NOTON5%% kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1 +%%NOTON5%%} # VMware kernel module: vmmemctl name="vmware_guest_vmmemctl" @@ -59,27 +59,27 @@ load_rc_config $name [ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" run_rc_command "$1" - -# VMware kernel module: vmblock -name="vmware_guest_vmblock" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmblock_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO" -run_rc_command "$1" - -# VMware kernel module: vmhgfs -name="vmware_guest_vmhgfs" -rcvar=`set_rcvar` -start_precmd="${checkvm_cmd}" -start_cmd="vmware_guest_vmhgfs_start" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO" -run_rc_command "$1" +%%NOTON5%% +%%NOTON5%%# VMware kernel module: vmblock +%%NOTON5%%name="vmware_guest_vmblock" +%%NOTON5%%rcvar=`set_rcvar` +%%NOTON5%%start_precmd="${checkvm_cmd}" +%%NOTON5%%start_cmd="vmware_guest_vmblock_start" +%%NOTON5%%stop_precmd="${checkvm_cmd}" +%%NOTON5%%stop_cmd=":" +%%NOTON5%% +%%NOTON5%%load_rc_config $name +%%NOTON5%%[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO" +%%NOTON5%%run_rc_command "$1" +%%NOTON5%% +%%NOTON5%%# VMware kernel module: vmhgfs +%%NOTON5%%name="vmware_guest_vmhgfs" +%%NOTON5%%rcvar=`set_rcvar` +%%NOTON5%%start_precmd="${checkvm_cmd}" +%%NOTON5%%start_cmd="vmware_guest_vmhgfs_start" +%%NOTON5%%stop_precmd="${checkvm_cmd}" +%%NOTON5%%stop_cmd=":" +%%NOTON5%% +%%NOTON5%%load_rc_config $name +%%NOTON5%%[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO" +%%NOTON5%%run_rc_command "$1" --- unbreak-open-vm-tools.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: