summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-12-24 00:43:42 +0000
committerwiz <wiz@pkgsrc.org>2002-12-24 00:43:42 +0000
commit225cdf72ace0e7abaa8d53bfd8420deff8771acc (patch)
tree811621f4a609257077683a008eb83042da417c3c /fonts
parent7bc25da6b2b495c90d7cbe388c087f49fa6c2a37 (diff)
downloadpkgsrc-225cdf72ace0e7abaa8d53bfd8420deff8771acc.tar.gz
Fix pkgconfig file to have -lXext after -Xrender (why doesn't the library
have the dependency itself?). Bump PKGREVISION to 1, and depend on latest version in buildlink2.mk.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/Xft2/Makefile3
-rw-r--r--fonts/Xft2/buildlink2.mk4
-rw-r--r--fonts/Xft2/distinfo3
-rw-r--r--fonts/Xft2/patches/patch-ab13
4 files changed, 19 insertions, 4 deletions
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 70ea0ce7787..fb54ca0a70c 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/16 12:08:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2002/12/24 00:43:42 wiz Exp $
#
DISTNAME= fcpackage.2_1
PKGNAME= Xft2-2.1
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= http://fontconfig.org/release/
diff --git a/fonts/Xft2/buildlink2.mk b/fonts/Xft2/buildlink2.mk
index 979e8ebdc8b..5b521e82942 100644
--- a/fonts/Xft2/buildlink2.mk
+++ b/fonts/Xft2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 00:19:31 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 00:43:42 wiz Exp $
#
# This Makefile fragment is included by packages that use Xft2.
#
@@ -9,7 +9,7 @@
XFT2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= Xft2
-BUILDLINK_DEPENDS.Xft2?= Xft2>=2.1
+BUILDLINK_DEPENDS.Xft2?= Xft2>=2.1nb1
BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2
EVAL_PREFIX+= BUILDLINK_PREFIX.Xft2=Xft2
diff --git a/fonts/Xft2/distinfo b/fonts/Xft2/distinfo
index 0417757a80e..303cde7171b 100644
--- a/fonts/Xft2/distinfo
+++ b/fonts/Xft2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/16 12:08:42 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2002/12/24 00:43:43 wiz Exp $
SHA1 (fcpackage.2_1.tar.gz) = b4d960ea1e2384f48aa9fed05e90ad4755da12be
Size (fcpackage.2_1.tar.gz) = 544661 bytes
SHA1 (patch-aa) = d5de3f8a56cb1484e41f1e21dfeb72777ab10f02
+SHA1 (patch-ab) = 5374dac13a131edfb3e46f0336641d64036ee832
diff --git a/fonts/Xft2/patches/patch-ab b/fonts/Xft2/patches/patch-ab
new file mode 100644
index 00000000000..04239487621
--- /dev/null
+++ b/fonts/Xft2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/12/24 00:43:43 wiz Exp $
+
+--- configure.orig Fri Nov 22 03:30:00 2002
++++ configure
+@@ -1316,7 +1316,7 @@ fi
+ case "$have_x" in
+ yes)
+ XRENDER_CFLAGS="-I$x_includes"
+- XRENDER_LIBS="-L$x_libraries -lXrender"
++ XRENDER_LIBS="-L$x_libraries -lXrender -lXext"
+
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $XRENDER_LIBS"