svn commit: r339755 - in head/net: freerdp freerdp/files remmina remmina-plugin-gnome remmina-plugin-i18n remmina-plugin-nx remmina-plugin-rdp remmina-plugin-telepathy remmina-plugin-vnc remmina-pl...
Dima Panov
fluffy at FreeBSD.org
Wed Jan 15 05:44:47 UTC 2014
Author: fluffy
Date: Wed Jan 15 05:44:43 2014
New Revision: 339755
URL: http://svnweb.freebsd.org/changeset/ports/339755
QAT: https://qat.redports.org/buildarchive/r339755/
Log:
- Update FreeRDP to 1.1.0.2013070101 beta release
- Update Remmina and Remmina plugins collection to git commit b6a55ae
- Use new style for LIB_DEPENDS
- Stagify
Added:
head/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c
- copied, changed from r339752, head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c
head/net/freerdp/files/patch-libfreerdp-locale-timezone.c (contents, props changed)
head/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae (contents, props changed)
Deleted:
head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c
head/net/freerdp/files/patch-libfreerdp-codec_CMakeLists.txt
head/net/freerdp/files/patch-libfreerdp-codec_color.c
head/net/freerdp/files/patch-libfreerdp-core_fastpath.c
head/net/freerdp/files/patch-libfreerdp-core_orders.c
head/net/freerdp/files/patch-libfreerdp-gdi_16bpp.c
head/net/freerdp/files/patch-libfreerdp-gdi_32bpp.c
head/net/freerdp/files/patch-libfreerdp-gdi_8bpp.c
head/net/remmina/files/patch-remmina_CMakeFiles.txt
head/net/remmina/files/remmina.desktop
Modified:
head/net/freerdp/Makefile
head/net/freerdp/distinfo
head/net/freerdp/pkg-plist
head/net/remmina-plugin-gnome/Makefile
head/net/remmina-plugin-i18n/Makefile
head/net/remmina-plugin-nx/Makefile
head/net/remmina-plugin-rdp/Makefile
head/net/remmina-plugin-telepathy/Makefile
head/net/remmina-plugin-vnc/Makefile
head/net/remmina-plugin-xdmcp/Makefile
head/net/remmina-plugins/Makefile
head/net/remmina-plugins/bsd.plugin.mk
head/net/remmina-plugins/pkg-plist.plugin
head/net/remmina/Makefile
head/net/remmina/pkg-plist
Modified: head/net/freerdp/Makefile
==============================================================================
--- head/net/freerdp/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/freerdp/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= freerdp
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0.b20130711
+DISTVERSION= 1.1.0-beta+2013071101
CATEGORIES= net comms ipv6
MAINTAINER= fluffy at FreeBSD.org
@@ -17,18 +18,17 @@ USES= cmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
GH_PROJECT= FreeRDP
-GH_COMMIT= 616aed4
+GH_COMMIT= 780d451
GH_TAGNAME= ${GH_COMMIT}
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include
-OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG PULSEAUDIO SSE X11
-OPTIONS_DEFAULT= CUPS PULSEAUDIO X11
+OPTIONS_DEFINE= ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
+OPTIONS_DEFAULT= CUPS GSTREAMER PULSEAUDIO X11
X11_DESC= Build FreeRDP X11 client
DIRECTFB_DESC= Build FreeRDP DirectFB client
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
@@ -43,7 +43,7 @@ PLIST_SUB+= X11="@comment "
.endif
.if ${PORT_OPTIONS:MDIRECTFB}
-LIB_DEPENDS+= directfb:${PORTSDIR}/devel/directfb
+LIB_DEPENDS+= libdirectfb.so:${PORTSDIR}/devel/directfb
CMAKE_ARGS+= -DWITH_DIRECTFB=ON
PLIST_SUB+= DIRECTFB=""
# currently DirectFB option fails with clang
@@ -53,7 +53,7 @@ PLIST_SUB+= DIRECTFB="@comment "
.endif
.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
PLIST_SUB+= ALSA=""
.else
PLIST_SUB+= ALSA="@comment "
@@ -69,20 +69,27 @@ CMAKE_ARGS+= -DWITH_FFMPEG=OFF
PLIST_SUB+= FFMPEG="@comment "
.endif
+.if ${PORT_OPTIONS:MGSTREAMER}
+CMAKE_ARGS+= -DWITH_GSTREAMER=ON
+USE_GSTREAMER= yes
+.else
+CMAKE_ARGS+= -DWITH_GSTREAMER=OFF
+.endif
+
.if ${PORT_OPTIONS:MCUPS}
CMAKE_ARGS+= -DWITH_CUPS=ON
-LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client
.else
CMAKE_ARGS+= -DWITH_CUPS=OFF
.endif
.if ${PORT_OPTIONS:MPULSEAUDIO}
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=ON
-LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
+CMAKE_ARGS+= -DWITH_PULSE=ON
+LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio
PLIST_SUB+= PULSE=""
.else
PLIST_SUB+= PULSE="@comment "
-CMAKE_ARGS+= -DWITH_PULSEAUDIO=OFF
+CMAKE_ARGS+= -DWITH_PULSE=OFF
.endif
.if ${PORT_OPTIONS:MSSE}
@@ -93,7 +100,13 @@ CMAKE_ARGS+= -DWITH_SSE2=OFF
post-extract:
${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
+ -e '/CMAKE_INSTALL_RPATH /d' \
${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
${WRKSRC}/client/X11/CMakeLists.txt
+ ${REINPLACE_CMD} -e 's|HW_AVAILCPU|HW_NCPU|' \
+ ${WRKSRC}/winpr/libwinpr/sysinfo/sysinfo.c
+ ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
+ ${WRKSRC}/winpr/libwinpr/crt/alignment.c \
+ ${WRKSRC}/channels/drive/client/statvfs.c
.include <bsd.port.mk>
Modified: head/net/freerdp/distinfo
==============================================================================
--- head/net/freerdp/distinfo Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/freerdp/distinfo Wed Jan 15 05:44:43 2014 (r339755)
@@ -1,2 +1,2 @@
-SHA256 (freerdp-1.0.2.tar.gz) = 0b12eca36a97327a3202866a08a3afef645e4e4534dfca2138449246fac4ff6a
-SIZE (freerdp-1.0.2.tar.gz) = 3506618
+SHA256 (freerdp-1.1.0-beta+2013071101.tar.gz) = ead34bb077451190abc177c5fda036b74191dba02045d69b59d0b9f29e9a1b38
+SIZE (freerdp-1.1.0-beta+2013071101.tar.gz) = 6677686
Copied and modified: head/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c (from r339752, head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c)
==============================================================================
--- head/net/freerdp/files/patch-channels-drdynvc-tsmf-ffmpeg-tsmf_ffmpeg.c Wed Jan 15 05:00:39 2014 (r339752, copy source)
+++ head/net/freerdp/files/patch-channels-tsmf-client-ffmpeg-tsmf_ffmpeg.c Wed Jan 15 05:44:43 2014 (r339755)
@@ -1,11 +1,11 @@
---- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c.orig 2013-10-25 08:48:35.385869420 -0200
-+++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-10-25 08:54:54.476872888 -0200
-@@ -34,12 +34,16 @@
+--- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2013-07-10 01:00:21.000000000 -0700
++++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2013-08-12 22:26:28.000000000 -0700
+@@ -43,12 +43,20 @@
#define AVMEDIA_TYPE_AUDIO 1
#endif
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
typedef struct _TSMFFFmpegDecoder
@@ -13,24 +13,24 @@
ITSMFDecoder iface;
int media_type;
-- enum CodecID codec_id;
++#if LIBAVCODEC_VERSION_MAJOR > 54
+ enum AVCodecID codec_id;
++#else
+ enum CodecID codec_id;
++#endif
AVCodecContext* codec_context;
AVCodec* codec;
AVFrame* frame;
-@@ -89,13 +93,9 @@
+@@ -99,8 +107,12 @@
mdecoder->codec_context->block_align = media_type->BlockAlign;
#ifdef AV_CPU_FLAG_SSE2
-- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
-+ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+ #else
++ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2);
++#endif
++#else
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+ mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
#else
--#if LIBAVCODEC_VERSION_MAJOR < 53
-- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
--#else
-- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
--#endif
-+ av_set_cpu_flags_mask(FF_MM_SSE2 | FF_MM_MMX2);
- #endif
-
- return true;
Added: head/net/freerdp/files/patch-libfreerdp-locale-timezone.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/freerdp/files/patch-libfreerdp-locale-timezone.c Wed Jan 15 05:44:43 2014 (r339755)
@@ -0,0 +1,14 @@
+--- libfreerdp/locale/timezone.c.orig 2013-07-10 19:00:21.000000000 +1100
++++ libfreerdp/locale/timezone.c 2014-01-08 03:32:36.919691015 +1100
+@@ -1663,7 +1663,10 @@
+ local_time = localtime(&t);
+
+ #ifdef HAVE_TM_GMTOFF
+- clientTimeZone->bias = timezone / 60;
++ if (local_time->tm_gmtoff >= 0)
++ clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
++ else
++ clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
+ DEBUG_TIMEZONE("tzname[std]: %s, tzname[dst]: %s, timezone: %ld, Daylight: %d", tzname[0], tzname[1], timezone, daylight);
+ #elif defined(sun)
+ if (local_time->tm_isdst > 0)
Modified: head/net/freerdp/pkg-plist
==============================================================================
--- head/net/freerdp/pkg-plist Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/freerdp/pkg-plist Wed Jan 15 05:44:43 2014 (r339755)
@@ -1,22 +1,48 @@
%%DIRECTFB%%bin/dfreerdp
bin/xfreerdp
+include/freerdp/addin.h
include/freerdp/altsec.h
include/freerdp/api.h
include/freerdp/cache/bitmap.h
include/freerdp/cache/brush.h
include/freerdp/cache/cache.h
include/freerdp/cache/glyph.h
+include/freerdp/cache/nine_grid.h
include/freerdp/cache/offscreen.h
include/freerdp/cache/palette.h
include/freerdp/cache/pointer.h
include/freerdp/channels/channels.h
+include/freerdp/channels/rdpdr.h
+include/freerdp/channels/rdpsnd.h
include/freerdp/channels/wtsvc.h
+include/freerdp/client.h
+include/freerdp/client/channels.h
+include/freerdp/client/cliprdr.h
+include/freerdp/client/cmdline.h
+include/freerdp/client/drdynvc.h
+include/freerdp/client/file.h
+include/freerdp/client/rdpei.h
+include/freerdp/client/tsmf.h
+include/freerdp/codec/audio.h
include/freerdp/codec/bitmap.h
include/freerdp/codec/color.h
+include/freerdp/codec/dsp.h
+include/freerdp/codec/jpeg.h
+include/freerdp/codec/mppc_dec.h
+include/freerdp/codec/mppc_enc.h
include/freerdp/codec/nsc.h
include/freerdp/codec/rfx.h
include/freerdp/constants.h
+include/freerdp/crypto/ber.h
+include/freerdp/crypto/certificate.h
+include/freerdp/crypto/crypto.h
+include/freerdp/crypto/der.h
+include/freerdp/crypto/er.h
+include/freerdp/crypto/per.h
+include/freerdp/crypto/tls.h
include/freerdp/dvc.h
+include/freerdp/error.h
+include/freerdp/event.h
include/freerdp/extension.h
include/freerdp/freerdp.h
include/freerdp/gdi/16bpp.h
@@ -35,131 +61,232 @@ include/freerdp/gdi/region.h
include/freerdp/gdi/shape.h
include/freerdp/graphics.h
include/freerdp/input.h
-include/freerdp/kbd/kbd.h
-include/freerdp/kbd/layouts.h
-include/freerdp/kbd/locales.h
-include/freerdp/kbd/vkcodes.h
include/freerdp/listener.h
+include/freerdp/locale/keyboard.h
+include/freerdp/locale/locale.h
+include/freerdp/locale/timezone.h
+include/freerdp/message.h
include/freerdp/peer.h
-include/freerdp/plugins/cliprdr.h
-include/freerdp/plugins/tsmf.h
include/freerdp/pointer.h
include/freerdp/primary.h
+include/freerdp/primitives.h
include/freerdp/rail.h
include/freerdp/rail/icon.h
include/freerdp/rail/rail.h
include/freerdp/rail/window.h
include/freerdp/rail/window_list.h
+include/freerdp/scancode.h
include/freerdp/secondary.h
+include/freerdp/server/audin.h
+include/freerdp/server/channels.h
+include/freerdp/server/rdpsnd.h
include/freerdp/settings.h
include/freerdp/svc.h
include/freerdp/types.h
include/freerdp/update.h
-include/freerdp/utils/args.h
include/freerdp/utils/bitmap.h
-include/freerdp/utils/blob.h
include/freerdp/utils/debug.h
-include/freerdp/utils/dsp.h
include/freerdp/utils/event.h
-include/freerdp/utils/file.h
-include/freerdp/utils/hexdump.h
include/freerdp/utils/list.h
-include/freerdp/utils/load_plugin.h
-include/freerdp/utils/memory.h
-include/freerdp/utils/mutex.h
+include/freerdp/utils/msusb.h
include/freerdp/utils/passphrase.h
include/freerdp/utils/pcap.h
-include/freerdp/utils/print.h
include/freerdp/utils/profiler.h
include/freerdp/utils/rail.h
-include/freerdp/utils/rect.h
-include/freerdp/utils/registry.h
-include/freerdp/utils/semaphore.h
include/freerdp/utils/signal.h
-include/freerdp/utils/sleep.h
include/freerdp/utils/stopwatch.h
-include/freerdp/utils/stream.h
-include/freerdp/utils/string.h
include/freerdp/utils/svc_plugin.h
-include/freerdp/utils/thread.h
-include/freerdp/utils/unicode.h
-include/freerdp/utils/wait_obj.h
+include/freerdp/utils/tcp.h
+include/freerdp/utils/time.h
+include/freerdp/utils/uds.h
include/freerdp/window.h
-%%ALSA%%lib/freerdp/audin_alsa.so
-%%ALSA%%lib/freerdp/tsmf_alsa.so
-%%ALSA%%lib/freerdp/rdpsnd_alsa.so
-%%PULSE%%lib/freerdp/audin_pulse.so
-%%PULSE%%lib/freerdp/rdpsnd_pulse.so
-%%PULSE%%lib/freerdp/tsmf_pulse.so
-%%FFMPEG%%lib/freerdp/tsmf_ffmpeg.so
-lib/freerdp/audin.so
-lib/freerdp/cliprdr.so
-lib/freerdp/disk.so
-lib/freerdp/drdynvc.so
-lib/freerdp/parallel.so
-lib/freerdp/printer.so
-lib/freerdp/rail.so
-lib/freerdp/rdpdbg.so
-lib/freerdp/rdpdr.so
-lib/freerdp/rdpsnd.so
-lib/freerdp/serial.so
-lib/freerdp/tsmf.so
+include/winpr/asn1.h
+include/winpr/bcrypt.h
+include/winpr/cmdline.h
+include/winpr/collections.h
+include/winpr/config.h
+include/winpr/credentials.h
+include/winpr/credui.h
+include/winpr/crt.h
+include/winpr/crypto.h
+include/winpr/dsparse.h
+include/winpr/endian.h
+include/winpr/environment.h
+include/winpr/error.h
+include/winpr/file.h
+include/winpr/handle.h
+include/winpr/heap.h
+include/winpr/input.h
+include/winpr/interlocked.h
+include/winpr/io.h
+include/winpr/library.h
+include/winpr/memory.h
+include/winpr/midl.h
+include/winpr/ndr.h
+include/winpr/ntlm.h
+include/winpr/path.h
+include/winpr/pipe.h
+include/winpr/platform.h
+include/winpr/pool.h
+include/winpr/print.h
+include/winpr/registry.h
+include/winpr/rpc.h
+include/winpr/sam.h
+include/winpr/schannel.h
+include/winpr/security.h
+include/winpr/spec.h
+include/winpr/sspi.h
+include/winpr/sspicli.h
+include/winpr/stream.h
+include/winpr/string.h
+include/winpr/synch.h
+include/winpr/sysinfo.h
+include/winpr/tchar.h
+include/winpr/thread.h
+include/winpr/timezone.h
+include/winpr/windows.h
+include/winpr/winhttp.h
+include/winpr/winpr.h
+include/winpr/winsock.h
+include/winpr/wtypes.h
lib/libfreerdp-cache.so
-lib/libfreerdp-cache.so.1.0
-lib/libfreerdp-cache.so.1.0.2
-lib/libfreerdp-channels.so
-lib/libfreerdp-channels.so.1.0
-lib/libfreerdp-channels.so.1.0.2
+lib/libfreerdp-cache.so.1.1
+lib/libfreerdp-cache.so.1.1.0
+lib/libfreerdp-client.so
+lib/libfreerdp-client.so.1.1
+lib/libfreerdp-client.so.1.1.0
lib/libfreerdp-codec.so
-lib/libfreerdp-codec.so.1.0
-lib/libfreerdp-codec.so.1.0.2
+lib/libfreerdp-codec.so.1.1
+lib/libfreerdp-codec.so.1.1.0
+lib/libfreerdp-common.so
+lib/libfreerdp-common.so.1.1.0
+lib/libfreerdp-common.so.1.1.0-beta1
lib/libfreerdp-core.so
-lib/libfreerdp-core.so.1.0
-lib/libfreerdp-core.so.1.0.2
+lib/libfreerdp-core.so.1.1
+lib/libfreerdp-core.so.1.1.0
+lib/libfreerdp-crypto.so
+lib/libfreerdp-crypto.so.1.1
+lib/libfreerdp-crypto.so.1.1.0
lib/libfreerdp-gdi.so
-lib/libfreerdp-gdi.so.1.0
-lib/libfreerdp-gdi.so.1.0.2
-lib/libfreerdp-kbd.so
-lib/libfreerdp-kbd.so.1.0
-lib/libfreerdp-kbd.so.1.0.2
+lib/libfreerdp-gdi.so.1.1
+lib/libfreerdp-gdi.so.1.1.0
+lib/libfreerdp-locale.so
+lib/libfreerdp-locale.so.1.1
+lib/libfreerdp-locale.so.1.1.0
+lib/libfreerdp-primitives.so
+lib/libfreerdp-primitives.so.1.1
+lib/libfreerdp-primitives.so.1.1.0
lib/libfreerdp-rail.so
-lib/libfreerdp-rail.so.1.0
-lib/libfreerdp-rail.so.1.0.2
+lib/libfreerdp-rail.so.1.1
+lib/libfreerdp-rail.so.1.1.0
lib/libfreerdp-utils.so
-lib/libfreerdp-utils.so.1.0
-lib/libfreerdp-utils.so.1.0.2
+lib/libfreerdp-utils.so.1.1
+lib/libfreerdp-utils.so.1.1.0
+lib/libwinpr-asn1.so
+lib/libwinpr-asn1.so.0.1
+lib/libwinpr-asn1.so.0.1.0
+lib/libwinpr-bcrypt.so
+lib/libwinpr-bcrypt.so.0.1
+lib/libwinpr-bcrypt.so.0.1.0
+lib/libwinpr-credentials.so
+lib/libwinpr-credentials.so.0.1
+lib/libwinpr-credentials.so.0.1.0
+lib/libwinpr-credui.so
+lib/libwinpr-credui.so.0.1
+lib/libwinpr-credui.so.0.1.0
+lib/libwinpr-crt.so
+lib/libwinpr-crt.so.0.1
+lib/libwinpr-crt.so.0.1.0
+lib/libwinpr-crypto.so
+lib/libwinpr-crypto.so.0.1
+lib/libwinpr-crypto.so.0.1.0
+lib/libwinpr-dsparse.so
+lib/libwinpr-dsparse.so.0.1
+lib/libwinpr-dsparse.so.0.1.0
+lib/libwinpr-environment.so
+lib/libwinpr-environment.so.0.1
+lib/libwinpr-environment.so.0.1.0
+lib/libwinpr-error.so
+lib/libwinpr-error.so.0.1
+lib/libwinpr-error.so.0.1.0
+lib/libwinpr-file.so
+lib/libwinpr-file.so.0.1
+lib/libwinpr-file.so.0.1.0
+lib/libwinpr-handle.so
+lib/libwinpr-handle.so.0.1
+lib/libwinpr-handle.so.0.1.0
+lib/libwinpr-heap.so
+lib/libwinpr-heap.so.0.1
+lib/libwinpr-heap.so.0.1.0
+lib/libwinpr-input.so
+lib/libwinpr-input.so.0.1
+lib/libwinpr-input.so.0.1.0
+lib/libwinpr-interlocked.so
+lib/libwinpr-interlocked.so.0.1
+lib/libwinpr-interlocked.so.0.1.0
+lib/libwinpr-io.so
+lib/libwinpr-io.so.0.1
+lib/libwinpr-io.so.0.1.0
+lib/libwinpr-library.so
+lib/libwinpr-library.so.0.1
+lib/libwinpr-library.so.0.1.0
+lib/libwinpr-makecert-tool.a
+lib/libwinpr-path.so
+lib/libwinpr-path.so.0.1
+lib/libwinpr-path.so.0.1.0
+lib/libwinpr-pipe.so
+lib/libwinpr-pipe.so.0.1
+lib/libwinpr-pipe.so.0.1.0
+lib/libwinpr-pool.so
+lib/libwinpr-pool.so.0.1
+lib/libwinpr-pool.so.0.1.0
+lib/libwinpr-registry.so
+lib/libwinpr-registry.so.0.1
+lib/libwinpr-registry.so.0.1.0
+lib/libwinpr-rpc.so
+lib/libwinpr-rpc.so.0.1
+lib/libwinpr-rpc.so.0.1.0
+lib/libwinpr-sspi.so
+lib/libwinpr-sspi.so.0.1
+lib/libwinpr-sspi.so.0.1.0
+lib/libwinpr-sspicli.so
+lib/libwinpr-sspicli.so.0.1
+lib/libwinpr-sspicli.so.0.1.0
+lib/libwinpr-synch.so
+lib/libwinpr-synch.so.0.1
+lib/libwinpr-synch.so.0.1.0
+lib/libwinpr-sysinfo.so
+lib/libwinpr-sysinfo.so.0.1
+lib/libwinpr-sysinfo.so.0.1.0
+lib/libwinpr-thread.so
+lib/libwinpr-thread.so.0.1
+lib/libwinpr-thread.so.0.1.0
+lib/libwinpr-timezone.so
+lib/libwinpr-timezone.so.0.1
+lib/libwinpr-timezone.so.0.1.0
+lib/libwinpr-utils.so
+lib/libwinpr-utils.so.0.1
+lib/libwinpr-utils.so.0.1.0
+lib/libwinpr-winhttp.so
+lib/libwinpr-winhttp.so.0.1
+lib/libwinpr-winhttp.so.0.1.0
+lib/libwinpr-winsock.so
+lib/libwinpr-winsock.so.0.1
+lib/libwinpr-winsock.so.0.1.0
+lib/libxfreerdp-client.so
+lib/libxfreerdp-client.so.1.1
+lib/libxfreerdp-client.so.1.1.0
libdata/pkgconfig/freerdp.pc
-%%DATADIR%%/keymaps/aliases
-%%DATADIR%%/keymaps/amiga
-%%DATADIR%%/keymaps/ataritt
-%%DATADIR%%/keymaps/digital_vndr/lk
-%%DATADIR%%/keymaps/digital_vndr/pc
-%%DATADIR%%/keymaps/empty
-%%DATADIR%%/keymaps/evdev
-%%DATADIR%%/keymaps/fujitsu
-%%DATADIR%%/keymaps/hp
-%%DATADIR%%/keymaps/ibm
-%%DATADIR%%/keymaps/macintosh
-%%DATADIR%%/keymaps/macosx
-%%DATADIR%%/keymaps/sgi_vndr/indigo
-%%DATADIR%%/keymaps/sgi_vndr/indy
-%%DATADIR%%/keymaps/sgi_vndr/iris
-%%DATADIR%%/keymaps/sony
-%%DATADIR%%/keymaps/sun
-%%DATADIR%%/keymaps/xfree86
-%%DATADIR%%/keymaps/xfree98
-%%DATADIR%%/keymaps/xkb.pl
+man/man1/xfreerdp.1.gz
+ at dirrmtry include/winpr
@dirrmtry include/freerdp/utils
- at dirrmtry include/freerdp/channels
- at dirrmtry include/freerdp/cache
- at dirrmtry include/freerdp/gdi
- at dirrmtry include/freerdp/kbd
+ at dirrmtry include/freerdp/server
@dirrmtry include/freerdp/rail
+ at dirrmtry include/freerdp/locale
+ at dirrmtry include/freerdp/gdi
+ at dirrmtry include/freerdp/crypto
@dirrmtry include/freerdp/codec
- at dirrmtry include/freerdp/plugins
+ at dirrmtry include/freerdp/client
+ at dirrmtry include/freerdp/channels
+ at dirrmtry include/freerdp/cache
@dirrmtry include/freerdp
- at dirrmtry lib/freerdp
- at dirrmtry %%DATADIR%%/keymaps/digital_vndr
- at dirrmtry %%DATADIR%%/keymaps/sgi_vndr
- at dirrmtry %%DATADIR%%/keymaps
- at dirrmtry %%DATADIR%%
Modified: head/net/remmina-plugin-gnome/Makefile
==============================================================================
--- head/net/remmina-plugin-gnome/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-gnome/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -10,5 +10,4 @@ LIB_DEPENDS= gnome-keyring:${PORTSDIR}/s
MASTERDIR= ${.CURDIR}/../remmina-plugins
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-i18n/Makefile
==============================================================================
--- head/net/remmina-plugin-i18n/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-i18n/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -9,5 +9,4 @@ MASTERDIR= ${.CURDIR}/../remmina-plugins
USES+= gettext
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-nx/Makefile
==============================================================================
--- head/net/remmina-plugin-nx/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-nx/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -10,7 +10,6 @@ USE_XORG+= xkbfile
MASTERDIR= ${.CURDIR}/../remmina-plugins
-WITH_NX= yes
+PLIST_SUB+= ICONS="" SSH="@comment "
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-rdp/Makefile
==============================================================================
--- head/net/remmina-plugin-rdp/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-rdp/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -10,5 +10,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
MASTERDIR= ${.CURDIR}/../remmina-plugins
-NO_STAGE= yes
+PLIST_SUB+= ICONS="" SSH=""
+
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-telepathy/Makefile
==============================================================================
--- head/net/remmina-plugin-telepathy/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-telepathy/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -5,11 +5,11 @@ PKGNAMESUFFIX= -telepathy
COMMENT= Remmina plugin for Telepathy support
+USE_GNOME+= gtk30
LIB_DEPENDS= telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
MASTERDIR= ${.CURDIR}/../remmina-plugins
-WITH_TELEP= yes
+PLIST_SUB+= ICONS="@comment "
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-vnc/Makefile
==============================================================================
--- head/net/remmina-plugin-vnc/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-vnc/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -11,5 +11,6 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic
MASTERDIR= ${.CURDIR}/../remmina-plugins
-NO_STAGE= yes
+PLIST_SUB+= ICONS="" SSH=""
+
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugin-xdmcp/Makefile
==============================================================================
--- head/net/remmina-plugin-xdmcp/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugin-xdmcp/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -9,5 +9,6 @@ RUN_DEPENDS= Xephyr:${PORTSDIR}/x11-serv
MASTERDIR= ${.CURDIR}/../remmina-plugins
-NO_STAGE= yes
+PLIST_SUB+= ICONS="" SSH=""
+
.include "${MASTERDIR}/Makefile"
Modified: head/net/remmina-plugins/Makefile
==============================================================================
--- head/net/remmina-plugins/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugins/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -3,6 +3,7 @@
PORTNAME?= remmina-plugins
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= net gnome
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
@@ -15,7 +16,6 @@ DISTNAME= remmina-${PORTVERSION}
MAINTAINER?= fluffy at FreeBSD.org
COMMENT?= Remmina plugin system
-NO_STAGE= yes
.if defined(PKGNAMESUFFIX)
.include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
.else
Modified: head/net/remmina-plugins/bsd.plugin.mk
==============================================================================
--- head/net/remmina-plugins/bsd.plugin.mk Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugins/bsd.plugin.mk Wed Jan 15 05:44:43 2014 (r339755)
@@ -1,9 +1,9 @@
.if defined(PKGNAMESUFFIX)
PORTNAME= remmina-plugin
+PATCHDIR= ${.CURDIR}/../remmina/files
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/${PORTNAME}s/COPYING
BUILD_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
RUN_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
@@ -23,38 +23,32 @@ CMAKE_ARGS+= --build=build
# prefer gtk2 rather than gtk3
CMAKE_ARGS+= -DGTK_VERSION=2
-.include <bsd.port.pre.mk>
+SSH_DESC= Build with SSH tunneling support
-.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
-PLIST= ${.CURDIR}/pkg-plist
-.else
-PLIST_SUB+= PLUGIN="${PKGNAMESUFFIX:S,-,,}"
-PLIST= ${PKGDIR}/pkg-plist.plugin
+.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MTELEP}
-PLIST_SUB+= TELEP="" ICONS="@comment "
-.else
-PLIST_SUB+= TELEP="@comment " ICONS=""
-.endif
-.if ${PORT_OPTIONS:MTELEP}
-LIB_DEPENDS+= ssh.4:${PORTSDIR}/security/libssh
-PLIST_SUB+= SSH="@comment "
+.if ${PORT_OPTIONS:MSSH}
+LIB_DEPENDS+= libssh.so:${PORTSDIR}/security/libssh
+PLIST_SUB+= SSH=""
.if ${OSVERSION} >= 800040
LDFLAGS+= -fstack-protector
.endif
.else
-PLIST_SUB+= SSH=""
-.endif
-.if ${PORT_OPTIONS:MNX}
-PLIST_SUB+= ICONS="" SSH="@comment "
-.else
-PLIST_SUB+= ICONS="@comment "
+CMAKE_ARGS+= -DWITH_LIBSSH=OFF
+PLIST_SUB+= SSH="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
RUN_DEPENDS+= ${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
.endif
+.include <bsd.port.pre.mk>
+
+.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
+PLIST= ${.CURDIR}/pkg-plist
+.else
+PLIST_SUB+= PLUGIN="${PKGNAMESUFFIX:S,-,,}"
+PLIST= ${PKGDIR}/pkg-plist.plugin
.endif
post-patch:
@@ -76,7 +70,7 @@ post-patch:
.endif
.if ${PKGNAMESUFFIX:S,-,,} != "vnc"
${REINPLACE_CMD} -e 's|find_suggested_package(GCRYPT)||' ${WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e 's|add_subdirectory(vnc/libvncserver)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e' s|find_required_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
${REINPLACE_CMD} -e 's|add_subdirectory(vnc)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
.endif
.if ${PKGNAMESUFFIX:S,-,,} != "xdmcp"
Modified: head/net/remmina-plugins/pkg-plist.plugin
==============================================================================
--- head/net/remmina-plugins/pkg-plist.plugin Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina-plugins/pkg-plist.plugin Wed Jan 15 05:44:43 2014 (r339755)
@@ -1,15 +1,8 @@
lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
-%%ICONS%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
-%%ICONS%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
- at dirrmtry share/remmina/icons/hicolor/22x22/emblems
- at dirrmtry share/remmina/icons/hicolor/22x22
- at dirrmtry share/remmina/icons/hicolor/16x16/emblems
- at dirrmtry share/remmina/icons/hicolor/16x16
- at dirrmtry share/remmina/icons/hicolor
- at dirrmtry share/remmina/icons
- at dirrmtry share/remmina
+%%ICONS%%%%SSH%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
+%%ICONS%%%%SSH%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
@dirrmtry lib/remmina/plugins
@dirrmtry lib/remmina
@dirrmtry include/remmina
Modified: head/net/remmina/Makefile
==============================================================================
--- head/net/remmina/Makefile Wed Jan 15 05:36:17 2014 (r339754)
+++ head/net/remmina/Makefile Wed Jan 15 05:44:43 2014 (r339755)
@@ -3,19 +3,19 @@
PORTNAME= remmina
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= net gnome
MAINTAINER= fluffy at FreeBSD.org
COMMENT= The GTK+ Remote Desktop Client
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/${PORTNAME}/COPYING
USES= cmake desktop-file-utils gmake pkgconfig
USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib -lX11 \
- -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0
+ -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lgtk-x11-2.0
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
SUB_FILES= pkg-message
@@ -34,7 +34,6 @@ TERM_DESC= Build with terminal support
AVAHI_DESC= Build with Avahi support
UNIQUE_DESC= Build with Unique-App support
-NO_STAGE= yes
.include <bsd.port.options.mk>
CMAKE_ARGS+= --build=build
@@ -50,8 +49,7 @@ PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MSSH}
-BUILD_DEPENDS+= ${LOCALBASE}/include/libssh/libssh.h:${PORTSDIR}/security/libssh
-RUN_DEPENDS+= ${LOCALBASE}/lib/libssh.so.4:${PORTSDIR}/security/libssh
+LIB_DEPENDS+= libssh.so:${PORTSDIR}/security/libssh
.if ${OSVERSION} >= 800040
LDFLAGS+= -fstack-protector
.endif
@@ -60,7 +58,7 @@ CMAKE_ARGS+= -DWITH_LIBSSH=OFF
.endif
.if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt
.else
CMAKE_ARGS+= -DWITH_GCRYPT=OFF
.endif
@@ -72,32 +70,29 @@ CMAKE_ARGS+= -DWITH_VTE=OFF
.endif
.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+= avahi-ui:${PORTSDIR}/net/avahi-gtk
+LIB_DEPENDS+= libavahi-ui.so:${PORTSDIR}/net/avahi-gtk
.else
CMAKE_ARGS+= -DWITH_AVAHI=OFF
.endif
.if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+= unique:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS+= libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
.else
CMAKE_ARGS+= -DWITH_UNIQUE=OFF
.endif
post-patch:
- @# fit avahi to current PORTVERSION
- ${REINPLACE_CMD} -e's|avahi-ui>=0.6.30|avahi-ui>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake
- ${REINPLACE_CMD} -e's|avahi-client>=0.6.30|avahi-client>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake
- @# do not build plugins and locales , they are provided by separated ports
+ # fix pkgconfig
+ ${REINPLACE_CMD} -e 's,$${CMAKE_INSTALL_LIBDIR}/pkgconfig,libdata/pkgconfig,' ${WRKSRC}/remmina/CMakeLists.txt
+ # do not build plugins and locales , they are provided by separated ports
${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' ${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt
+ ${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' ${WRKSRC}/remmina/CMakeLists.txt
.if !${PORT_OPTIONS:MNLS}
${REINPLACE_CMD} -e's|add_subdirectory(po)||' ${WRKSRC}/remmina/CMakeLists.txt
.endif
post-install:
- @# localized desktop entry file is not included remmina 1.0.0, install manually
- ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications/
- ${CP} -a ${DATADIR}/icons/ ${PREFIX}/share/icons
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Added: head/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina/files/patch-FreeRDP-Remmina-b6a55ae Wed Jan 15 05:44:43 2014 (r339755)
@@ -0,0 +1,28664 @@
+diff -urN AUTHORS AUTHORS
+--- AUTHORS 1970-01-01 10:00:00.000000000 +1000
++++ AUTHORS 2014-01-08 02:31:52.000000000 +1100
+@@ -0,0 +1,4 @@
++Please check the application About dialog or the official web site for a full list of authors.
++
++http://remmina.sourceforge.net/contact.shtml
++
+diff -urN CMakeLists.txt CMakeLists.txt
+--- CMakeLists.txt 2012-02-11 05:54:23.000000000 +1100
++++ CMakeLists.txt 2014-01-08 02:31:52.000000000 +1100
+@@ -17,7 +17,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330,
+ # Boston, MA 02111-1307, USA.
+
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8)
+ set(CMAKE_COLOR_MAKEFILE ON)
+ project(Remmina C)
+
+@@ -25,23 +25,17 @@
+ include(CheckLibraryExists)
+ include(FindPkgConfig)
+ include(CheckCCompilerFlag)
++include(GNUInstallDirs)
+
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+
+ include(FindOptionalPackage)
++include(ConfigOptions)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+- set(CMAKE_INSTALL_LIBDIR "lib")
+-endif()
+-
+-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+- set(CMAKE_INSTALL_BINDIR "bin")
+-endif()
+-
+ if(NOT BUILD_SHARED_LIBS)
+ set(BUILD_SHARED_LIBS ON)
+ endif()
+@@ -77,34 +71,35 @@
+ include_directories(.)
+ include_directories(remmina/include)
+
+-set(REMMINA_VERSION "0.9.99.1")
+-set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina")
+-set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
+-set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
++set(REMMINA_VERSION "1.0.0")
++set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
++set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
++set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins")
+
++find_required_package(GTK)
+ find_suggested_package(PTHREAD)
++find_suggested_package(GCRYPT)
++find_suggested_package(AVAHI)
++
+ if(PTHREAD_FOUND)
+ add_definitions(-DHAVE_PTHREAD)
+ endif()
+
+-find_suggested_package(GCRYPT)
+ if(GCRYPT_FOUND)
+ add_definitions(-DHAVE_LIBGCRYPT)
+ endif()
+
+-find_required_package(GTK)
++if(AVAHI_FOUND)
++ add_definitions(-DHAVE_LIBAVAHI_UI)
++ add_definitions(-DHAVE_LIBAVAHI_CLIENT)
++endif()
++
+ if(GTK_FOUND)
+ add_subdirectory(remmina)
+ add_subdirectory(remmina-plugins)
+ add_subdirectory(remmina-plugins-gnome)
+ endif()
+
+-find_suggested_package(AVAHI)
+-if(AVAHI_FOUND)
+- add_definitions(-DHAVE_LIBAVAHI_UI)
+- add_definitions(-DHAVE_LIBAVAHI_CLIENT)
+-endif()
+-
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+
+ install(DIRECTORY include/remmina DESTINATION include/remmina FILES_MATCHING PATTERN "*.h")
+diff -urN COPYING COPYING
+--- COPYING 1970-01-01 10:00:00.000000000 +1000
++++ COPYING 2014-01-08 02:31:52.000000000 +1100
+@@ -0,0 +1,340 @@
++ GNU GENERAL PUBLIC LICENSE
++ Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++ Preamble
++
++ The licenses for most software are designed to take away your
++freedom to share and change it. By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software--to make sure the software is free for all its users. This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it. (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.) You can apply it to
++your programs, too.
++
++ When we speak of free software, we are referring to freedom, not
++price. Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++ To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++ For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have. You must make sure that they, too, receive or can get the
++source code. And you must show them these terms so they know their
++rights.
++
++ We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++ Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software. If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++ Finally, any free program is threatened constantly by software
++patents. We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary. To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++ The precise terms and conditions for copying, distribution and
++modification follow.
++
++ GNU GENERAL PUBLIC LICENSE
++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++ 0. This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License. The "Program", below,
++refers to any such program or work, and a "work based on the Program"
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list