pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools open-vm-tools: fix distfile ret...
details: https://anonhg.NetBSD.org/pkgsrc/rev/45bd09d5acce
branches: trunk
changeset: 369947:45bd09d5acce
user: adam <adam%pkgsrc.org@localhost>
date: Sun Oct 08 16:01:30 2017 +0000
description:
open-vm-tools: fix distfile retrieval, building, and clean-ups
PkgSrc-only changes:
- Used proper MASTER_SITE
- Distfile now can be downloaded correctly
- Unified PLISTs
- Clean up
diffstat:
sysutils/open-vm-tools/Makefile | 56 ++++++++++++++++++------------------
sysutils/open-vm-tools/PLIST | 55 ++++++++++++++++++++++++++++++++++++
sysutils/open-vm-tools/PLIST.common | 50 ---------------------------------
sysutils/open-vm-tools/PLIST.x11 | 6 ---
sysutils/open-vm-tools/distinfo | 10 +++---
sysutils/open-vm-tools/options.mk | 6 ++-
6 files changed, 92 insertions(+), 91 deletions(-)
diffs (264 lines):
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/Makefile
--- a/sysutils/open-vm-tools/Makefile Sun Oct 08 15:25:54 2017 +0000
+++ b/sysutils/open-vm-tools/Makefile Sun Oct 08 16:01:30 2017 +0000
@@ -1,41 +1,42 @@
-# $NetBSD: Makefile,v 1.76 2017/10/08 04:45:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2017/10/08 16:01:30 adam Exp $
DISTNAME= open-vm-tools-10.1.15
CATEGORIES= sysutils
-MASTER_SITES= https://github.com/vmware/open-vm-tools/releases/download/${PKGVERSION_NOREV}/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/}
MAINTAINER= agc%NetBSD.org@localhost
HOMEPAGE= https://github.com/vmware/open-vm-tools
COMMENT= Open source VMware tools
LICENSE= gnu-lgpl-v2.1
+GITHUB_TAG= stable-${PKGVERSION_NOREV}
+WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
+
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64
GCC_REQD+= 4.8
BUILDLINK_TRANSFORM.NetBSD+= rm:-Werror
-GNU_CONFIGURE= yes
-USE_LANGUAGES+= c gnu++11
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config autoconf automake
-
-PLIST_SRC= PLIST.common
+USE_LANGUAGES= c gnu++11
+USE_LIBTOOL= yes
+USE_TOOLS+= autoconf automake pkg-config
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-docs # Requires doxygen
+CONFIGURE_ARGS+= --disable-grabbitmqproxy
+CONFIGURE_ARGS+= --disable-unity
+CONFIGURE_ARGS+= --disable-vgauth
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --disable-unity --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --disable-vgauth
-CONFIGURE_ARGS+= --disable-grabbitmqproxy
-CONFIGURE_ARGS+= --disable-docs # Requires doxygen
-
-INSTALLATION_DIRS+= share/examples/vmware-tools
+INSTALLATION_DIRS+= share/examples/vmware-tools
-PKG_SYSCONFSUBDIR= vmware-tools
-EGDIR= ${PREFIX}/share/examples/vmware-tools
-CONF_FILES_PERMS+= ${EGDIR}/poweroff-vm-default ${PKG_SYSCONFDIR}/poweroff-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/poweron-vm-default ${PKG_SYSCONFDIR}/poweron-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/resume-vm-default ${PKG_SYSCONFDIR}/resume-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/statechange.subr ${PKG_SYSCONFDIR}/statechange.subr ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-RCD_SCRIPTS= vmtools
+PKG_SYSCONFSUBDIR= vmware-tools
+EGDIR= ${PREFIX}/share/examples/vmware-tools
+CONF_FILES_PERMS+= ${EGDIR}/poweroff-vm-default ${PKG_SYSCONFDIR}/poweroff-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/poweron-vm-default ${PKG_SYSCONFDIR}/poweron-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/resume-vm-default ${PKG_SYSCONFDIR}/resume-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/statechange.subr ${PKG_SYSCONFDIR}/statechange.subr ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/suspend-vm-default ${PKG_SYSCONFDIR}/suspend-vm-default ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+RCD_SCRIPTS= vmtools
SUBST_CLASSES+= fix-etc-path
SUBST_STAGE.fix-etc-path= pre-configure
@@ -45,7 +46,7 @@
SUBST_VARS.fix-etc-path+= PREFIX
pre-configure:
- cd ${WRKSRC} && autoreconf -f
+ cd ${WRKSRC} && autoreconf -f -i
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
@@ -56,14 +57,13 @@
CWRAPPERS_APPEND.cc+= -Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable
.endif
+.include "options.mk"
+
.include "../../archivers/libmspack/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../mk/fuse.buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
.include "../../net/libdnet/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/xml-security-c/buildlink3.mk"
-
-.include "options.mk"
-
+.include "../../mk/fuse.buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/open-vm-tools/PLIST Sun Oct 08 16:01:30 2017 +0000
@@ -0,0 +1,55 @@
+@comment $NetBSD: PLIST,v 1.3 2017/10/08 16:01:30 adam Exp $
+bin/vmhgfs-fuse
+bin/vmtoolsd
+bin/vmware-checkvm
+bin/vmware-hgfsclient
+bin/vmware-namespace-cmd
+bin/vmware-rpctool
+bin/vmware-toolbox-cmd
+${PLIST.x11}bin/vmware-user-suid-wrapper
+bin/vmware-vmblock-fuse
+bin/vmware-xferlogs
+${PLIST.x11}etc/vmware-tools/xdg/autostart/vmware-user.desktop
+include/libDeployPkg/guestcust-events.h
+include/libDeployPkg/imgcust-api.h
+include/libDeployPkg/includeCheck.h
+include/libDeployPkg/linuxDeployment.h
+include/libDeployPkg/log.h
+include/libDeployPkg/process.h
+include/libDeployPkg/rpcout.h
+include/libDeployPkg/vm_basic_types.h
+include/vmGuestLib/includeCheck.h
+include/vmGuestLib/vmGuestLib.h
+include/vmGuestLib/vmSessionId.h
+include/vmGuestLib/vm_basic_types.h
+lib/libDeployPkg.la
+lib/libguestlib.la
+lib/libhgfs.la
+lib/libvmtools.la
+lib/open-vm-tools/plugins/common/libhgfsServer.la
+lib/open-vm-tools/plugins/common/libvix.la
+lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so
+lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
+${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdndcp.so
+${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
+lib/pkgconfig/libDeployPkg.pc
+lib/pkgconfig/vmguestlib.pc
+sbin/mount.vmblock
+share/examples/vmware-tools/pam.d/vmtoolsd
+share/examples/vmware-tools/poweroff-vm-default
+share/examples/vmware-tools/poweron-vm-default
+share/examples/vmware-tools/resume-vm-default
+share/examples/vmware-tools/scripts/vmware/network
+share/examples/vmware-tools/statechange.subr
+share/examples/vmware-tools/suspend-vm-default
+share/open-vm-tools/messages/de/toolboxcmd.vmsg
+share/open-vm-tools/messages/de/vmtoolsd.vmsg
+share/open-vm-tools/messages/ja/toolboxcmd.vmsg
+share/open-vm-tools/messages/ja/vmtoolsd.vmsg
+share/open-vm-tools/messages/ko/toolboxcmd.vmsg
+share/open-vm-tools/messages/ko/vmtoolsd.vmsg
+share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/PLIST.common
--- a/sysutils/open-vm-tools/PLIST.common Sun Oct 08 15:25:54 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.4 2016/11/21 00:14:16 pho Exp $
-bin/vmhgfs-fuse
-bin/vmtoolsd
-bin/vmware-checkvm
-bin/vmware-hgfsclient
-bin/vmware-namespace-cmd
-bin/vmware-rpctool
-bin/vmware-toolbox-cmd
-bin/vmware-vmblock-fuse
-bin/vmware-xferlogs
-include/libDeployPkg/guestcust-events.h
-include/libDeployPkg/imgcust-api.h
-include/libDeployPkg/includeCheck.h
-include/libDeployPkg/linuxDeployment.h
-include/libDeployPkg/log.h
-include/libDeployPkg/process.h
-include/libDeployPkg/rpcout.h
-include/libDeployPkg/vm_basic_types.h
-include/vmGuestLib/includeCheck.h
-include/vmGuestLib/vmGuestLib.h
-include/vmGuestLib/vmSessionId.h
-include/vmGuestLib/vm_basic_types.h
-lib/libDeployPkg.la
-lib/libguestlib.la
-lib/libhgfs.la
-lib/libvmtools.la
-lib/open-vm-tools/plugins/common/libhgfsServer.la
-lib/open-vm-tools/plugins/common/libvix.la
-lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so
-lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
-lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
-lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
-lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
-lib/pkgconfig/libDeployPkg.pc
-lib/pkgconfig/vmguestlib.pc
-sbin/mount.vmblock
-share/examples/vmware-tools/pam.d/vmtoolsd
-share/examples/vmware-tools/poweroff-vm-default
-share/examples/vmware-tools/poweron-vm-default
-share/examples/vmware-tools/resume-vm-default
-share/examples/vmware-tools/scripts/vmware/network
-share/examples/vmware-tools/statechange.subr
-share/examples/vmware-tools/suspend-vm-default
-share/open-vm-tools/messages/de/toolboxcmd.vmsg
-share/open-vm-tools/messages/de/vmtoolsd.vmsg
-share/open-vm-tools/messages/ja/toolboxcmd.vmsg
-share/open-vm-tools/messages/ja/vmtoolsd.vmsg
-share/open-vm-tools/messages/ko/toolboxcmd.vmsg
-share/open-vm-tools/messages/ko/vmtoolsd.vmsg
-share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/PLIST.x11
--- a/sysutils/open-vm-tools/PLIST.x11 Sun Oct 08 15:25:54 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.x11,v 1.2 2016/10/09 03:41:56 ryoon Exp $
-bin/vmware-user-suid-wrapper
-etc/vmware-tools/xdg/autostart/vmware-user.desktop
-lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
-lib/open-vm-tools/plugins/vmusr/libdndcp.so
-lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/distinfo
--- a/sysutils/open-vm-tools/distinfo Sun Oct 08 15:25:54 2017 +0000
+++ b/sysutils/open-vm-tools/distinfo Sun Oct 08 16:01:30 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2017/10/08 04:45:00 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2017/10/08 16:01:30 adam Exp $
-SHA1 (open-vm-tools-10.1.15.tar.gz) = 1f37ffd77a0ccfe99cd4b3a9057b75a878591ee7
-RMD160 (open-vm-tools-10.1.15.tar.gz) = 063611a9f97629c735766b2457742946d174a198
-SHA512 (open-vm-tools-10.1.15.tar.gz) = 0cf8fe4eb6eb8fecc74c6827c437a3cd7f02a36771c29c4becd6ef498274ec61c9b2e898b8ef3027af770e82814ed1a7b8d08a66c058fb078c6587c6ca1e1333
-Size (open-vm-tools-10.1.15.tar.gz) = 5145932 bytes
+SHA1 (open-vm-tools-10.1.15.tar.gz) = 1b9a68b8acedeb720c91ac20ddf17e5187320cc6
+RMD160 (open-vm-tools-10.1.15.tar.gz) = 27de01103f7d7ac16258acaf64545f5f47a796bc
+SHA512 (open-vm-tools-10.1.15.tar.gz) = 4c75ee3424c1cb0e4b949a8d52863337ca754eeae90e078fd63790fcc67ea11b9136f9f1cb0f32e31d3f934e514a269706db08c698b6fe0b3beb1fe9437cd103
+Size (open-vm-tools-10.1.15.tar.gz) = 3551568 bytes
SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3
SHA1 (patch-ah) = bdee6d92cdfe64f1ab513876ccd9d01f6fda6882
SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
diff -r 38d550c86c69 -r 45bd09d5acce sysutils/open-vm-tools/options.mk
--- a/sysutils/open-vm-tools/options.mk Sun Oct 08 15:25:54 2017 +0000
+++ b/sysutils/open-vm-tools/options.mk Sun Oct 08 16:01:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/02/20 09:19:27 tnn Exp $
+# $NetBSD: options.mk,v 1.6 2017/10/08 16:01:30 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.open-vm-tools
PKG_SUPPORTED_OPTIONS= icu x11
@@ -6,6 +6,8 @@
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= x11
+
.if !empty(PKG_OPTIONS:Micu)
.include "../../textproc/icu/buildlink3.mk"
.else
@@ -13,7 +15,7 @@
.endif
.if !empty(PKG_OPTIONS:Mx11)
-PLIST_SRC+= PLIST.x11
+PLIST.x11= yes
MESSAGE_SRC+= MESSAGE.x11
. include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
. include "../../sysutils/desktop-file-utils/desktopdb.mk"
Home |
Main Index |
Thread Index |
Old Index