Merge -rdp into -main.

Discussed with jasper@ (maintainer)
This commit is contained in:
ajacoutot 2012-05-22 08:46:16 +00:00
parent 2e709ae75d
commit f71a21af66
5 changed files with 17 additions and 31 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2012/05/22 08:02:36 mpi Exp $
# $OpenBSD: Makefile,v 1.4 2012/05/22 08:46:16 ajacoutot Exp $
# from upstream, removed at next update
MASTER_SITES0= https://github.com/FreeRDP/Remmina/commit/
@ -8,17 +8,14 @@ PATCHFILES= 569d9bb702d06c061dfbbf3c590d57ea83a04369.diff:0 \
SHARED_ONLY?= Yes
COMMENT-main= GTK+2 remote desktop client
COMMENT-rdp= GTK+2 remote desktop client, RDP plugin
COMMENT= GTK+2 remote desktop client
V= 1.0.0
DISTNAME= Remmina-${V}
PKGNAME= ${DISTNAME:L}
WRKDIST= ${WRKDIR}/FreeRDP-Remmina-356c033
PKGNAME-main= ${DISTNAME:L}
PKGNAME-rdp= remmina-plugins-rdp-${V}
REVISION-main= 0
REVISION= 1
CATEGORIES= x11 net
@ -32,40 +29,30 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= https://github.com/FreeRDP/Remmina/downloads/
MODULES= devel/cmake \
devel/gettext \
textproc/intltool
MULTI_PACKAGES= -main -rdp
cWANTLIB += atk-1.0 cairo gdk-3 glib-2.0 gtk-3 pango-1.0
WANTLIB-main += ${cWANTLIB} intl # XXX no iconv?
WANTLIB-main += X11 c gcrypt gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 gnome-keyring
WANTLIB-main += gobject-2.0 gthread-2.0 pthread vte2_90 jpeg z telepathy-glib
WANTLIB-main += util xkbfile ssh
WANTLIB-rdp += ${cWANTLIB}
WANTLIB-rdp += freerdp-channels freerdp-codec freerdp-core freerdp-gdi
WANTLIB-rdp += freerdp-kbd freerdp-rail
# XXX no iconv?
WANTLIB += atk-1.0 cairo gdk-3 glib-2.0 gtk-3 pango-1.0
WANTLIB += X11 c gcrypt gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 gnome-keyring
WANTLIB += gobject-2.0 gthread-2.0 pthread vte2_90 jpeg z telepathy-glib
WANTLIB += util xkbfile ssh freerdp-kbd freerdp-rail
WANTLIB += freerdp-channels freerdp-codec freerdp-core freerdp-gdi
BUILD_DEPENDS= net/avahi,-gtk3
LIB_DEPENDS-main= devel/vte3 \
LIB_DEPENDS= devel/vte3 \
security/libssh \
x11/freerdp>=1.0 \
net/telepathy/telepathy-glib \
x11/gnome/libgnome-keyring
RUN_DEPENDS-main= devel/desktop-file-utils \
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+2,-guic
RUN_DEPENDS-rdp= ${BASE_PKGPATH},-main
LIB_DEPENDS-rdp= x11/gtk+3 \
x11/freerdp>=1.0
# pax_global_header
TAR= ${LOCALBASE}/bin/gtar
BUILD_DEPENDS += archivers/gtar

View File

@ -1 +0,0 @@
Plugin for remmina providing RDP support.

View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.2 2012/05/22 08:02:36 mpi Exp $
@comment $OpenBSD: PLIST,v 1.1 2012/05/22 08:46:16 ajacoutot Exp $
@conflict remmina-plugins-*
@conflict remmina-plugins-telepathy-*
@pkgpath x11/remmina,-rdp
@pkgpath x11/remmina/core
@pkgpath x11/remmina/plugins,-main
@pkgpath x11/remmina/plugins,-rdp
@pkgpath x11/remmina/plugins,-telepathy
@bin bin/remmina
include/remmina/
@ -10,6 +12,7 @@ lib/pkgconfig/remmina.pc
lib/remmina/
lib/remmina/plugins/
lib/remmina/plugins/remmina-plugin-nx.so
lib/remmina/plugins/remmina-plugin-rdp.so
lib/remmina/plugins/remmina-plugin-telepathy.so
lib/remmina/plugins/remmina-plugin-vnc.so
lib/remmina/plugins/remmina-plugin-xdmcp.so

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-rdp,v 1.1 2012/02/24 13:48:26 ajacoutot Exp $
@pkgpath x11/remmina/plugins,-rdp
lib/remmina/plugins/remmina-plugin-rdp.so