Update to 1.1.0.p19.8.2

PR:		33267
Submitted by:	maintainer

4 files changed, 42 insertions, 28 deletions

diff --git a/net/rdesktop-devel/Makefile b/net/rdesktop-devel/Makefile
index c962bd51125a..c267da87de34 100644
--- a/net/rdesktop-devel/Makefile
+++ b/net/rdesktop-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.0.0.p19.7.6
+PORTVERSION=	1.1.0.p19.8.2
 CATEGORIES=	net comms
 MASTER_SITES=	http://bibl4.oru.se/projects/rdesktop/dist/releases/
-DISTNAME=	rdesktop-1.0.0
+DISTNAME=	rdesktop-1.1.0
 
 PATCH_SITES=	http://bibl4.oru.se/projects/rdesktop/ \
 		http://bibl4.oru.se/projects/rdesktop/patch19/
-PATCHFILES=	rdesktop-unified-patch19-7-6.bz2
+PATCHFILES=	rdesktop-unified-patch19-8-2.bz2
 PATCH_DIST_STRIP=	-p2
 
 MAINTAINER=	chris@aims.com.au
@@ -23,17 +23,13 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-openssl
+
 MAN1=		rdesktop.1
-ALL_TARGET=
-
-do-patch:
-	@${EXTRACT_CMD} -dc ${_DISTDIR}/${PATCHFILES} | \
-		${PATCH} ${PATCH_DIST_ARGS}
-	@${PERL} -pi.orig -e 's:-O2.*-Wall:${CFLAGS}:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:/usr/X11R6/:${X11BASE}/:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:^PREFIX.*:PREFIX=${PREFIX}:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:^install.*:install\: rdesktop:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:^.*\(INSTALL\) rdp-srvr.*::g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:<endian.h>:<machine/endian.h>:g' ${WRKSRC}/rdesktop.h
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/rdesktop.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/rdesktop-devel/distinfo b/net/rdesktop-devel/distinfo
index 3ba47fd55432..ed3ff5f055af 100644
--- a/net/rdesktop-devel/distinfo
+++ b/net/rdesktop-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (rdesktop-1.0.0.tar.bz2) = 2f45a57016fe7ee7930848bbcb94f8b7
-MD5 (rdesktop-unified-patch19-7-6.bz2) = c20774a5e6c446f82ec199e8143775ce
+MD5 (rdesktop-1.1.0.tar.bz2) = d88d26b179595546c13d70129a891a98
+MD5 (rdesktop-unified-patch19-8-2.bz2) = e2a21f2402d5faa8f4fb0f23d36d69fd
diff --git a/net/rdesktop-devel/files/patch-Makefile b/net/rdesktop-devel/files/patch-Makefile
new file mode 100644
index 000000000000..5ed95675ab98
--- /dev/null
+++ b/net/rdesktop-devel/files/patch-Makefile
@@ -0,0 +1,30 @@
+--- Makefile.orig	Fri Dec 28 21:16:12 2001
++++ Makefile	Fri Dec 28 21:17:01 2001
+@@ -6,14 +6,9 @@
+ 
+ # Configuration defaults
+ 
+-CC       = gcc
+-CFLAGS   = -O2 -Wall
+-INCLUDES = -I$(shell pwd)
+-LDLIBS   =
++INCLUDES = -I.
+ 
+-PREFIX   = /usr/local
+-EPREFIX  = $(PREFIX)
+-BINDIR   = $(EPREFIX)/bin
++BINDIR   = $(PREFIX)/bin
+ MANDIR   = $(PREFIX)/man
+ 
+ RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o
+@@ -30,8 +25,8 @@
+ GMP_INCLUDES =
+ 
+ #default to X11
+-GUI_INCLUDES = -I/usr/X11R6/include
+-GUI_LIBS = -L/usr/X11R6/lib -lX11
++GUI_INCLUDES = -I${X11BASE}/include
++GUI_LIBS = -L${X11BASE}/lib -lX11
+ GUI_OBJ = gl/xwin.o
+ 
+ #the nt xlib emul layer
diff --git a/net/rdesktop-devel/files/patch-aa b/net/rdesktop-devel/files/patch-aa
deleted file mode 100644
index e9b7e1fb54eb..000000000000
--- a/net/rdesktop-devel/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- secure.c~	Mon Aug 27 16:33:56 2001
-+++ secure.c	Mon Aug 27 16:36:19 2001
-@@ -387,6 +387,9 @@
- {
-   int hostlen = 2 * ( hostname == 0 ? 0 : strlen (hostname));
- 
-+  if (hostlen > 30)
-+      hostlen = 30;
-+
-   out_uint16_be (s, 5);		/* unknown */
-   out_uint16_be (s, 0x14);
-   out_uint8 (s, 0x7c);