From owner-freebsd-ports  Tue Apr  2  3:30:13 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 403E537B41A
	for <freebsd-ports@hub.freebsd.org>; Tue,  2 Apr 2002 03:30:07 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g32BU7061975;
	Tue, 2 Apr 2002 03:30:07 -0800 (PST)
	(envelope-from gnats)
Received: from postoffice.aims.com.au (eth0.lnk.aims.com.au [203.31.73.253])
	by hub.freebsd.org (Postfix) with ESMTP id 2D4FE37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Apr 2002 03:27:46 -0800 (PST)
Received: from ait0fd01.aims.private (ait0fd01.aims.private [192.168.10.254])
	by postoffice.aims.com.au  with ESMTP id g32BRjn93418
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 2 Apr 2002 21:27:45 +1000 (EST)
	(envelope-from chris@aims.com.au)
Received: (from root@localhost)
	by ait0fd01.aims.private (8.11.6/8.11.6) id g32BRjF02959;
	Tue, 2 Apr 2002 21:27:45 +1000 (EST)
	(envelope-from chris@aims.com.au)
Message-Id: <200204021127.g32BRjF02959@ait0fd01.aims.private>
Date: Tue, 2 Apr 2002 21:27:45 +1000 (EST)
From: Chris Knight <chris@aims.com.au>
Reply-To: Chris Knight <chris@aims.com.au>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: ports/36651: [MAINTAINER UPDATE] net/rdesktop: bento fix
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         36651
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] net/rdesktop: bento fix
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 02 03:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Chris Knight
>Release:        FreeBSD 4.5-RELEASE i386
>Organization:
AIMS Independent Computer Professionals
>Environment:

System: FreeBSD ait0fd01.aims.private 4.5-RELEASE FreeBSD 4.5-RELEASE #6: Wed Apr 3 06:33:37 EST 2002 root@:/usr/src/sys/compile/THINKPAD i386

>Description:

net/rdesktop doesn't build on 5.0-CURRENT due to lack of libgmp in base.
I played it safe and used the FreeBSD version bump prior to the libgmp
removal.

>How-To-Repeat:

cd /usr/ports/net/rdesktop
make all

>Fix:

--- Makefile.orig	Mon Dec 17 15:37:32 2001
+++ Makefile	Tue Apr  2 21:20:06 2002
@@ -26,14 +26,26 @@
 MAN1=		rdesktop.1
 ALL_TARGET=
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500023
+BUILD_DEPENDS=	${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp-freebsd
+RUN_DEPENDS=	${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp-freebsd
+.endif
+
 do-patch:
 	@${EXTRACT_CMD} -dc ${_DISTDIR}/${PATCHFILES} | \
 		${PATCH} ${PATCH_DIST_ARGS}
+.if ${OSVERSION} >= 500023
+	@${PERL} -pi.orig -e 's:-O2.*-Wall:${CFLAGS} -I${PREFIX}/include:g' \
+		${WRKSRC}/Makefile
+.else
 	@${PERL} -pi.orig -e 's:-O2.*-Wall:${CFLAGS}:g' ${WRKSRC}/Makefile
+.endif
 	@${PERL} -pi.orig -e 's:/usr/X11R6/:${X11BASE}/:g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:^PREFIX.*:PREFIX=${PREFIX}:g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:^install.*:install\: rdesktop:g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:^.*\(INSTALL\) rdp-srvr.*::g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:<endian.h>:<machine/endian.h>:g' ${WRKSRC}/rdesktop.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message