Upgrade rdesktop to 1.2.0.

PR:		47715
Submitted by:	Chris Knight <chris@aims.com.au>

3 files changed, 46 insertions, 39 deletions

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 6bf83cb8e3ed..48fb30c99b84 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -6,50 +6,29 @@
 #
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.0.0.p19.7.6
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	net comms
-MASTER_SITES=	http://bibl4.oru.se/projects/rdesktop/dist/releases/
-DISTNAME=	rdesktop-1.0.0
-
-PATCH_SITES=	http://bibl4.oru.se/projects/rdesktop/ \
-		http://bibl4.oru.se/projects/rdesktop/patch19/
-PATCHFILES=	rdesktop-unified-patch19-7-6.bz2
-PATCH_DIST_STRIP=	-p2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	rdesktop-1.2.0
 
 MAINTAINER=	chris@aims.com.au
 
-USE_BZIP2=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500023
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
-.endif
-
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_REINPLACE=	yes
-ALL_TARGET=
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+
 MAN1=		rdesktop.1
 
-do-patch:
-	@${EXTRACT_CMD} -dc ${_DISTDIR}/${PATCHFILES} | \
-		${PATCH} ${PATCH_DIST_ARGS}
-.if ${OSVERSION} > 500023
-	@${REINPLACE_CMD} -e 's:-O2.*-Wall:${CFLAGS} -I${LOCALBASE}/include:g' \
-			  -e 's:-lgmp:-L${LOCALBASE}/lib -lgmp:g' \
-		${WRKSRC}/Makefile
-.else
-	@${REINPLACE_CMD} -e 's:-O2.*-Wall:${CFLAGS}:g' ${WRKSRC}/Makefile
-.endif
-	@${REINPLACE_CMD} -e 's:/usr/X11R6/:${X11BASE}/:g' \
-			  -e 's:^PREFIX.*:PREFIX=${PREFIX}:g' \
-			  -e 's:^install.*:install\: rdesktop:g' \
-			  -e 's:^.*(INSTALL) rdp-srvr.*::g' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's:<endian.h>:<machine/endian.h>:g' \
-		${WRKSRC}/rdesktop.h
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${PREFIX}/man/man1
+	@${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop
+	@${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop/keymaps
+	@for f in ${WRKSRC}/keymaps/*; do \
+		${INSTALL_DATA} $$f ${PREFIX}/share/rdesktop/keymaps; \
+	done
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index 3ba47fd55432..5769f7e1c3c5 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,2 +1 @@
-MD5 (rdesktop-1.0.0.tar.bz2) = 2f45a57016fe7ee7930848bbcb94f8b7
-MD5 (rdesktop-unified-patch19-7-6.bz2) = c20774a5e6c446f82ec199e8143775ce
+MD5 (rdesktop-1.2.0.tar.gz) = b5e108e83e9de883e965a2bb0c7e7036
diff --git a/net/rdesktop/pkg-plist b/net/rdesktop/pkg-plist
index 5cae92df98c0..e922a15c9c77 100644
--- a/net/rdesktop/pkg-plist
+++ b/net/rdesktop/pkg-plist
@@ -1 +1,30 @@
 bin/rdesktop
+share/rdesktop/keymaps/ar
+share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/en-us
+share/rdesktop/keymaps/en-gb
+share/rdesktop/keymaps/tr
+share/rdesktop/keymaps/th
+share/rdesktop/keymaps/sv
+share/rdesktop/keymaps/sl
+share/rdesktop/keymaps/ru
+share/rdesktop/keymaps/pt
+share/rdesktop/keymaps/pl
+share/rdesktop/keymaps/no
+share/rdesktop/keymaps/mk
+share/rdesktop/keymaps/lv
+share/rdesktop/keymaps/lt
+share/rdesktop/keymaps/ja
+share/rdesktop/keymaps/it
+share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/fr
+share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/es
+share/rdesktop/keymaps/de
+share/rdesktop/keymaps/da
+share/rdesktop/keymaps/pt-br
+share/rdesktop/keymaps/common
+share/rdesktop/keymaps/convert-map
+share/rdesktop/keymaps/modifiers
+@unexec rmdir %D/share/rdesktop/keymaps 2>/dev/null || true
+@unexec rmdir %D/share/rdesktop 2>/dev/null || true