Subject: pkg/20334: Update package net/rdesktop
To: None <gnats-bugs@gnats.netbsd.org>
From: None <juan@xtraeme.unixbsd.org>
List: netbsd-bugs
Date: 02/14/2003 00:12:43
>Number: 20334
>Category: pkg
>Synopsis: Update package net/rdesktop
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Feb 13 15:13:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Juan RP
>Release: NetBSD 1.6N
>Organization:
HispaBSD
>Environment:
System: NetBSD xtraeme.unixbsd.org 1.6N NetBSD 1.6N (# xtraeme_pnpbios) #2: Wed Feb 12 20:08:00 CET 2003 juan@xtraeme.dyndns.org:/home/juan/compile/obj/sys/arch/i386/compile/xtrakernel i386
Architecture: i386
Machine: i386
>Description:
The latest stable version of rdesktop is 1.2.0. This features new keyboard
mapping code, high encryption support and many small additions and bugfixes.
http://www.rdesktop.org/
>How-To-Repeat:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/rdesktop/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 2003/02/10 02:27:10 1.6
+++ Makefile 2003/02/13 23:09:23
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.6 2003/02/10 02:27:10 grant Exp $
#
-DISTNAME= rdesktop-1.1.0
-PKGREVISION= 1
+DISTNAME= rdesktop-1.2.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
@@ -13,9 +12,10 @@
USE_GMAKE= YES
USE_BUILDLINK2= YES
HAS_CONFIGURE= YES
-CONFIGURE_ARGS= --prefix=${LOCALBASE}
+USE_SSL= YES
-ALL_TARGET= rdesktop
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --with-x=${X11BASE}
USE_X11= YES
@@ -24,5 +24,14 @@
.if ${OPSYS} == "SunOS"
LDFLAGS+= -lnsl -lsocket
.endif
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${PREFIX}/man/man1
+ ${INSTALL} -d -m 755 ${PREFIX}/share/rdesktop
+ ${INSTALL} -d -m 755 ${PREFIX}/share/rdesktop/keymaps
+ for file in ${WRKSRC}/keymaps/*; do \
+ ${INSTALL_DATA} $$file ${PREFIX}/share/rdesktop/keymaps; \
+ done
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/rdesktop/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST 2001/10/31 22:58:29 1.1
+++ PLIST 2003/02/13 23:09:23
@@ -1,2 +1,31 @@
@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:29 zuntum Exp $
bin/rdesktop
+man/man1/rdesktop.1
+share/rdesktop/keymaps/ar
+share/rdesktop/keymaps/common
+share/rdesktop/keymaps/convert-map
+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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/rdesktop/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 2002/07/25 02:48:47 1.4
+++ distinfo 2003/02/13 23:09:23
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.4 2002/07/25 02:48:47 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) = 1f6c93b1be141c495ec39e9735bfd66721703591
+SHA1 (patch-ab) = 7e0e0ec142c18fe6d319628dc679d4781f923336
-------------------------------
patch-aa
------------------------------
$NetBSD$
--- configure.orig Thu Jan 30 21:54:48 2003
+++ configure Fri Jan 31 18:43:58 2003
@@ -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
@@ -220,8 +220,9 @@
esac
-echo "CFLAGS = $cflags" >>Makeconf
-echo "LDFLAGS = $ldflags" >>Makeconf
+echo "CFLAGS += $cflags" >>Makeconf
+echo "LDFLAGS += $ldflags" >>Makeconf
+echo 'DESTDIR = ${prefix}' >>Makeconf
echo "configure complete - now run make"
-------------------------------
patch-ab
-------------------------------
$NetBSD$
-- Makefile.orig Thu Jan 30 21:54:23 2003
+++ Makefile Fri Jan 31 18:22:58 2003
@@ -20,6 +20,8 @@
include Makeconf # configure-generated
+all: rdesktop
+
rdesktop: $(RDPOBJ) $(CRYPTOBJ)
$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
@@ -29,23 +31,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
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted: