From owner-svn-ports-all@freebsd.org Sat Jun 27 15:15:19 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A31298D2F0; Sat, 27 Jun 2015 15:15:19 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06EA11DAB; Sat, 27 Jun 2015 15:15:19 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RFFIgB019456; Sat, 27 Jun 2015 15:15:18 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5RFFIEX019454; Sat, 27 Jun 2015 15:15:18 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201506271515.t5RFFIEX019454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 27 Jun 2015 15:15:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390719 - head/net/freerdp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 15:15:19 -0000 Author: pi Date: Sat Jun 27 15:15:17 2015 New Revision: 390719 URL: https://svnweb.freebsd.org/changeset/ports/390719 Log: net/freerdp: fix pkg-plist conditionals PR: 198618 Pointy hat to: pi Modified: head/net/freerdp/Makefile head/net/freerdp/pkg-plist Modified: head/net/freerdp/Makefile ============================================================================== --- head/net/freerdp/Makefile Sat Jun 27 14:55:36 2015 (r390718) +++ head/net/freerdp/Makefile Sat Jun 27 15:15:17 2015 (r390719) @@ -3,7 +3,7 @@ PORTNAME= freerdp PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net comms ipv6 MAINTAINER= ports@FreeBSD.org @@ -69,6 +69,10 @@ X11_USE= xorg=x11,xkbfile,xcursor,xextp .include +.if ${PORT_OPTIONS:MDIRECTFB} +BROKEN= DIRECTFB no longer builds +.endif + post-extract: ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ -e '/CMAKE_INSTALL_RPATH /d' \ Modified: head/net/freerdp/pkg-plist ============================================================================== --- head/net/freerdp/pkg-plist Sat Jun 27 14:55:36 2015 (r390718) +++ head/net/freerdp/pkg-plist Sat Jun 27 15:15:17 2015 (r390719) @@ -1,4 +1,4 @@ -bin/xfreerdp +%%X11%%bin/xfreerdp include/freerdp/addin.h include/freerdp/altsec.h include/freerdp/api.h @@ -207,9 +207,9 @@ lib/cmake/WinPR/WinPRConfig.cmake lib/cmake/WinPR/WinPRConfigVersion.cmake lib/cmake/WinPR/WinPRTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/WinPR/WinPRTargets.cmake -lib/freerdp/libaudin-client-alsa.a +%%ALSA%%lib/freerdp/libaudin-client-alsa.a +%%PULSEAUDIO%%lib/freerdp/libaudin-client-pulse.a lib/freerdp/libaudin-client-oss.a -lib/freerdp/libaudin-client-pulse.a lib/freerdp/libaudin-client.a lib/freerdp/libcliprdr-client.a lib/freerdp/libdisp-client.a @@ -218,23 +218,23 @@ lib/freerdp/libdrive-client.a lib/freerdp/libecho-client.a lib/freerdp/libencomsp-client.a lib/freerdp/libparallel-client.a -lib/freerdp/libprinter-client.a +%%CUPS%%lib/freerdp/libprinter-client.a lib/freerdp/librail-client.a lib/freerdp/librdpdr-client.a lib/freerdp/librdpei-client.a lib/freerdp/librdpgfx-client.a -lib/freerdp/librdpsnd-client-alsa.a +%%ALSA%%lib/freerdp/librdpsnd-client-alsa.a lib/freerdp/librdpsnd-client-oss.a -lib/freerdp/librdpsnd-client-pulse.a +%%PULSEAUDIO%%lib/freerdp/librdpsnd-client-pulse.a lib/freerdp/librdpsnd-client.a lib/freerdp/libremdesk-client.a lib/freerdp/libserial-client.a lib/freerdp/libsmartcard-client.a -lib/freerdp/libtsmf-client-alsa-audio.a -lib/freerdp/libtsmf-client-ffmpeg-decoder.a -lib/freerdp/libtsmf-client-gstreamer-decoder.a +%%ALSA%%lib/freerdp/libtsmf-client-alsa-audio.a +%%FFMPEG%%lib/freerdp/libtsmf-client-ffmpeg-decoder.a +%%GSTREAMER%%lib/freerdp/libtsmf-client-gstreamer-decoder.a lib/freerdp/libtsmf-client-oss-audio.a -lib/freerdp/libtsmf-client-pulse-audio.a +%%PULSEAUDIO%%lib/freerdp/libtsmf-client-pulse-audio.a lib/freerdp/libtsmf-client.a lib/libfreerdp-client.so lib/libfreerdp-client.so.1.2 @@ -249,9 +249,9 @@ lib/libwinpr-makecert-tool.a lib/libwinpr.so lib/libwinpr.so.1.1 lib/libwinpr.so.1.1.0 -lib/libxfreerdp-client.so -lib/libxfreerdp-client.so.1.2 -lib/libxfreerdp-client.so.1.2.4 +%%X11%%lib/libxfreerdp-client.so +%%X11%%lib/libxfreerdp-client.so.1.2 +%%X11%%lib/libxfreerdp-client.so.1.2.4 libdata/pkgconfig/freerdp.pc libdata/pkgconfig/winpr.pc -man/man1/xfreerdp.1.gz +%%X11%%man/man1/xfreerdp.1.gz