diff -urN net/freerdp.orig/Makefile net/freerdp/Makefile --- net/freerdp.orig/Makefile +++ net/freerdp/Makefile @@ -2,13 +2,10 @@ # $FreeBSD: head/net/freerdp/Makefile 532707 2020-04-23 20:14:49Z jbeich $ PORTNAME= freerdp -DISTVERSION= 2.0.0-rc4 -PORTREVISION= 8 +DISTVERSION= 2.1.0 +PORTREVISION= 0 CATEGORIES= net comms -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 649f49f.patch:-p1 effa8b8.patch:-p1 0c83efa.patch:-p1 - MAINTAINER= kevans@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol @@ -25,6 +22,12 @@ CPE_VENDOR= freerdp_project +PATCHVERSION= ${PORTVERSION} +MAJORVERSION= ${PORTVERSION:R:R} + +PLIST_SUB+= PATCHVERSION="${PATCHVERSION}" +PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" + USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= ${GH_ACCOUNT} @@ -157,5 +160,8 @@ @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/cmake/FindGSM.cmake \ ${WRKSRC}/libfreerdp/codec/dsp.c + +pre-configure: + ${CP} ${FILESDIR}/mntent* ${WRKSRC}/rdtk/include .include diff -urN net/freerdp.orig/distinfo net/freerdp/distinfo --- net/freerdp.orig/distinfo +++ net/freerdp/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1546908117 -SHA256 (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49 -SIZE (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 6615213 -SHA256 (649f49f.patch) = 9f8ef88e12f55fcb02a6a30c7d7fff3ae19894c6d368eebc17e878b81cdaa975 -SIZE (649f49f.patch) = 777 -SHA256 (effa8b8.patch) = 2fa4479ff7c0239f279172c08e7b52491d457ab844e6f5a6316c46f0d3afa49c -SIZE (effa8b8.patch) = 993 -SHA256 (0c83efa.patch) = fe9b6cabe7e54f6c02bf64e14eeb07d997511c3481e7e592e6526dbc10d337c3 -SIZE (0c83efa.patch) = 1144 +TIMESTAMP = 1589565874 +SHA256 (FreeRDP-FreeRDP-2.1.0_GH0.tar.gz) = 463b337c832dfc0918d03cf24cc94202535ad718915f11f51051da3442d4d8a7 +SIZE (FreeRDP-FreeRDP-2.1.0_GH0.tar.gz) = 6825453 diff -urN net/freerdp.orig/files/mntent.h net/freerdp/files/mntent.h --- net/freerdp.orig/files/mntent.h +++ net/freerdp/files/mntent.h @@ -0,0 +1,64 @@ +/* + * mntent + * mntent.h - compatability header for FreeBSD + * + * Copyright (c) 2001 David Rufino + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +// $FreeBSD: head/net/freerdp/files/mntent.h 517806 2019-11-17 07:05:23Z yuri $ + +#if defined(HAVE_MNTENT_H) +#include +#else +#ifndef _MNTENT_H +#define _MNTENT_H +#include + +#define MOUNTED "dummy" + +#define MNTTYPE_NFS "nfs" + +struct mntent { + char *mnt_fsname; + char *mnt_dir; + char *mnt_type; + char *mnt_opts; + int mnt_freq; + int mnt_passno; +}; + +#define setmntent(x,y) ((FILE *)0x1) +#ifdef __cplusplus +extern "C" { +#endif +struct mntent *getmntent __P ((FILE *fp)); +char *hasmntopt __P ((const struct mntent *mnt, const char *option)); +#ifdef __cplusplus +}; // extern "C" +#endif +#define endmntent(x) ((int)1) + +#endif /* _MNTENT_H */ +#endif /* HAVE_MNTENT_H */ diff -urN net/freerdp.orig/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h --- net/freerdp.orig/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h +++ net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h @@ -0,0 +1,15 @@ +--- channels/urbdrc/client/libusb/libusb_udevice.h.orig ++++ channels/urbdrc/client/libusb/libusb_udevice.h +@@ -75,4 +75,12 @@ + BYTE dev_number); + const char* usb_interface_class_to_string(uint8_t class); + ++#ifndef LIBUSB_CLASS_PHYSICAL ++#define LIBUSB_CLASS_PHYSICAL 5 ++#endif ++ ++#ifndef LIBUSB_CAP_HAS_HOTPLUG ++#define LIBUSB_CAP_HAS_HOTPLUG 0x0001 ++#endif ++ + #endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H */ diff -urN net/freerdp.orig/pkg-plist net/freerdp/pkg-plist --- net/freerdp.orig/pkg-plist +++ net/freerdp/pkg-plist @@ -123,7 +123,6 @@ include/freerdp2/freerdp/svc.h include/freerdp2/freerdp/types.h include/freerdp2/freerdp/update.h -include/freerdp2/freerdp/utils/msusb.h include/freerdp2/freerdp/utils/passphrase.h include/freerdp2/freerdp/utils/pcap.h include/freerdp2/freerdp/utils/profiler.h @@ -203,20 +202,20 @@ include/winpr2/winpr/wtsapi.h include/winpr2/winpr/wtypes.h lib/libfreerdp-client2.so -lib/libfreerdp-client2.so.2 -lib/libfreerdp-client2.so.2.0.0 +lib/libfreerdp-client2.so.%%MAJORVERSION%% +lib/libfreerdp-client2.so.%%PATCHVERSION%% lib/libfreerdp2.so -lib/libfreerdp2.so.2 -lib/libfreerdp2.so.2.0.0 +lib/libfreerdp2.so.%%MAJORVERSION%% +lib/libfreerdp2.so.%%PATCHVERSION%% %%WAYLAND%%lib/libuwac0.so %%WAYLAND%%lib/libuwac0.so.0 -%%WAYLAND%%lib/libuwac0.so.0.0.1 +%%WAYLAND%%lib/libuwac0.so.0.1.1 lib/libwinpr-tools2.so -lib/libwinpr-tools2.so.2 -lib/libwinpr-tools2.so.2.0.0 +lib/libwinpr-tools2.so.%%MAJORVERSION%% +lib/libwinpr-tools2.so.%%PATCHVERSION%% lib/libwinpr2.so -lib/libwinpr2.so.2 -lib/libwinpr2.so.2.0.0 +lib/libwinpr2.so.%%MAJORVERSION%% +lib/libwinpr2.so.%%PATCHVERSION%% libdata/pkgconfig/freerdp-client2.pc libdata/pkgconfig/freerdp2.pc %%WAYLAND%%libdata/pkgconfig/uwac0.pc