Re: [Update] FreeRDP 1.0.2

2013-11-04 Thread Mike Erdely 
On Mon, Aug 19, 2013 at 10:32:54AM -0400, Mike Erdely wrote:
 On Mon, Aug 19, 2013 at 10:24 AM, Stuart Henderson st...@openbsd.org wrote:
  DISTFILES=  freerdp-$V.tar.gz{$V.tar.gz}
 
 Thanks.  I'll test it out and come back with a new diff.

I finally got around to this.

ok?

Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile11 Mar 2013 11:46:09 -  1.13
+++ Makefile2 Nov 2013 13:38:06 -
@@ -2,10 +2,12 @@
 
 SHARED_ONLY =  Yes
 
+V =1.0.2
 COMMENT =  open source client for Windows Terminal Server
-DISTNAME = freerdp-1.0.1
+DISTNAME = freerdp-$V
+DISTFILES =${DISTNAME}.tar.gz{$V.tar.gz}
+WRKDIST =  ${WRKDIR}/FreeRDP-$V
 CATEGORIES =   x11 net
-REVISION = 0
 
 SHARED_LIBS +=  freerdp-cache 0.0 # 1.0
 SHARED_LIBS +=  freerdp-channels  0.0 # 1.0
@@ -24,9 +26,9 @@ MAINTAINER =  Michael Erdely merdely@op
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
-WANTLIB += pthread ssl xkbfile z cups
+WANTLIB += pcsclite pthread ssl xkbfile z cups
 
-MASTER_SITES = https://github.com/downloads/FreeRDP/FreeRDP/ \
+MASTER_SITES = https://github.com/FreeRDP/FreeRDP/archive/ \
http://spacehopper.org/mirrors/
 
 MODULES =  devel/cmake
@@ -35,9 +37,11 @@ BUILD_DEPENDS =  textproc/docbook \
textproc/xmlto
 
 LIB_DEPENDS =  graphics/ffmpeg \
-   print/cups,-libs
+   print/cups,-libs \
+   security/pcsc-lite
 
-CONFIGURE_ARGS +=  -DWITH_ALSA=Off
+CONFIGURE_ARGS +=  -DWITH_ALSA=Off \
+   -DWITH_PCSC=On
 
 post-patch:
perl -pi -e 's,/usr/local,${LOCALBASE},g; s,/usr/X11R6,${X11BASE},g;' \
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo24 Mar 2012 18:53:27 -  1.4
+++ distinfo3 Nov 2013 02:19:10 -
@@ -1,5 +1,2 @@
-MD5 (freerdp-1.0.1.tar.gz) = yEMYXg/yLOhAmVRlFxjzOA==
-RMD160 (freerdp-1.0.1.tar.gz) = QdrL1XjT5GU1u6NtopnFmqBo6ts=
-SHA1 (freerdp-1.0.1.tar.gz) = wTmJcF6Ydvz0jXIB8QCPSBmmFUw=
-SHA256 (freerdp-1.0.1.tar.gz) = FEF15Gpr0B7qbx9Pj8nzP4AnM7sGwfBbUIPVixHfeeA=
-SIZE (freerdp-1.0.1.tar.gz) = 3502100
+SHA256 (freerdp-1.0.2.tar.gz) = wPE333q2+3bX59MWrk4MpsrzVuW8C12tvfrepduZLfE=
+SIZE (freerdp-1.0.2.tar.gz) = 3506618
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/freerdp/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Aug 2012 14:47:00 -   1.4
+++ pkg/PLIST   2 Nov 2013 13:34:58 -
@@ -106,6 +106,7 @@ lib/freerdp/rail.so
 lib/freerdp/rdpdbg.so
 lib/freerdp/rdpdr.so
 lib/freerdp/rdpsnd.so
+lib/freerdp/scard.so
 lib/freerdp/serial.so
 lib/freerdp/tsmf.so
 lib/freerdp/tsmf_ffmpeg.so

Re: [Update] FreeRDP 1.0.2

2013-08-19 Thread Stuart Henderson 
On 2013/08/19 09:30, Mike Erdely wrote:
 Below is a diff for FreeRDP to 1.0.2.
 Unfortunately, it seems like I have to do some dancing around the
 way they're hosting the distfiles at github. Using the URL from the
 website, I get a file named 1.0.2.tgz. Which, of course, extracts to
 FreeRDP-1.0.2 for package called freerdp-1.0.2.

DISTFILES has a newer syntax that lets you rename things.

   After stripping that extension if necessary, if the entry
   parses as `filename{url}' it will be fetched as url
   instead, yet still stored as filename.

(url here is a misnomer; this is the filename part of the url only).

So something like this (untested) should work:

V=  1.0.2
DISTNAME=   freerdp-$V
DISTFILES=  freerdp-$V.tar.gz{$V.tar.gz}

Re: [Update] FreeRDP 1.0.2

2013-08-19 Thread Mike Erdely 
On Mon, Aug 19, 2013 at 10:24 AM, Stuart Henderson st...@openbsd.org wrote:
 DISTFILES=  freerdp-$V.tar.gz{$V.tar.gz}

Thanks.  I'll test it out and come back with a new diff.

-ME