[pkgsrc/trunk]: pkgsrc/lang/elk Mark as DESTDIR save and fix modular Xorg build.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8da77f37acd
branches:  trunk
changeset: 532393:d8da77f37acd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Aug 17 22:27:15 2007 +0000

description:
Mark as DESTDIR save and fix modular Xorg build.

diffstat:

 lang/elk/Makefile   |  4 +++-
 lang/elk/options.mk |  3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 5e99285fe8da -r d8da77f37acd lang/elk/Makefile
--- a/lang/elk/Makefile Fri Aug 17 22:18:15 2007 +0000
+++ b/lang/elk/Makefile Fri Aug 17 22:27:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/08/17 23:51:33 adam Exp $
+# $NetBSD: Makefile,v 1.36 2007/08/17 22:27:15 joerg Exp $
 
 DISTNAME=      elk-3.99.7
 CATEGORIES=    lang
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://sam.zoy.org/elk/
 COMMENT=       Embeddable Scheme interpreter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
diff -r 5e99285fe8da -r d8da77f37acd lang/elk/options.mk
--- a/lang/elk/options.mk       Fri Aug 17 22:18:15 2007 +0000
+++ b/lang/elk/options.mk       Fri Aug 17 22:27:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/10/15 23:07:21 tonio Exp $
+# $NetBSD: options.mk,v 1.2 2007/08/17 22:27:15 joerg Exp $
 
 # Global and legacy options
 
@@ -12,7 +12,6 @@
 ### x11 support
 ###
 .if !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mmotif)
-.  include "../../mk/x11.buildlink3.mk"
 PLIST_SUBST+= WITHX11=""
 .  if !empty(PKG_OPTIONS:Mxaw)
 PLIST_SUBST+= WITHXAW=""