pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
on second thought, remove wip/freerdp - net/freerdp2 has 2.1.2, but working
Module Name: pkgsrc-wip
Committed By: Jaromir Dolecek <jdolecek%NetBSD.org@localhost>
Pushed By: jdolecek
Date: Sun May 2 09:51:57 2021 +0200
Changeset: e65a4260cccd028bbb11a60f7b9908382664d717
Modified Files:
Makefile
Removed Files:
freerdp/DESCR
freerdp/Makefile
freerdp/PLIST
freerdp/buildlink3.mk
freerdp/distinfo
freerdp/options.mk
freerdp/patches/patch-cmake_InstallFreeRDPMan.cmake
Log Message:
on second thought, remove wip/freerdp - net/freerdp2 has 2.1.2, but working
the upgraded wip/freerdp would require some further work, and that work
was mostly already done in net/freerdp2; better to update the version there
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e65a4260cccd028bbb11a60f7b9908382664d717
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
freerdp/DESCR | 2 -
freerdp/Makefile | 41 ----
freerdp/PLIST | 241 ---------------------
freerdp/buildlink3.mk | 13 --
freerdp/distinfo | 7 -
freerdp/options.mk | 79 -------
.../patches/patch-cmake_InstallFreeRDPMan.cmake | 15 --
8 files changed, 399 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 4b80f42814..1d9aef7c49 100644
--- a/Makefile
+++ b/Makefile
@@ -891,7 +891,6 @@ SUBDIR+= freedup16
SUBDIR+= freefem++
SUBDIR+= freegish-git
SUBDIR+= freej
-SUBDIR+= freerdp
SUBDIR+= freeserf
SUBDIR+= freeswitch-core
SUBDIR+= freeswitch-music
diff --git a/freerdp/DESCR b/freerdp/DESCR
deleted file mode 100644
index d727451fa7..0000000000
--- a/freerdp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
-released under the Apache license.
diff --git a/freerdp/Makefile b/freerdp/Makefile
deleted file mode 100644
index 3c57e52ff3..0000000000
--- a/freerdp/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2018/11/14 22:22:10 kleink Exp $
-
-DISTNAME= freerdp-2.3.2
-PKGNAME= ${DISTNAME:S/-rc/rc/}
-PKGREVISION= # empty
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GITHUB:=FreeRDP/}
-GITHUB_PROJECT= FreeRDP
-GITHUB_TAG= ${PKGVERSION_NOREV:S/rc/-rc/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.freerdp.com/
-COMMENT= Free implementation of the Remote Desktop Protocol
-LICENSE= apache-2.0
-
-TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-#USE_OLD_DES_API= yes
-CMAKE_ARGS+= -DWITH_WAYLAND=OFF
-
-PKGCONFIG_OVERRIDE+= freerdp.pc.in
-
-CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
-
-.include "options.mk"
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb1/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/freerdp/PLIST b/freerdp/PLIST
deleted file mode 100644
index 97e1f52900..0000000000
--- a/freerdp/PLIST
+++ /dev/null
@@ -1,241 +0,0 @@
-@comment $NetBSD$
-bin/winpr-hash
-bin/winpr-makecert
-bin/xfreerdp
-include/freerdp2/freerdp/addin.h
-include/freerdp2/freerdp/altsec.h
-include/freerdp2/freerdp/api.h
-include/freerdp2/freerdp/assistance.h
-include/freerdp2/freerdp/autodetect.h
-include/freerdp2/freerdp/build-config.h
-include/freerdp2/freerdp/cache/bitmap.h
-include/freerdp2/freerdp/cache/brush.h
-include/freerdp2/freerdp/cache/cache.h
-include/freerdp2/freerdp/cache/glyph.h
-include/freerdp2/freerdp/cache/nine_grid.h
-include/freerdp2/freerdp/cache/offscreen.h
-include/freerdp2/freerdp/cache/palette.h
-include/freerdp2/freerdp/cache/pointer.h
-include/freerdp2/freerdp/channels/audin.h
-include/freerdp2/freerdp/channels/channels.h
-include/freerdp2/freerdp/channels/cliprdr.h
-include/freerdp2/freerdp/channels/disp.h
-include/freerdp2/freerdp/channels/echo.h
-include/freerdp2/freerdp/channels/encomsp.h
-include/freerdp2/freerdp/channels/geometry.h
-include/freerdp2/freerdp/channels/log.h
-include/freerdp2/freerdp/channels/rail.h
-include/freerdp2/freerdp/channels/rdpdr.h
-include/freerdp2/freerdp/channels/rdpei.h
-include/freerdp2/freerdp/channels/rdpgfx.h
-include/freerdp2/freerdp/channels/rdpsnd.h
-include/freerdp2/freerdp/channels/remdesk.h
-include/freerdp2/freerdp/channels/tsmf.h
-include/freerdp2/freerdp/channels/urbdrc.h
-include/freerdp2/freerdp/channels/video.h
-include/freerdp2/freerdp/channels/wtsvc.h
-include/freerdp2/freerdp/client.h
-include/freerdp2/freerdp/client/audin.h
-include/freerdp2/freerdp/client/channels.h
-include/freerdp2/freerdp/client/cliprdr.h
-include/freerdp2/freerdp/client/cmdline.h
-include/freerdp2/freerdp/client/disp.h
-include/freerdp2/freerdp/client/drdynvc.h
-include/freerdp2/freerdp/client/encomsp.h
-include/freerdp2/freerdp/client/file.h
-include/freerdp2/freerdp/client/geometry.h
-include/freerdp2/freerdp/client/printer.h
-include/freerdp2/freerdp/client/rail.h
-include/freerdp2/freerdp/client/rdpei.h
-include/freerdp2/freerdp/client/rdpgfx.h
-include/freerdp2/freerdp/client/rdpsnd.h
-include/freerdp2/freerdp/client/remdesk.h
-include/freerdp2/freerdp/client/sshagent.h
-include/freerdp2/freerdp/client/tsmf.h
-include/freerdp2/freerdp/client/video.h
-include/freerdp2/freerdp/codec/audio.h
-include/freerdp2/freerdp/codec/bitmap.h
-include/freerdp2/freerdp/codec/bulk.h
-include/freerdp2/freerdp/codec/clear.h
-include/freerdp2/freerdp/codec/color.h
-include/freerdp2/freerdp/codec/dsp.h
-include/freerdp2/freerdp/codec/h264.h
-include/freerdp2/freerdp/codec/interleaved.h
-include/freerdp2/freerdp/codec/jpeg.h
-include/freerdp2/freerdp/codec/mppc.h
-include/freerdp2/freerdp/codec/ncrush.h
-include/freerdp2/freerdp/codec/nsc.h
-include/freerdp2/freerdp/codec/planar.h
-include/freerdp2/freerdp/codec/progressive.h
-include/freerdp2/freerdp/codec/region.h
-include/freerdp2/freerdp/codec/rfx.h
-include/freerdp2/freerdp/codec/xcrush.h
-include/freerdp2/freerdp/codec/yuv.h
-include/freerdp2/freerdp/codec/zgfx.h
-include/freerdp2/freerdp/codecs.h
-include/freerdp2/freerdp/constants.h
-include/freerdp2/freerdp/crypto/ber.h
-include/freerdp2/freerdp/crypto/certificate.h
-include/freerdp2/freerdp/crypto/crypto.h
-include/freerdp2/freerdp/crypto/der.h
-include/freerdp2/freerdp/crypto/er.h
-include/freerdp2/freerdp/crypto/per.h
-include/freerdp2/freerdp/crypto/tls.h
-include/freerdp2/freerdp/display.h
-include/freerdp2/freerdp/dvc.h
-include/freerdp2/freerdp/error.h
-include/freerdp2/freerdp/event.h
-include/freerdp2/freerdp/extension.h
-include/freerdp2/freerdp/freerdp.h
-include/freerdp2/freerdp/gdi/bitmap.h
-include/freerdp2/freerdp/gdi/dc.h
-include/freerdp2/freerdp/gdi/gdi.h
-include/freerdp2/freerdp/gdi/gfx.h
-include/freerdp2/freerdp/gdi/pen.h
-include/freerdp2/freerdp/gdi/region.h
-include/freerdp2/freerdp/gdi/shape.h
-include/freerdp2/freerdp/gdi/video.h
-include/freerdp2/freerdp/graphics.h
-include/freerdp2/freerdp/heartbeat.h
-include/freerdp2/freerdp/input.h
-include/freerdp2/freerdp/license.h
-include/freerdp2/freerdp/listener.h
-include/freerdp2/freerdp/locale/keyboard.h
-include/freerdp2/freerdp/locale/locale.h
-include/freerdp2/freerdp/log.h
-include/freerdp2/freerdp/message.h
-include/freerdp2/freerdp/metrics.h
-include/freerdp2/freerdp/peer.h
-include/freerdp2/freerdp/pointer.h
-include/freerdp2/freerdp/primary.h
-include/freerdp2/freerdp/primitives.h
-include/freerdp2/freerdp/rail.h
-include/freerdp2/freerdp/scancode.h
-include/freerdp2/freerdp/secondary.h
-include/freerdp2/freerdp/server/audin.h
-include/freerdp2/freerdp/server/channels.h
-include/freerdp2/freerdp/server/cliprdr.h
-include/freerdp2/freerdp/server/disp.h
-include/freerdp2/freerdp/server/drdynvc.h
-include/freerdp2/freerdp/server/echo.h
-include/freerdp2/freerdp/server/encomsp.h
-include/freerdp2/freerdp/server/rail.h
-include/freerdp2/freerdp/server/rdpdr.h
-include/freerdp2/freerdp/server/rdpei.h
-include/freerdp2/freerdp/server/rdpgfx.h
-include/freerdp2/freerdp/server/rdpsnd.h
-include/freerdp2/freerdp/server/remdesk.h
-include/freerdp2/freerdp/server/server-common.h
-include/freerdp2/freerdp/server/shadow.h
-include/freerdp2/freerdp/session.h
-include/freerdp2/freerdp/settings.h
-include/freerdp2/freerdp/svc.h
-include/freerdp2/freerdp/types.h
-include/freerdp2/freerdp/update.h
-include/freerdp2/freerdp/utils/passphrase.h
-include/freerdp2/freerdp/utils/pcap.h
-include/freerdp2/freerdp/utils/profiler.h
-include/freerdp2/freerdp/utils/ringbuffer.h
-include/freerdp2/freerdp/utils/signal.h
-include/freerdp2/freerdp/utils/stopwatch.h
-include/freerdp2/freerdp/version.h
-include/freerdp2/freerdp/window.h
-include/winpr2/winpr/asn1.h
-include/winpr2/winpr/bcrypt.h
-include/winpr2/winpr/bitstream.h
-include/winpr2/winpr/clipboard.h
-include/winpr2/winpr/cmdline.h
-include/winpr2/winpr/collections.h
-include/winpr2/winpr/comm.h
-include/winpr2/winpr/credentials.h
-include/winpr2/winpr/credui.h
-include/winpr2/winpr/crt.h
-include/winpr2/winpr/crypto.h
-include/winpr2/winpr/debug.h
-include/winpr2/winpr/dsparse.h
-include/winpr2/winpr/endian.h
-include/winpr2/winpr/environment.h
-include/winpr2/winpr/error.h
-include/winpr2/winpr/file.h
-include/winpr2/winpr/handle.h
-include/winpr2/winpr/heap.h
-include/winpr2/winpr/image.h
-include/winpr2/winpr/ini.h
-include/winpr2/winpr/input.h
-include/winpr2/winpr/interlocked.h
-include/winpr2/winpr/intrin.h
-include/winpr2/winpr/io.h
-include/winpr2/winpr/library.h
-include/winpr2/winpr/locale.h
-include/winpr2/winpr/memory.h
-include/winpr2/winpr/midl.h
-include/winpr2/winpr/ndr.h
-include/winpr2/winpr/nt.h
-include/winpr2/winpr/ntlm.h
-include/winpr2/winpr/pack.h
-include/winpr2/winpr/path.h
-include/winpr2/winpr/pipe.h
-include/winpr2/winpr/platform.h
-include/winpr2/winpr/pool.h
-include/winpr2/winpr/print.h
-include/winpr2/winpr/registry.h
-include/winpr2/winpr/rpc.h
-include/winpr2/winpr/sam.h
-include/winpr2/winpr/schannel.h
-include/winpr2/winpr/security.h
-include/winpr2/winpr/shell.h
-include/winpr2/winpr/smartcard.h
-include/winpr2/winpr/spec.h
-include/winpr2/winpr/ssl.h
-include/winpr2/winpr/sspi.h
-include/winpr2/winpr/sspicli.h
-include/winpr2/winpr/stream.h
-include/winpr2/winpr/string.h
-include/winpr2/winpr/strlst.h
-include/winpr2/winpr/synch.h
-include/winpr2/winpr/sysinfo.h
-include/winpr2/winpr/tchar.h
-include/winpr2/winpr/thread.h
-include/winpr2/winpr/timezone.h
-include/winpr2/winpr/tools/makecert.h
-include/winpr2/winpr/user.h
-include/winpr2/winpr/version.h
-include/winpr2/winpr/windows.h
-include/winpr2/winpr/winhttp.h
-include/winpr2/winpr/winpr.h
-include/winpr2/winpr/winsock.h
-include/winpr2/winpr/wlog.h
-include/winpr2/winpr/wnd.h
-include/winpr2/winpr/wtsapi.h
-include/winpr2/winpr/wtypes.h
-lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
-lib/cmake/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
-lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets-release.cmake
-lib/cmake/FreeRDP-Client2/FreeRDP-ClientTargets.cmake
-lib/cmake/FreeRDP2/FreeRDPConfig.cmake
-lib/cmake/FreeRDP2/FreeRDPConfigVersion.cmake
-lib/cmake/FreeRDP2/FreeRDPTargets-release.cmake
-lib/cmake/FreeRDP2/FreeRDPTargets.cmake
-lib/cmake/WinPR2/WinPRConfig.cmake
-lib/cmake/WinPR2/WinPRConfigVersion.cmake
-lib/cmake/WinPR2/WinPRTargets-release.cmake
-lib/cmake/WinPR2/WinPRTargets.cmake
-lib/libfreerdp-client2.so
-lib/libfreerdp-client2.so.2
-lib/libfreerdp-client2.so.2.3.2
-lib/libfreerdp2.so
-lib/libfreerdp2.so.2
-lib/libfreerdp2.so.2.3.2
-lib/libwinpr-tools2.so
-lib/libwinpr-tools2.so.2
-lib/libwinpr-tools2.so.2.3.2
-lib/libwinpr2.so
-lib/libwinpr2.so.2
-lib/libwinpr2.so.2.3.2
-lib/pkgconfig/freerdp-client2.pc
-lib/pkgconfig/freerdp2.pc
-lib/pkgconfig/winpr-tools2.pc
-lib/pkgconfig/winpr2.pc
-share/man/man1/winpr-hash.1
-share/man/man1/winpr-makecert.1
-share/man/man7/wlog.7
diff --git a/freerdp/buildlink3.mk b/freerdp/buildlink3.mk
deleted file mode 100644
index af1d4afc3f..0000000000
--- a/freerdp/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/10/07 12:53:20 obache Exp $
-
-BUILDLINK_TREE+= freerdp
-
-.if !defined(FREERDP_BUILDLINK3_MK)
-FREERDP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.freerdp+= freerdp>=1.0.2
-BUILDLINK_PKGSRCDIR.freerdp?= ../../net/freerdp
-
-.endif # FREERDP_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -freerdp
diff --git a/freerdp/distinfo b/freerdp/distinfo
deleted file mode 100644
index 6741fcfd87..0000000000
--- a/freerdp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (freerdp-2.3.2.tar.gz) = 955c0315fe8aa758c9e4c9b5e285cb6d0ac59cf9
-RMD160 (freerdp-2.3.2.tar.gz) = 8f01c603b1c8160371be294cd28fa948079d7efa
-SHA512 (freerdp-2.3.2.tar.gz) = ca22769c1fdf2806a21ed45ff537cbf0b3f515023943316cd089a204cefa284a9ee7a8f1b3fc87ece7c5ea8edff47622b5b4c75eb5833ecf8e478c89f53afe56
-Size (freerdp-2.3.2.tar.gz) = 7240177 bytes
-SHA1 (patch-cmake_InstallFreeRDPMan.cmake) = eb1a386c7b8ab97538fd31e1889edbe6ecbfcff1
diff --git a/freerdp/options.mk b/freerdp/options.mk
deleted file mode 100644
index 081a79e248..0000000000
--- a/freerdp/options.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: options.mk,v 1.7 2017/11/12 15:36:58 khorben Exp $
-#
-PKG_OPTIONS_VAR= PKG_OPTIONS.freerdp
-PKG_SUPPORTED_OPTIONS= alsa cups ffmpeg pcsc pulseaudio debug
-PKG_SUGGESTED_OPTIONS= alsa cups ffmpeg
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= alsa ffmpeg pcsc pulseaudio
-
-# Package-specific option-handling
-
-###
-### ALSA support
-###
-.if !empty(PKG_OPTIONS:Malsa)
-. include "../../audio/alsa-lib/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_ALSA=ON
-PLIST.alsa= yes
-.else
-CMAKE_ARGS+= -DWITH_ALSA=OFF
-.endif
-
-###
-### CUPS support
-###
-.if !empty(PKG_OPTIONS:Mcups)
-. include "../../print/cups-base/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_CUPS=ON
-PLIST.cups= yes
-.else
-CMAKE_ARGS+= -DWITH_CUPS=OFF
-.endif
-
-###
-### FFmpeg support
-###
-.if !empty(PKG_OPTIONS:Mffmpeg)
-. include "../../multimedia/ffmpeg3/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_FFMPEG=ON
-PLIST.ffmpeg= yes
-.else
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
-.endif
-
-###
-### PC/SC support
-###
-.if !empty(PKG_OPTIONS:Mpcsc)
-. include "../../security/pcsc-lite/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_PCSC=ON
-PLIST.pcsc= yes
-.else
-CMAKE_ARGS+= -DWITH_PCSC=OFF
-.endif
-
-###
-### PulseAudio support
-###
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-. include "../../audio/pulseaudio/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_PULSE=ON
-PLIST.pulseaudio= yes
-.else
-CMAKE_ARGS+= -DWITH_PULSE=OFF
-.endif
-
-###
-### Debug support
-###
-.if !empty(PKG_OPTIONS:Mdebug)
-#CMAKE_ARGS+= -DWITH_DEBUG_TRANSPORT=ON
-CMAKE_ARGS+= -DWITH_DEBUG_CHANNELS=ON
-CMAKE_ARGS+= -DWITH_DEBUG_SVC=ON
-CMAKE_ARGS+= -DWITH_DEBUG_DVC=ON
-CMAKE_ARGS+= -DWITH_DEBUG_NEGO=ON
-CMAKE_ARGS+= -DWITH_DEBUG_REDIR=ON
-CMAKE_ARGS+= -DWITH_DEBUG_GDI=ON
-.endif
diff --git a/freerdp/patches/patch-cmake_InstallFreeRDPMan.cmake b/freerdp/patches/patch-cmake_InstallFreeRDPMan.cmake
deleted file mode 100644
index e6e819ffe2..0000000000
--- a/freerdp/patches/patch-cmake_InstallFreeRDPMan.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- cmake/InstallFreeRDPMan.cmake.orig 2021-03-15 12:29:35.000000000 +0000
-+++ cmake/InstallFreeRDPMan.cmake
-@@ -1,9 +1,5 @@
- function(install_freerdp_man manpage section)
- if(WITH_MANPAGES)
-- if(OPENBSD OR FREEBSD)
-- install(FILES ${manpage} DESTINATION man/man${section})
-- else()
-- install(FILES ${manpage} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man${section})
-- endif()
-+ install(FILES ${manpage} DESTINATION share/man/man${section})
- endif()
- endfunction()
Home |
Main Index |
Thread Index |
Old Index