Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references

to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.

3 files changed, 54 insertions, 32 deletions

diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index a887ccdf3a0..dbee50bd426 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/30 10:37:25 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:22 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -8,7 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.enlightenment.org/
 COMMENT=		Window manager for X
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK_ONLY=	yes
 USE_PERL5=		yes
 USE_X11BASE=		yes
 
@@ -16,6 +16,19 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-fsstd
 MAKE_ENV+=		USER=${SHAREOWN}:${SHAREGRP}
 
+# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
+# defeats buildlink.
+#
+post-patch:
+	cd ${WRKSRC};							\
+	files=`${FIND} . -name "Makefile.in" -print`;			\
+	for file in $${files}; do					\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED} -e "/^INCLUDES.*=.*/s|[  ]*-I\$$(includedir)||"	\
+			$${file}.fixme > $${file};			\
+		${RM} $${file}.fixme;					\
+	done
+
 post-install:
 	for FILE in `${GREP} "\.directory$$" ${PKGDIR}/PLIST`; do \
 	  ${TOUCH} ${PREFIX}/$${FILE}; \
@@ -30,4 +43,5 @@ post-install:
 .include "../../graphics/fnlib/buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../www/libghttp/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/distinfo b/wm/enlightenment/distinfo
index 4dcc2b64a92..1909628f5d3 100644
--- a/wm/enlightenment/distinfo
+++ b/wm/enlightenment/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:44 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:23 jlam Exp $
 
 SHA1 (enlightenment-0.16.4.tar.gz) = 89e4b120a19c16a9f48de1eda0800837e26fdc92
 Size (enlightenment-0.16.4.tar.gz) = 11377994 bytes
-SHA1 (patch-aa) = c2d9e4c5a2f52adf27437462075d098f197fb6af
+SHA1 (patch-aa) = 7db0ef85e946225f770f0f65505656d341182a6e
 SHA1 (patch-ab) = c7982927d2870fa2eb04903f467d61f8984315c1
 SHA1 (patch-ac) = 9f3b794c818be0471ae6679d67fd79d79cc28216
 SHA1 (patch-ad) = fd1054a21481cf00468f9a72eff7ab0699d7ef75
diff --git a/wm/enlightenment/patches/patch-aa b/wm/enlightenment/patches/patch-aa
index a64f6bcc523..bb112f1dc38 100644
--- a/wm/enlightenment/patches/patch-aa
+++ b/wm/enlightenment/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:23 jlam Exp $
 
---- configure.orig	Tue Apr 11 01:19:49 2000
-+++ configure	Sun Jul 30 21:38:11 2000
+--- configure.orig	Mon Apr 10 19:19:49 2000
++++ configure
 @@ -4810,7 +4810,7 @@
  if test "x$enable_fsstd" = "xyes"; then
  	ENLIGHTENMENT_ROOT=${datadir}/enlightenment
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  	USE_FSSTD=yes
  else
  	ENLIGHTENMENT_ROOT=${prefix}/enlightenment
-@@ -5473,7 +5473,7 @@
+@@ -5317,7 +5317,6 @@
+   rm -f conf.imlibtest
+ 
+ 
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+ LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/\(.*\)-lImlib.*/\1/'`"
+ LDFLAGS="$LDFLAGS `echo $IMLIB_LIBS | sed 's/.*-lImlib.*\(-L[^ ]*\).*$/\1/'`"
+ XTST_LIBS=""
+@@ -5473,7 +5472,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  cat > conftest.$ac_ext <<EOF
  #line 5479 "configure"
  #include "confdefs.h"
-@@ -5501,7 +5501,7 @@
+@@ -5501,7 +5500,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -29,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  else
    echo "$ac_t""no" 1>&6
  
-@@ -5518,14 +5518,14 @@
+@@ -5518,14 +5517,14 @@
  
  
  
@@ -50,7 +58,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  cat > conftest.$ac_ext <<EOF
  #line 5531 "configure"
  #include "confdefs.h"
-@@ -5540,23 +5540,45 @@
+@@ -5540,23 +5539,45 @@
  EOF
  if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
