Update to rdesktop-1.1.0.p19.8.3

x11/rdesktop/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2001/11/22 09:58:18 jcs Exp $
+# $OpenBSD: Makefile,v 1.7 2002/01/17 04:15:04 jcs Exp $
 
 COMMENT=	"open source client for Windows Terminal Server"
 
-DISTNAME=	rdesktop-1.0.0
-PATCHLEVEL=	19.7.5
+DISTNAME=	rdesktop-1.1.0
+PATCHLEVEL=	19.8.3
 PKGNAME=	${DISTNAME}.p${PATCHLEVEL}
 CATEGORIES=	x11 net
-NEED_VERSION=	1.499
+NEED_VERSION=	1.504
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -25,12 +25,9 @@ MAINTAINER=	Joshua Stein <jcs@rt.fm>
 
 USE_GMAKE=	Yes
 USE_X11=	Yes
+CONFIGURE_STYLE= gnu
 LIB_DEPENDS=	gmp.4.1::devel/gmp
 
-MAKE_FLAGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgmp -lX11 \
-			-lcrypto"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/rdesktop.1 ${PREFIX}/man/man1

x11/rdesktop/distinfo

@@ -1,6 +1,6 @@
-MD5 (rdesktop-1.0.0.tar.gz) = e03f3ed9bb7a052039ccd5d0cc63fabc
-MD5 (rdesktop-unified-patch19-7-5.bz2) = 5a1ebe2b07062ec97067dadbd19318a9
-RMD160 (rdesktop-1.0.0.tar.gz) = f4e5429ffa7b18318b6ceaee2d1ae8080f759af0
-RMD160 (rdesktop-unified-patch19-7-5.bz2) = 9894162bc9029aab1b93a4440841bdec162798e5
-SHA1 (rdesktop-1.0.0.tar.gz) = 6eb0574d45414abbf4b98a14655a281ad95606f4
-SHA1 (rdesktop-unified-patch19-7-5.bz2) = 2182cef3a3781dd9b9675ff2d1496a1bc7cb4a75
+MD5 (rdesktop-1.1.0.tar.gz) = 50cfa4cacd15c52eaa7a57470607acea
+MD5 (rdesktop-unified-patch19-8-3.bz2) = 0a523908e72b81f29251ec43dfd6c987
+RMD160 (rdesktop-1.1.0.tar.gz) = 92eb118c516cc87330885d0ebee721da3d19fbd9
+RMD160 (rdesktop-unified-patch19-8-3.bz2) = b350dac11f436ded685031e060ec93f61208b5e6
+SHA1 (rdesktop-1.1.0.tar.gz) = a0ea61437834e7db0311c5e03676edef8869a927
+SHA1 (rdesktop-unified-patch19-8-3.bz2) = 51652d2846afee3239d3fc0dd7b60ef475d964b1

x11/rdesktop/patches/patch-Makefile

@@ -1,23 +1,27 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2001/06/03 20:07:17 lebel Exp $
---- Makefile.orig	Sun Jun  3 14:57:12 2001
-+++ Makefile	Sun Jun  3 14:57:12 2001
-@@ -15,13 +15,13 @@
- #XINERAMA_CFLAGS = -DHAVE_XINERAMA
- #XINERAMA_LIBS = -lXinerama -lXext
+$OpenBSD: patch-Makefile,v 1.2 2002/01/17 04:15:04 jcs Exp $
+--- Makefile.orig	Wed Jan 16 21:56:08 2002
++++ Makefile	Wed Jan 16 21:57:49 2002
+@@ -6,12 +6,9 @@
  
--PREFIX = /usr/local
--X11DIR = /usr/X11R6
-+#PREFIX = /usr/local
-+#X11DIR = /usr/X11R6
+ # Configuration defaults
  
--CC     = gcc
--COFLAGS = -funroll-loops -fexpensive-optimizations -ffast-math -fomit-frame-pointer -frerun-cse-after-loop
--CFLAGS = -O2 $(COFLAGS) -Wall $(DEBUG) $(XINERAMA_CFLAGS) -I$(X11DIR)/include
--LDFLAGS   = -L$(X11DIR)/lib -lX11 $(XINERAMA_LIBS) -lgmp -lcrypto
-+#CC     = gcc
-+#COFLAGS = -funroll-loops -fexpensive-optimizations -ffast-math -fomit-frame-pointer -frerun-cse-after-loop
-+#CFLAGS = -O2 $(COFLAGS) -Wall $(DEBUG) $(XINERAMA_CFLAGS) -I$(X11DIR)/include
-+#LDFLAGS   = -L$(X11DIR)/lib -lX11 $(XINERAMA_LIBS) -lgmp -lcrypto
- #-c flag doesn't seem to be needed at gnu platforms
- #it's only ignored. but at others the manual file will be lost if it's not used.
- INSTALL= install -c -m 755 -s
+-CC       = gcc
+-CFLAGS   = -O2 -Wall
+ INCLUDES = -I$(shell pwd)
+ LDLIBS   =
+ 
+-PREFIX   = /usr/local
+ EPREFIX  = $(PREFIX)
+ BINDIR   = $(EPREFIX)/bin
+ MANDIR   = $(PREFIX)/man
+@@ -31,8 +28,8 @@
+ 
+ 
+ #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

x11/rdesktop/patches/patch-configure

@@ -0,0 +1,13 @@
+$OpenBSD: patch-configure,v 1.1 2002/01/17 04:15:04 jcs Exp $
+--- configure.orig	Wed Jan 16 22:01:32 2002
++++ configure	Wed Jan 16 22:01:58 2002
+@@ -222,6 +222,9 @@
+   --with-debug-leaks*)
+     echo "CFLAGS  += -g -DWITH_DEBUG_LEAKS" >>Makeconf
+     ;;
++  --sysconfdir*)
++    # ignore
++    ;;
+   *)
+     echo "rdesktop build configuration script"
+     echo