update to rdesktop 1.2.

Changes since 1.1 unknown, author does not maintain a changelog.

closes PR pkg/20334 from Juan RP (though I already had this
update in my tree).

4 files changed, 74 insertions, 22 deletions

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index dcda0844e95..eafc821f47c 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/02/10 02:27:10 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/13 23:25:05 grant Exp $
 #
 
-DISTNAME=		rdesktop-1.1.0
-PKGREVISION=		1
+DISTNAME=		rdesktop-1.2.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -12,17 +11,35 @@ COMMENT=		Open-source Remote Desktop Protocol client
 
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
-HAS_CONFIGURE=		YES
+NO_CONFIGURE=		YES
 CONFIGURE_ARGS=		--prefix=${LOCALBASE}
 
 ALL_TARGET=		rdesktop
 
 USE_X11=		YES
 
+DATADIR=		${PREFIX}/share/rdesktop
+KEYMAP_PATH=		${DATADIR}/keymaps
+
+CFLAGS+=		-DWITH_OPENSSL
+CFLAGS+=		-DKEYMAP_PATH=\\\"${KEYMAP_PATH}\\\"
+LDFLAGS+=		-lX11 -lcrypto
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 LDFLAGS+=	-lnsl -lsocket
 .endif
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/rdesktop.1 ${PREFIX}/man/man1
+	${INSTALL_DATA_DIR} ${DATADIR}
+	${INSTALL_DATA_DIR} ${KEYMAP_PATH}
+	${INSTALL_DATA} ${WRKSRC}/keymaps/?? ${KEYMAP_PATH}
+	${INSTALL_DATA} ${WRKSRC}/keymaps/??-?? ${KEYMAP_PATH}
+	${INSTALL_DATA} ${WRKSRC}/keymaps/common ${KEYMAP_PATH}
+	${INSTALL_DATA} ${WRKSRC}/keymaps/modifiers ${KEYMAP_PATH}
+
+.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rdesktop/PLIST b/net/rdesktop/PLIST
index 8442624f7e6..fe2d8b2d6b9 100644
--- a/net/rdesktop/PLIST
+++ b/net/rdesktop/PLIST
@@ -1,2 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/13 23:25:06 grant Exp $
 bin/rdesktop
+man/man1/rdesktop.1
+share/rdesktop/keymaps/ar
+share/rdesktop/keymaps/common
+share/rdesktop/keymaps/da
+share/rdesktop/keymaps/de
+share/rdesktop/keymaps/en-gb
+share/rdesktop/keymaps/en-us
+share/rdesktop/keymaps/es
+share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/fr
+share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/it
+share/rdesktop/keymaps/ja
+share/rdesktop/keymaps/lt
+share/rdesktop/keymaps/lv
+share/rdesktop/keymaps/mk
+share/rdesktop/keymaps/modifiers
+share/rdesktop/keymaps/no
+share/rdesktop/keymaps/pl
+share/rdesktop/keymaps/pt
+share/rdesktop/keymaps/pt-br
+share/rdesktop/keymaps/ru
+share/rdesktop/keymaps/sl
+share/rdesktop/keymaps/sv
+share/rdesktop/keymaps/th
+share/rdesktop/keymaps/tr
+@dirrm share/rdesktop/keymaps
+@dirrm share/rdesktop
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index fb061c35390..d1125ac1ca4 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/07/25 02:48:47 grant Exp $
+$NetBSD: distinfo,v 1.5 2003/02/13 23:25:06 grant Exp $
 
-SHA1 (rdesktop-1.1.0.tar.gz) = a0ea61437834e7db0311c5e03676edef8869a927
-Size (rdesktop-1.1.0.tar.gz) = 80584 bytes
-SHA1 (patch-aa) = ab74fcedb9562f65798164a25711339c29d74459
+SHA1 (rdesktop-1.2.0.tar.gz) = 9432ae527f35a332544cd56660b6d30cd09524b5
+Size (rdesktop-1.2.0.tar.gz) = 125674 bytes
+SHA1 (patch-aa) = c40c71edfb2ca02635454db008c25c09f7339505
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
index 03d22dd8bd5..f3050d85564 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-aa
@@ -1,19 +1,25 @@
-$NetBSD: patch-aa,v 1.4 2002/07/25 02:47:46 grant Exp $
+$NetBSD: patch-aa,v 1.5 2003/02/13 23:25:07 grant Exp $
 
---- Makefile.orig	Sat Sep 15 22:34:32 2001
+--- Makefile.orig	Thu Jan 30 21:54:23 2003
 +++ Makefile
-@@ -6,12 +6,9 @@
+@@ -6,18 +6,15 @@
  
  # Configuration defaults
  
--CC       = cc
--CFLAGS   = -O2
--INCLUDES = -I/usr/X11R6/include
--LDLIBS   = -L/usr/X11R6/lib -lX11
-+INCLUDES = -I$(X11BASE)/include
-+LDLIBS   = $(LDFLAGS) -lX11
+-prefix      = /usr/local
++prefix      = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir      = $(exec_prefix)/bin
+ mandir      = $(prefix)/man
+-datadir     = $(prefix)/share/rdesktop
+-
+-KEYMAP_PATH = $(datadir)/keymaps/
++datadir     = $(DATADIR)
  
--PREFIX   = /usr/local
- EPREFIX  = $(PREFIX)
- BINDIR   = $(EPREFIX)/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 xwin.o xkeymap.o ewmhints.c
+ CRYPTOBJ = crypto/rc4_enc.o crypto/rc4_skey.o crypto/md5_dgst.o crypto/sha1dgst.o crypto/bn_exp.o crypto/bn_mul.o crypto/bn_div.o crypto/bn_sqr.o crypto/bn_add.o crypto/bn_shift.o crypto/bn_asm.o crypto/bn_ctx.o crypto/bn_lib.o
+ 
+-include Makeconf  # configure-generated
+ 
+ 
+ rdesktop: $(RDPOBJ) $(CRYPTOBJ)