[pkgsrc/trunk]: pkgsrc/editors Fix a build/linking problem wrt Xft2.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47e58358676a
branches:  trunk
changeset: 466634:47e58358676a
user:      recht <recht%pkgsrc.org@localhost>
date:      Wed Jan 21 17:43:55 2004 +0000

description:
Fix a build/linking problem wrt Xft2.
Reported by Peter Bex.

diffstat:

 editors/elvis-x11/Makefile     |   5 +++--
 editors/elvis/distinfo         |   4 ++--
 editors/elvis/patches/patch-ab |  22 ++++++++++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 2a482902006b -r 47e58358676a editors/elvis-x11/Makefile
--- a/editors/elvis-x11/Makefile        Wed Jan 21 16:27:54 2004 +0000
+++ b/editors/elvis-x11/Makefile        Wed Jan 21 17:43:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 22:48:07 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/21 17:43:55 recht Exp $
 #
 
 .include "../elvis/Makefile.common"
@@ -13,7 +13,8 @@
 CONFIGURE_ARGS+=       --with-x=yes
 CONFIGURE_ARGS+=       --with-xft
 
-MAKEFLAGS+=    CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}"
+#MAKEFLAGS+=   CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}"
 
 .include "../../fonts/Xft2/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a482902006b -r 47e58358676a editors/elvis/distinfo
--- a/editors/elvis/distinfo    Wed Jan 21 16:27:54 2004 +0000
+++ b/editors/elvis/distinfo    Wed Jan 21 17:43:55 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/01/20 22:48:07 recht Exp $
+$NetBSD: distinfo,v 1.3 2004/01/21 17:43:55 recht Exp $
 
 SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
 Size (elvis-2.2_0.tar.gz) = 1439293 bytes
 SHA1 (patch-aa) = b533a7437de65eac9faed27826edce2111f71f30
-SHA1 (patch-ab) = 277860e7f007a8221505913687b2b707d1cc96be
+SHA1 (patch-ab) = 3ded3089b617bccc3458e6c9101a339534fd3152
 SHA1 (patch-ac) = d95439604922dd92ae658ca6e09dca4829ea66c7
diff -r 2a482902006b -r 47e58358676a editors/elvis/patches/patch-ab
--- a/editors/elvis/patches/patch-ab    Wed Jan 21 16:27:54 2004 +0000
+++ b/editors/elvis/patches/patch-ab    Wed Jan 21 17:43:55 2004 +0000
@@ -1,8 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2004/01/21 10:11:19 recht Exp $
+$NetBSD: patch-ab,v 1.2 2004/01/21 17:43:55 recht Exp $
 
---- configure.orig     2004-01-20 23:11:37.000000000 +0100
-+++ configure  2004-01-20 23:11:54.000000000 +0100
-@@ -950,7 +950,7 @@
+--- configure.orig     2003-10-21 04:32:25.000000000 +0200
++++ configure  2004-01-21 18:22:46.000000000 +0100
+@@ -905,11 +905,8 @@
+ then
+       case "$FEATURE_XFT" in
+         define)
+-              xft="-lXft "
+-              if [ -d /usr/include/freetype2 ]
+-              then
+-                      CC="$CC -I/usr/include/freetype2"
+-              fi
++              xft="`pkg-config --libs freetype2 xft` "
++              CC="$CC `pkg-config --cflags freetype2 xft`"
+               ;;
+         *)    
+               xft=""
+@@ -950,7 +947,7 @@
  
  
  # Generate the "config.h" file