From mat@aragorn.in.absolight.net  Thu Nov  7 15:52:08 2013
Return-Path: <mat@aragorn.in.absolight.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 358E15CA;
	Thu,  7 Nov 2013 15:52:08 +0000 (UTC)
	(envelope-from mat@aragorn.in.absolight.net)
Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 992262984;
	Thu,  7 Nov 2013 15:52:06 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
	by prod2.absolight.net (Postfix) with ESMTP id 17512BDC2E;
	Thu,  7 Nov 2013 16:52:02 +0100 (CET)
Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified))
	by prod2.absolight.net (Postfix) with ESMTPSA id DC6E3BDC24;
	Thu,  7 Nov 2013 16:52:01 +0100 (CET)
Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225])
	by gw.in.absolight.net (Postfix) with ESMTP id 4010F6113;
	Thu,  7 Nov 2013 16:52:01 +0100 (CET)
Received: by aragorn.in.absolight.net (Postfix, from userid 1000)
	id B8CE014269C; Thu,  7 Nov 2013 16:52:00 +0100 (CET)
Message-Id: <20131107155200.B8CE014269C@aragorn.in.absolight.net>
Date: Thu,  7 Nov 2013 16:52:00 +0100 (CET)
From: Mathieu Arnold <mat@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: swills@FreeBSD.org
Subject: [PATCH] emulators/open-vm-tools: Stageify.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183754
>Category:       ports
>Synopsis:       [PATCH] emulators/open-vm-tools: Stageify.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 07 16:00:00 UTC 2013
>Closed-Date:    Thu Nov 07 21:50:42 UTC 2013
>Last-Modified:  Thu Nov  7 22:00:00 UTC 2013
>Originator:     Mathieu Arnold
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
- Stageify

Port maintainer (swills@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_9 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- open-vm-tools-425873_4,1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 333125)
+++ Makefile	(working copy)
@@ -5,7 +5,7 @@
 PORTVERSION=		${BUILD_VER}
 PORTREVISION=		4
 PORTEPOCH=		1
-CATEGORIES=		emulators kld
+CATEGORIES=		emulators
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
 DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
@@ -20,10 +20,11 @@
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
-USES=			pkgconfig
+USES=			pkgconfig kmod
 USE_GNOME=		glib20
 USE_LDCONFIG=		yes
 CPPFLAGS+=		-Wno-deprecated-declarations
+KMODDIR=		${PREFIX}/lib/vmware-tools/modules/drivers
 
 SSP_UNSAFE=		kernel module does not support ssp
 
@@ -75,7 +76,6 @@
 
 USE_RC_SUBR=		vmware-guestd vmware-kmod
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -83,16 +83,17 @@
 .endif
 
 post-build:
