Subject: Re: updating rdesktop to 1.3.0?
To: None <tech-pkg@netbsd.org>
From: Geoff Wing <mason@primenet.com.au>
List: tech-pkg
Date: 11/15/2003 06:44:31
grant beattie <grant@NetBSD.org> typed:
: I have an update which builds and works on NetBSD, other platforms
: may need a little work.

This is what I did for myself.  patch-a[ab] will need some $NetBSD$ IDs.

Regards,
Geoff

--- Makefile.orig	2003-11-15 17:41:12.000000000 +1100
+++ Makefile	2003-11-15 17:41:52.000000000 +1100
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.11 2003/11/12 03:39:42 jschauma Exp $
 #
 
-DISTNAME=		rdesktop-1.2.0
+DISTNAME=		rdesktop-1.3.0
 PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
@@ -10,6 +10,8 @@
 HOMEPAGE=		http://www.rdesktop.org/
 COMMENT=		Open-source Remote Desktop Protocol client
 
+WRKSRC=			${WRKDIR}/rdesktop/
+
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 HAS_CONFIGURE=		YES

--- patches/patch-aa	2003-03-07 09:33:53.000000000 +1100
+++ patches/patch-aa	2003-11-02 23:56:20.000000000 +1100
@@ -1,36 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2003/03/06 19:08:11 jlam Exp $
-
---- Makefile.orig	Thu Mar  6 10:50:37 2003
-+++ Makefile
-@@ -29,23 +29,19 @@ Makeconf:
- install: installbin installkeymaps installman
+--- Makefile.org	2003-11-02 23:55:05.000000000 +1100
++++ Makefile	2003-11-02 23:56:14.000000000 +1100
+@@ -4,6 +4,8 @@
+ # Copyright (C) Matthew Chapman 1999-2001
+ #
  
- installbin: rdesktop
--	mkdir -p $(DESTDIR)/$(bindir)
--	install rdesktop $(DESTDIR)/$(bindir)
--	strip $(DESTDIR)/$(bindir)/rdesktop
--	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
-+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)/$(bindir)
-+	${BSD_INSTALL_PROGRAM} rdesktop $(DESTDIR)/$(bindir)
++include Makeconf  # configure-generated
++
+ # Configuration defaults
  
- installman: doc/rdesktop.1
--	mkdir -p $(DESTDIR)/$(mandir)/man1
--	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
--	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
-+	${BSD_INSTALL_MAN_DIR} $(DESTDIR)/$(mandir)/man1
-+	${BSD_INSTALL_MAN} doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
- 
- installkeymaps:
--	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA_DIR} $(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)/*
-+	${BSD_INSTALL_DATA} keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA} keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA} keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
- 
- proto:
- 	cproto -DMAKE_PROTO -o proto.h *.c
+ prefix      = /usr/local
--- patches/patch-ab	2003-03-07 06:08:11.000000000 +1100
+++ patches/patch-ab	2003-11-02 23:54:55.000000000 +1100
@@ -1,15 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2003/03/06 19:08:11 jlam Exp $
-
---- configure.orig	Thu Jan 30 02:54:48 2003
-+++ configure
-@@ -220,8 +220,8 @@ case `uname -s` in
- esac
- 
- 
--echo "CFLAGS      = $cflags" >>Makeconf
--echo "LDFLAGS     = $ldflags" >>Makeconf
-+echo "CFLAGS      += $cflags" >>Makeconf
-+echo "LDFLAGS     += $ldflags" >>Makeconf
- 
- echo "configure complete - now run make"
- 
+--- configure.org	2003-11-02 23:53:23.000000000 +1100
++++ configure	2003-11-02 23:54:43.000000000 +1100
+@@ -264,7 +264,7 @@
+     echo
+     echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
+     cflags="$cflags -DWITH_RDPSND"
+-elif [ -f /usr/include/sys/audioio.h ]; then
++elif [ -f /usr/include/sys/audioio.h -a `uname -s` != "NetBSD" ]; then
+     echo Sound support enabled: Sun
+     echo
+     echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
--- distinfo	2003-03-07 09:33:53.000000000 +1100
+++ distinfo	2003-11-02 23:56:32.000000000 +1100
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2003/03/06 19:08:10 jlam Exp $
 
-SHA1 (rdesktop-1.2.0.tar.gz) = 9432ae527f35a332544cd56660b6d30cd09524b5
-Size (rdesktop-1.2.0.tar.gz) = 125674 bytes
-SHA1 (patch-aa) = 879d83dd83729e51028136f704dbc90f7a52cae1
-SHA1 (patch-ab) = 82e3f44c38cde9dcf8c0f6079b11222024e753ef
+SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
+Size (rdesktop-1.3.0.tar.gz) = 136704 bytes
+SHA1 (patch-aa) = 7cb09d3f0979cebaccfa7b7e58a4950b474811e6
+SHA1 (patch-ab) = 2d737f5aea94ffb5112784dace22799350105dda
--- PLIST	2003-02-14 13:06:20.000000000 +1100
+++ PLIST	2003-11-03 00:02:39.000000000 +1100
@@ -5,13 +5,18 @@
 share/rdesktop/keymaps/common
 share/rdesktop/keymaps/da
 share/rdesktop/keymaps/de
+share/rdesktop/keymaps/de-ch
 share/rdesktop/keymaps/en-gb
 share/rdesktop/keymaps/en-us
 share/rdesktop/keymaps/es
 share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/fo
 share/rdesktop/keymaps/fr
 share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/fr-ca
+share/rdesktop/keymaps/fr-ch
 share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/hu
 share/rdesktop/keymaps/it
 share/rdesktop/keymaps/ja
 share/rdesktop/keymaps/lt