From owner-freebsd-ports  Wed Dec 19 11:43:27 2001
Delivered-To: freebsd-ports@freebsd.org
Received: from wwweasel.geeksrus.net (wwweasel.geeksrus.net [64.67.200.82])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0F8F437B405; Wed, 19 Dec 2001 11:43:24 -0800 (PST)
Received: (from alane@localhost)
	by wwweasel.geeksrus.net (8.11.6/8.11.6) id fBJJfCb18721;
	Wed, 19 Dec 2001 14:41:12 -0500 (EST)
	(envelope-from alane)
Date: Wed, 19 Dec 2001 14:41:12 -0500
From: Alan Eldridge <alane@geeksrus.net>
To: gnats-admin@FreeBSD.org, freebsd-ports@FreeBSD.org
Subject: Re: ports/33006: imake-4 and XF86-4-libraries disagree on XdmAuth is USA_RESIDENT=YES
Message-ID: <20011219194112.GA16834@wwweasel.geeksrus.net>
References: <200112191452.fBJEqHn14107@wwweasel.geeksrus.net> <200112191500.fBJF02x97180@freefall.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200112191500.fBJF02x97180@freefall.freebsd.org>
User-Agent: Mutt/1.3.23.2i
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

I like this text better: shorter, and more accurate.

Index: devel/imake-4/Makefile
===================================================================
RCS file: /home/alane/cvsroot/ports/devel/imake-4/Makefile,v
retrieving revision 1.14
diff -u -3 -u -r1.14 Makefile
--- devel/imake-4/Makefile	15 Dec 2001 02:58:33 -0000	1.14
+++ devel/imake-4/Makefile	19 Dec 2001 19:36:01 -0000
@@ -60,6 +60,9 @@
 		BuildTTFonts=${BuildTTFonts}
 INSTALL_TARGET=	install install.man
 LATEST_LINK=	imake-4
+
+.include <bsd.port.pre.mk>
+
 # ---
 # User Config:
 # All variables are same as Imake config macros.
@@ -71,6 +74,15 @@
 # ---
 HasSecureRPC?=		YES
 HasXdmAuth?=		YES
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-patch:
+	@${ECHO}
+	@${ECHO} Imake-4 will not support the \'HasXdmAuth\' feature.
+	@${ECHO}
+HasXdmAuth?=		NO
+.endif
+.endif
 HasPam?=		YES
 BuildPexExt?=		YES
 BuildXinerama?=		YES
@@ -116,4 +128,4 @@
 # InstallXserverSetUID=NO : use Xwrapper.
 # End of XFree86 configrations
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


-- 
Alan Eldridge
Just another $THING hacker.

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