-	(cd ${WRKSRC}/modules && ${MAKE})
+	(cd ${WRKSRC}/modules && env ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
 
 post-install:
-	${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
-	${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
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
+	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
 
 .include <bsd.port.post.mk>
Index: files/patch-libguestlib-Makefile
===================================================================
--- files/patch-libguestlib-Makefile	(revision 333125)
+++ files/patch-libguestlib-Makefile	(working copy)
@@ -5,7 +5,7 @@
  EXTRA_DIST = vmguestlib.pc.in
  
 -pkgconfigdir   = $(libdir)/pkgconfig
-+pkgconfigdir   = $(DESTDIR)$(prefix)/libdata/pkgconfig
++pkgconfigdir   = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = vmguestlib.pc
  
  $(pkgconfig_DATA): $(top_builddir)/config.status
@@ -16,7 +16,7 @@
  	$(top_srcdir)/lib/include/vm_basic_types.h
  EXTRA_DIST = vmguestlib.pc.in
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = vmguestlib.pc
  all: all-am
  
Index: files/patch-services-Makefile
===================================================================
--- files/patch-services-Makefile	(revision 333125)
+++ files/patch-services-Makefile	(working copy)
@@ -6,7 +6,7 @@
  install-exec-local:
 -	mkdir -p $(DESTDIR)/etc/vmware-tools
 -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(prefix)/etc/vmware-tools
++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
  
 --- services/Makefile.in.orig	2009-02-28 20:48:52.000000000 +0100
 +++ services/Makefile.in	2009-02-28 20:49:46.000000000 +0100
@@ -16,7 +16,7 @@
  install-exec-local:
 -	mkdir -p $(DESTDIR)/etc/vmware-tools
 -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
-+	mkdir -p $(prefix)/etc/vmware-tools
++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 333125)
+++ pkg-plist	(working copy)
@@ -30,7 +30,6 @@
 lib/libguestlib.so
 lib/libguestlib.so.0
 libdata/pkgconfig/vmguestlib.pc
-lib/vmware-tools/modules/drivers/linker.hints
 lib/vmware-tools/modules/drivers/vmblock.ko
 lib/vmware-tools/modules/drivers/vmhgfs.ko
 lib/vmware-tools/modules/drivers/vmmemctl.ko
@@ -53,11 +52,8 @@
 share/open-vm-tools/messages/zh_CN/toolbox.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
-@exec kldxref %D/lib/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
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
 @unexec if test -h %D/etc/vmware-tools/plugins; then rm -f %D/etc/vmware-tools/plugins; fi
-@dirrmtry lib/vmware-tools/modules/drivers
 @dirrmtry lib/vmware-tools/modules/input
 @dirrmtry lib/vmware-tools/modules
 @dirrmtry lib/vmware-tools
--- open-vm-tools-425873_4,1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 7 16:00:10 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183754 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Thu Nov 7 21:50:42 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183754 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183754: commit references a PR
Date: Thu,  7 Nov 2013 21:50:28 +0000 (UTC)

 Author: swills
 Date: Thu Nov  7 21:50:19 2013
 New Revision: 333158
 URL: http://svnweb.freebsd.org/changeset/ports/333158
 
 Log:
   - Add stage support
   - Convert to USES=kmod
   
   PR:		ports/183754
   Submitted by:	mat
 
 Modified:
   head/emulators/open-vm-tools/Makefile
   head/emulators/open-vm-tools/files/patch-libguestlib-Makefile
   head/emulators/open-vm-tools/files/patch-services-Makefile
   head/emulators/open-vm-tools/pkg-plist
 
 Modified: head/emulators/open-vm-tools/Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools/Makefile	Thu Nov  7 21:46:34 2013	(r333157)
 +++ head/emulators/open-vm-tools/Makefile	Thu Nov  7 21:50:19 2013	(r333158)
 @@ -5,7 +5,7 @@ PORTNAME=		open-vm-tools
  PORTVERSION=		${BUILD_VER}
  PORTREVISION=		4
  PORTEPOCH=		1
 -CATEGORIES=		emulators kld
 +CATEGORIES=		emulators
  MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
  DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
  
 @@ -20,10 +20,11 @@ BUILD_VER=		425873
  
  WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
  GNU_CONFIGURE=		yes
 -USES=			pkgconfig
 +USES=			pkgconfig kmod
  USE_GNOME=		glib20
  USE_LDCONFIG=		yes
  CPPFLAGS+=		-Wno-deprecated-declarations
 +KMODDIR=		${PREFIX}/lib/vmware-tools/modules/drivers
  
  SSP_UNSAFE=		kernel module does not support ssp
  
 @@ -75,7 +76,6 @@ LIB_DEPENDS+=		libicuuc.so:${PORTSDIR}/d
  
  USE_RC_SUBR=		vmware-guestd vmware-kmod
  
 -NO_STAGE=	yes
  .include <bsd.port.pre.mk>
  
  .if ${ARCH} == "sparc64"
 @@ -83,16 +83,17 @@ IGNORE=		not yet ported to sparc64
  .endif
  
  post-build:
 -	(cd ${WRKSRC}/modules && ${MAKE})
 +	(cd ${WRKSRC}/modules && env ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
  
  post-install:
 -	${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
 -	${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
 -	@${CAT} ${PKGMESSAGE}
 +	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
 +	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
 +	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko
 +	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko
 +	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
 +	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/
  
  .include <bsd.port.post.mk>
 
 Modified: head/emulators/open-vm-tools/files/patch-libguestlib-Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools/files/patch-libguestlib-Makefile	Thu Nov  7 21:46:34 2013	(r333157)
 +++ head/emulators/open-vm-tools/files/patch-libguestlib-Makefile	Thu Nov  7 21:50:19 2013	(r333158)
 @@ -5,7 +5,7 @@
   EXTRA_DIST = vmguestlib.pc.in
   
  -pkgconfigdir   = $(libdir)/pkgconfig
 -+pkgconfigdir   = $(DESTDIR)$(prefix)/libdata/pkgconfig
 ++pkgconfigdir   = $(prefix)/libdata/pkgconfig
   pkgconfig_DATA = vmguestlib.pc
   
   $(pkgconfig_DATA): $(top_builddir)/config.status
 @@ -16,7 +16,7 @@
   	$(top_srcdir)/lib/include/vm_basic_types.h
   EXTRA_DIST = vmguestlib.pc.in
  -pkgconfigdir = $(libdir)/pkgconfig
 -+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
 ++pkgconfigdir = $(prefix)/libdata/pkgconfig
   pkgconfig_DATA = vmguestlib.pc
   all: all-am
   
 
 Modified: head/emulators/open-vm-tools/files/patch-services-Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools/files/patch-services-Makefile	Thu Nov  7 21:46:34 2013	(r333157)
 +++ head/emulators/open-vm-tools/files/patch-services-Makefile	Thu Nov  7 21:50:19 2013	(r333158)
 @@ -6,7 +6,7 @@
   install-exec-local:
  -	mkdir -p $(DESTDIR)/etc/vmware-tools
  -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
 -+	mkdir -p $(prefix)/etc/vmware-tools
 ++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
   
  --- services/Makefile.in.orig	2009-02-28 20:48:52.000000000 +0100
  +++ services/Makefile.in	2009-02-28 20:49:46.000000000 +0100
 @@ -16,7 +16,7 @@
   install-exec-local:
  -	mkdir -p $(DESTDIR)/etc/vmware-tools
  -	ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
 -+	mkdir -p $(prefix)/etc/vmware-tools
 ++	mkdir -p $(DESTDIR)$(prefix)/etc/vmware-tools
   
   # Tell versions [3.59,3.63) of GNU make to not export all variables.
   # Otherwise a system limit (for SysV at least) may be exceeded.
 
 Modified: head/emulators/open-vm-tools/pkg-plist
 ==============================================================================
 --- head/emulators/open-vm-tools/pkg-plist	Thu Nov  7 21:46:34 2013	(r333157)
 +++ head/emulators/open-vm-tools/pkg-plist	Thu Nov  7 21:50:19 2013	(r333158)
 @@ -30,7 +30,6 @@ lib/libguestlib.la
  lib/libguestlib.so
  lib/libguestlib.so.0
  libdata/pkgconfig/vmguestlib.pc
 -lib/vmware-tools/modules/drivers/linker.hints
  lib/vmware-tools/modules/drivers/vmblock.ko
  lib/vmware-tools/modules/drivers/vmhgfs.ko
  lib/vmware-tools/modules/drivers/vmmemctl.ko
 @@ -53,11 +52,8 @@ share/open-vm-tools/messages/ja/toolbox.
  share/open-vm-tools/messages/zh_CN/toolbox.vmsg
  share/vmware-tools/statechange.subr
  share/vmware-tools/scripts/vmware/network
 -@exec kldxref %D/lib/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
  @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
  @unexec if test -h %D/etc/vmware-tools/plugins; then rm -f %D/etc/vmware-tools/plugins; fi
 -@dirrmtry lib/vmware-tools/modules/drivers
  @dirrmtry lib/vmware-tools/modules/input
  @dirrmtry lib/vmware-tools/modules
  @dirrmtry lib/vmware-tools
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
