Use rdesktop's configure process (no rationale for not using it). It will

automatically add the correct libraries for each OS, so we can remove the
custom SunOS library additions in the package Makefile.  Also remove the
custom do-install target and simply use the rdesktop one (no rationale for
not using it either).  Remove USE_GMAKE setting since BSD make is
sufficient.

4 files changed, 54 insertions, 51 deletions

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index a7e3491322b..0fd9bd6fdd8 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/02/14 00:58:06 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/06 19:08:10 jlam Exp $
 #
 
 DISTNAME=		rdesktop-1.2.0
@@ -9,37 +9,13 @@ MAINTAINER=		grant@netbsd.org
 HOMEPAGE=		http://www.rdesktop.org/
 COMMENT=		Open-source Remote Desktop Protocol client
 
-USE_GMAKE=		YES
 USE_BUILDLINK2=		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}
+HAS_CONFIGURE=		YES
+CONFIGURE_ARGS=		--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--with-x=${X11BASE}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+ALL_TARGET=		rdesktop
 
 .include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index d1125ac1ca4..509fe0a88eb 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/02/13 23:25:06 grant Exp $
+$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) = c40c71edfb2ca02635454db008c25c09f7339505
+SHA1 (patch-aa) = 879d83dd83729e51028136f704dbc90f7a52cae1
+SHA1 (patch-ab) = 82e3f44c38cde9dcf8c0f6079b11222024e753ef
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
index f3050d85564..8e5eae4a9aa 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-aa
@@ -1,25 +1,36 @@
-$NetBSD: patch-aa,v 1.5 2003/02/13 23:25:07 grant Exp $
+$NetBSD: patch-aa,v 1.6 2003/03/06 19:08:11 jlam Exp $
 
---- Makefile.orig	Thu Jan 30 21:54:23 2003
+--- Makefile.orig	Thu Mar  6 10:50:37 2003
 +++ Makefile
-@@ -6,18 +6,15 @@
+@@ -29,23 +29,19 @@ Makeconf:
+ install: installbin installkeymaps installman
  
- # Configuration defaults
+ 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)
  
--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)
+ 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
  
- 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
+ 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)
  
--include Makeconf  # configure-generated
- 
- 
- rdesktop: $(RDPOBJ) $(CRYPTOBJ)
+ proto:
+ 	cproto -DMAKE_PROTO -o proto.h *.c
diff --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab
new file mode 100644
index 00000000000..6105e1aa2cc
--- /dev/null
+++ b/net/rdesktop/patches/patch-ab
@@ -0,0 +1,15 @@
+$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"
+