@@ -105,7 +113,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  echo "Warning: Enlightenment requires the dl (dynamic loader) library"
  echo "to be supported on your platform for module support.  Modules"
  echo "have been disabled (this will affect functionality)"
-@@ -5564,9 +5586,8 @@
+@@ -5564,9 +5585,8 @@
  fi
  
  
@@ -116,7 +124,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xtst'_'XTestGrabControl | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5574,7 +5595,7 @@
+@@ -5574,7 +5594,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXtst $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -125,7 +133,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5585,7 +5606,7 @@
+@@ -5585,7 +5605,7 @@
  XTestGrabControl()
  ; return 0; }
  EOF
@@ -134,7 +142,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5613,7 +5634,7 @@
+@@ -5613,7 +5633,7 @@
  fi
  
  echo $ac_n "checking for XTestQueryExtension in -lXtst""... $ac_c" 1>&6
@@ -143,7 +151,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xtst'_'XTestQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5621,7 +5642,7 @@
+@@ -5621,7 +5641,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXtst $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -152,7 +160,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5632,7 +5653,7 @@
+@@ -5632,7 +5652,7 @@
  XTestQueryExtension()
  ; return 0; }
  EOF
@@ -161,7 +169,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5654,7 +5675,7 @@
+@@ -5654,7 +5674,7 @@
  
  
  echo $ac_n "checking for XkbQueryExtension in -lXext""... $ac_c" 1>&6
@@ -170,7 +178,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xext'_'XkbQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5662,7 +5683,7 @@
+@@ -5662,7 +5682,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -179,7 +187,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5673,7 +5694,7 @@
+@@ -5673,7 +5693,7 @@
  XkbQueryExtension()
  ; return 0; }
  EOF
@@ -188,7 +196,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5697,7 +5718,7 @@
+@@ -5697,7 +5717,7 @@
  fi
  
  echo $ac_n "checking for XineramaQueryExtension in -lXinerama""... $ac_c" 1>&6
@@ -197,7 +205,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xinerama'_'XineramaQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5705,7 +5726,7 @@
+@@ -5705,7 +5725,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXinerama $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -206,7 +214,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5716,7 +5737,7 @@
+@@ -5716,7 +5736,7 @@
  XineramaQueryExtension()
  ; return 0; }
  EOF
@@ -215,7 +223,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5753,7 +5774,7 @@
+@@ -5753,7 +5773,7 @@
  
  if test "x$enable_zoom" = "xyes"; then
  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
@@ -224,7 +232,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5761,7 +5782,7 @@
+@@ -5761,7 +5781,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXxf86vm $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -233,7 +241,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5772,7 +5793,7 @@
+@@ -5772,7 +5792,7 @@
  XF86VidModeQueryExtension()
  ; return 0; }
  EOF
@@ -242,7 +250,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5808,7 +5829,7 @@
+@@ -5808,7 +5828,7 @@
  
  
  echo $ac_n "checking for mass_quantities_of_bass_ale in -lFridge""... $ac_c" 1>&6
@@ -251,7 +259,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Fridge'_'mass_quantities_of_bass_ale | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5816,7 +5837,7 @@
+@@ -5816,7 +5836,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lFridge  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -260,7 +268,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5827,7 +5848,7 @@
+@@ -5827,7 +5847,7 @@
  mass_quantities_of_bass_ale()
  ; return 0; }
  EOF
@@ -269,7 +277,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5855,7 +5876,7 @@
+@@ -5855,7 +5875,7 @@
  fi
  
  echo $ac_n "checking for mass_quantities_of_any_ale in -lFridge""... $ac_c" 1>&6
@@ -278,7 +286,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  ac_lib_var=`echo Fridge'_'mass_quantities_of_any_ale | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5863,7 +5884,7 @@
+@@ -5863,7 +5883,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lFridge  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -287,7 +295,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:47 wiz Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5874,7 +5895,7 @@
+@@ -5874,7 +5894,7 @@
  mass_quantities_of_any_ale()
  ; return 0; }
  EOF