ports/127686: [PATCH] emulators/open-vm-tools: unbreak and fix portlint warnings

Sat Sep 27 19:20:01 UTC 2008

>Number:         127686
>Category:       ports
>Synopsis:       [PATCH] emulators/open-vm-tools: unbreak and fix portlint warnings
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 27 19:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Olgeni
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD olgeni.olgeni 7.0-STABLE FreeBSD 7.0-STABLE #0: Sat Aug 23 13:38:24 CEST 2008
>Description:
The attached patch unbreaks the port and fixes a few portlint warnings.

A single pkg-plist is used to handle the WITHOUT_X11 case.

Removed file(s):
- pkg-plist-x11

Port maintainer (mbr at freebsd.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- open-vm-tools-102166_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile	20 Aug 2008 08:12:12 -0000	1.12
+++ Makefile	27 Sep 2008 19:02:46 -0000
@@ -9,22 +9,22 @@
 PORTVERSION=		${BUILD_VER}
 PORTREVISION=		2
 CATEGORIES=		emulators
-DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 MASTER_SITES=		SF
+DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 
 MAINTAINER=		mbr at freebsd.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
 
-BROKEN=			leaves files behind on deinstall
-
 RELEASE_DATE=		2008.07.01
 BUILD_VER=		102166
 
 GNU_CONFIGURE=		yes
+USE_LDCONFIG=		yes
 
 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,7 +32,6 @@
 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*
@@ -61,16 +60,16 @@
 
 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
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/drivers
+	${MKDIR} ${PREFIX}/lib/vmware-tools/modules/input
+	${MKDIR} ${PREFIX}/share/vmware-tools
 .if ${OSREL} >= 6
 	${INSTALL} ${WRKSRC}/hgfsmounter/mount.vmhgfs ${PREFIX}/sbin/mount_vmhgfs
 .endif
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/open-vm-tools/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	4 Aug 2008 18:51:14 -0000	1.9
+++ pkg-plist	27 Sep 2008 19:02:46 -0000
@@ -1,29 +1,36 @@
-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
- at exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
+bin/vmware-checkvm
+bin/vmware-hgfsclient
+%%X11%%bin/vmware-toolbox
+%%X11%%bin/vmware-user
+bin/vmware-xferlogs
+etc/vmware-tools/tools.conf
+%%LIB32DIR%%/libguestlib.a
+%%LIB32DIR%%/libguestlib.la
+%%LIB32DIR%%/libguestlib.so
+%%LIB32DIR%%/libguestlib.so.0
+%%LIB32DIR%%/vmware-tools/modules/drivers/linker.hints
+%%FIVEONLY%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko
+%%FIVEONLY%%%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko
+%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko
+%%FIVEONLY%%sbin/mount_vmhgfs
+sbin/vmware-guestd
+%%X11%%sbin/vmware-toolbox
+%%X11%%sbin/vmware-user
+%%X11%%share/applications/vmware-toolbox.desktop
+%%X11%%share/applications/vmware-user.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
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-bin/vmware-checkvm
-bin/vmware-xferlogs
-bin/vmware-hgfsclient
-sbin/vmware-guestd
-etc/vmware-tools/tools.conf
-%%FIVEONLY%%sbin/mount_vmhgfs
+%%X11%%@dirrm share/pixmaps/vmware
+ at exec kldxref %%LIB32DIR%%/vmware-tools/modules/drivers 2>/dev/null || true
 @unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
- at dirrmtry lib/vmware-tools/modules/drivers
- at 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
- at dirrmtry lib/vmware-tools/modules
- at dirrmtry lib/vmware-tools
+ at dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools/modules
+ at dirrmtry %%LIB32DIR%%/vmware-tools/vmware-tools
 @dirrmtry etc/vmware-tools
 @dirrmtry share/vmware-tools
- at dirrmtry share/applications
+%%X11%%@dirrmtry share/applications
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
- at 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
- at unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
- at dirrmtry lib/vmware-tools/modules/drivers
- at dirrmtry lib/vmware-tools/modules/input
- at unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
- at dirrmtry lib/vmware-tools/modules
- at dirrmtry lib/vmware-tools
- at dirrmtry etc/vmware-tools
- at dirrmtry share/vmware-tools
- at dirrmtry share/applications
--- open-vm-tools-102166_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

