upgrade to 1.2b1

PR:		46321
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com>
Approved by:	maintainer

5 files changed, 102 insertions, 42 deletions

diff --git a/net/rdesktop-devel/Makefile b/net/rdesktop-devel/Makefile
index 34383679f44a..a3daf8d73bca 100644
--- a/net/rdesktop-devel/Makefile
+++ b/net/rdesktop-devel/Makefile
@@ -6,30 +6,30 @@
 #
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.1.0.p19.9.0
+PORTVERSION=	1.2b1
 CATEGORIES=	net comms
-MASTER_SITES=	http://bibl4.oru.se/projects/rdesktop/dist/releases/
-DISTNAME=	rdesktop-1.1.0
-
-PATCH_SITES=	http://bibl4.oru.se/projects/rdesktop/ \
-		http://bibl4.oru.se/projects/rdesktop/patch19/
-PATCHFILES=	rdesktop-unified-patch19-9-0.bz2
-PATCH_DIST_STRIP=	-p2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	rdesktop-1.2beta1
 
 MAINTAINER=	chris@aims.com.au
 
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-
+WRKSRC=		${WRKDIR}/${PORTNAME}
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-openssl --enable-final
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		rdesktop.1
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/rdesktop.1 ${PREFIX}/man/man1
+	@${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.mk>
diff --git a/net/rdesktop-devel/distinfo b/net/rdesktop-devel/distinfo
index 7ffbaaaec18f..bb01eec2ddcc 100644
--- a/net/rdesktop-devel/distinfo
+++ b/net/rdesktop-devel/distinfo
@@ -1,2 +1 @@
-MD5 (rdesktop-1.1.0.tar.bz2) = d88d26b179595546c13d70129a891a98
-MD5 (rdesktop-unified-patch19-9-0.bz2) = 1f46a1b137142474f8e5aef10b5d8d60
+MD5 (rdesktop-1.2beta1.tar.gz) = db39ce21a03832495b75a8b338525a15
diff --git a/net/rdesktop-devel/files/patch-Makefile b/net/rdesktop-devel/files/patch-Makefile
index 76bee8be6fad..21e685a57c4a 100644
--- a/net/rdesktop-devel/files/patch-Makefile
+++ b/net/rdesktop-devel/files/patch-Makefile
@@ -1,30 +1,44 @@
---- Makefile.orig	Sat Feb  2 00:21:14 2002
-+++ Makefile	Sat Feb  2 00:23:47 2002
-@@ -6,14 +6,9 @@
- 
+--- Makefile.orig	Tue Nov 19 02:46:24 2002
++++ Makefile	Tue Dec 31 22:10:53 2002
+@@ -7,7 +7,7 @@
  # 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 decompress.o
-@@ -26,8 +21,8 @@
- SSL_LIBS =
- 
- #the xlib layer ( default )
--GUI_XWIN_INC = -I/usr/X11R6/include
--GUI_XWIN_LIB = -L/usr/X11R6/lib -lX11
-+GUI_XWIN_INC = -I${X11BASE}/include
-+GUI_XWIN_LIB = -L${X11BASE}/lib -lX11
- GUI_XWIN_OBJ = gl/xwin.o
- 
- #the nt layer
+ CC       = cc
+-CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
++CFLAGS  += -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
+ LDFLAGS  =
+ 
+ prefix      = /usr/local
+@@ -24,6 +24,8 @@
+ include Makeconf  # configure-generated
+ 
+ 
++all: rdesktop
++
+ rdesktop: $(RDPOBJ) $(CRYPTOBJ)
+ 	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
+ 
+@@ -33,23 +35,10 @@
+ install: installbin installkeymaps installman
+ 
+ installbin: rdesktop
+-	mkdir -p $(DESTDIR)/$(bindir)
+-	install rdesktop $(DESTDIR)/$(bindir)
+-	strip $(DESTDIR)/$(bindir)/rdesktop
+-	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
+ 
+ installman: doc/rdesktop.1
+-	mkdir -p $(DESTDIR)/$(mandir)/man1
+-	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
+-	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
+ 
+ installkeymaps:
+-	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
+-# Prevent copying the CVS directory
+-	cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
+-	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
+-	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
+-	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
+ 
+ proto:
+ 	cproto -DMAKE_PROTO -o proto.h *.c
diff --git a/net/rdesktop-devel/files/patch-configure b/net/rdesktop-devel/files/patch-configure
new file mode 100644
index 000000000000..2968b2913770
--- /dev/null
+++ b/net/rdesktop-devel/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Tue Nov 19 22:05:27 2002
++++ configure	Tue Dec 31 22:23:43 2002
+@@ -98,7 +98,7 @@
+ echo "CC          = $cc" >>Makeconf
+ 
+ if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
+-    cflags="$cflags -Wall -O2"
++    #cflags="$cflags -Wall -O2"
+ else
+     cflags="$cflags -O"
+ fi
+@@ -222,6 +222,7 @@
+ 
+ echo "CFLAGS     += $cflags" >>Makeconf
+ echo "LDFLAGS    += $ldflags" >>Makeconf
++echo 'DESTDIR     = ${prefix}' >>Makeconf
+ 
+ echo "configure complete - now run make"
+ 
diff --git a/net/rdesktop-devel/pkg-plist b/net/rdesktop-devel/pkg-plist
index 5cae92df98c0..95b5cb801c14 100644
--- a/net/rdesktop-devel/pkg-plist
+++ b/net/rdesktop-devel/pkg-plist
@@ -1 +1,29 @@
 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/modifiers
+@unexec rmdir %D/share/rdesktop/keymaps 2>/dev/null || true
+@unexec rmdir %D/share/rdesktop 2>/dev/null || true