Date: Wed, 17 Mar 2021 16:44:11 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568677 - in head: . emulators emulators/open-vm-tools emulators/open-vm-tools-nox11 emulators/open-vm-tools/files Message-ID: <202103171644.12HGiBcV084022@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Wed Mar 17 16:44:10 2021 New Revision: 568677 URL: https://svnweb.freebsd.org/changeset/ports/568677 Log: emulators/open-vm-tools: Flavorize and other tweaks - Remove emulators/open-vm-tools-nox11 and create a nox11 flavor - Regenerate patches with make makepatch - Sort Makefile and make portclippy and portlint happy - Remove unused variables - Simplify Makefile Sponsored by: Rubicon Communications, LLC ("Netgate") Deleted: head/emulators/open-vm-tools-nox11/ Modified: head/MOVED head/emulators/Makefile head/emulators/open-vm-tools/Makefile head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Mar 17 16:37:44 2021 (r568676) +++ head/MOVED Wed Mar 17 16:44:10 2021 (r568677) @@ -16194,3 +16194,4 @@ audio/fplib||2021-03-07|Dead service since 2015 sysutils/prelink||2021-03-11|Has expired: Have no users in the ports tree x11-fonts/vtfontcvt-ng||2021-03-12|no longer useful on any supported releases; use vtfontcvt(8) instead biology/py-fastTSNE|math/py-openTSNE|2021-03-13|project renamed/reimplemented under a different name +emulators/open-vm-tools-nox11|emulators/open-vm-tools@nox11|2021-03-17|Moved to a flavored, generic, version Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Wed Mar 17 16:37:44 2021 (r568676) +++ head/emulators/Makefile Wed Mar 17 16:44:10 2021 (r568677) @@ -99,7 +99,6 @@ SUBDIR += o2em SUBDIR += ods2reader SUBDIR += open-vm-tools - SUBDIR += open-vm-tools-nox11 SUBDIR += openmsx SUBDIR += p5-Acme-6502 SUBDIR += parallels-tools Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Wed Mar 17 16:37:44 2021 (r568676) +++ head/emulators/open-vm-tools/Makefile Wed Mar 17 16:44:10 2021 (r568677) @@ -1,81 +1,73 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ -PORTNAME= open-vm-tools -PORTVERSION= ${RELEASE_VER} +PORTNAME= open-vm-tools +PORTVERSION= 11.2.0 DISTVERSIONPREFIX= stable- -PORTREVISION= 2 -PORTEPOCH= 2 -CATEGORIES= emulators +PORTREVISION= 3 +PORTEPOCH= 2 +CATEGORIES= emulators -MAINTAINER= garga@FreeBSD.org -COMMENT?= Open VMware tools for FreeBSD VMware guests +MAINTAINER= garga@FreeBSD.org +COMMENT= Open VMware tools for FreeBSD VMware guests ${${FLAVOR}_COMMENT} -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 -LIB_DEPENDS= libmspack.so:archivers/libmspack \ - libdnet.so:net/libdnet +LIB_DEPENDS= libdnet.so:net/libdnet \ + libmspack.so:archivers/libmspack -RELEASE_VER= 11.2.0 -BUILD_VER= 16938113 +FLAVORS= default nox11 +default_CONFLICTS_INSTALL= open-vm-tools-nox11 +nox11_PKGNAMESUFFIX= -nox11 +nox11_CONFLICTS_INSTALL= open-vm-tools +nox11_COMMENT= (without X11) -OPTIONS_DEFINE= DOCS LIBNOTIFY OPENSSL X11 -OPTIONS_DEFAULT= DOCS LIBNOTIFY OPENSSL X11 +USES= autoreconf fuse gettext-runtime gnome kmod libtool localbase \ + pathfix pkgconfig -OPTIONS_SUB= +USE_GITHUB= yes +GH_ACCOUNT= vmware +USE_GNOME= glib20 +USE_LDCONFIG= yes +USE_RC_SUBR= vmware-guestd vmware-kmod -DOCS_BUILD_DEPENDS= doxygen:devel/doxygen -DOCS_CONFIGURE_ENABLE= docs +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--disable-vgauth \ + --sysconfdir=${PREFIX}/etc \ + --without-icu +CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys -LIBNOTIFY_DESC= Desktop notification support +INSTALL_TARGET= install-strip -X11_CONFIGURE_WITH= x gtk2 gtkmm -X11_USES= gnome xorg -X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst \ - gnome=gdkpixbuf2,gtk20,gtkmm24 -X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify -OPENSSL_CONFIGURE_WITH= ssl +CPPFLAGS+= -Wno-deprecated-declarations +SSP_UNSAFE= kernel module does not support ssp -WRKSRC_SUBDIR= open-vm-tools +CONFLICTS= vmware-guestd[0-9]* vmware-tools[0-9]* -GNU_CONFIGURE= yes -USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig gnome -USE_GNOME= glib20 +WRKSRC_SUBDIR= open-vm-tools -USE_GITHUB= yes -GH_ACCOUNT= vmware - -USE_LDCONFIG= yes -CPPFLAGS+= -Wno-deprecated-declarations - -SSP_UNSAFE= kernel module does not support ssp - -CONFIGURE_ARGS+= --without-icu \ - --disable-vgauth \ - --sysconfdir=${PREFIX}/etc - -CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]* - -USE_RC_SUBR= vmware-guestd vmware-kmod - -INSTALL_TARGET= install-strip - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MX11} -CONFLICTS+= open-vm-tools-nox11-[0-9]* -.else -CONFLICTS+= open-vm-tools-[0-9]* +OPTIONS_DEFINE= DOCS LIBNOTIFY OPENSSL X11 +OPTIONS_DEFAULT=DOCS LIBNOTIFY OPENSSL X11 +.if ${FLAVOR:U} == nox11 +OPTIONS_EXCLUDE:= LIBNOTIFY X11 .endif +OPTIONS_SUB= -CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys +LIBNOTIFY_DESC= Desktop notification support -.include <bsd.port.pre.mk> +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +DOCS_CONFIGURE_ENABLE= docs +LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify +OPENSSL_CONFIGURE_WITH= ssl +X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +X11_USES= xorg +X11_USE= GNOME=gdkpixbuf2,gtk20,gtkmm24 \ + XORG=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst +X11_CONFIGURE_WITH= gtk2 gtkmm x post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\ @@ -87,11 +79,13 @@ post-build: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input - ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko - ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko + ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko \ + ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko + ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko \ + ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.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/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile ============================================================================== --- head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile Wed Mar 17 16:37:44 2021 (r568676) +++ head/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_Makefile Wed Mar 17 16:44:10 2021 (r568677) @@ -1,6 +1,6 @@ ---- modules/freebsd/vmmemctl/Makefile.orig +--- modules/freebsd/vmmemctl/Makefile.orig 2020-10-16 23:15:58 UTC +++ modules/freebsd/vmmemctl/Makefile -@@ -33,8 +33,6 @@ +@@ -33,8 +33,6 @@ SRCS += backdoorGcc32.c .endif KMOD = vmmemctl PROG = ../$(KMOD).ko
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103171644.12HGiBcV084022>