diff options
| author | recht <recht> | 2004-01-21 17:43:55 +0000 |
|---|---|---|
| committer | recht <recht> | 2004-01-21 17:43:55 +0000 |
| commit | 3b615d38132f668a1b6f098d7f848fb0d52e5ae8 (patch) | |
| tree | 7e96cde7c608267875bb728d5a0dab9772908905 /editors | |
| parent | 1be01ac4183eed8b95caf2b49c8495ccd16704a8 (diff) | |
| download | pkgsrc-3b615d38132f668a1b6f098d7f848fb0d52e5ae8.tar.gz | |
Fix a build/linking problem wrt Xft2.
Reported by Peter Bex.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/elvis-x11/Makefile | 5 | ||||
| -rw-r--r-- | editors/elvis/distinfo | 4 | ||||
| -rw-r--r-- | editors/elvis/patches/patch-ab | 22 |
3 files changed, 23 insertions, 8 deletions
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index 645925d171e..13f25fbc204 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -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 @@ USE_X11= YES 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 --git a/editors/elvis/distinfo b/editors/elvis/distinfo index 175abfc2bcd..bb893b76c8f 100644 --- a/editors/elvis/distinfo +++ b/editors/elvis/distinfo @@ -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 --git a/editors/elvis/patches/patch-ab b/editors/elvis/patches/patch-ab index 217bbb6dd0a..6aeb6a6cc65 100644 --- a/editors/elvis/patches/patch-ab +++ b/editors/elvis/patches/patch-ab @@ -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 |