summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-02-09 04:17:28 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-02-09 04:17:28 +0000
commitad5aa60d5d3d243bdc1a856f99e63c5f46a9a2c5 (patch)
treebd294316f35baab2a7948952911fd2328b380150 /fonts
parent302bdac6faea64b41d6fca3b68022cfb5419a11f (diff)
downloadpkgsrc-ad5aa60d5d3d243bdc1a856f99e63c5f46a9a2c5.tar.gz
bl3ify, enable libtool now we have 1.5.2, remove useless PLIST_SUBST.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/Xft2/Makefile31
-rw-r--r--fonts/Xft2/PLIST4
2 files changed, 11 insertions, 24 deletions
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 84ed89ba327..8dfcf60b19b 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/22 08:38:29 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/09 04:17:28 xtraeme Exp $
#
DISTNAME= xft-2.1.2
@@ -16,34 +16,21 @@ COMMENT= Library for configuring and customizing font access
BUILDLINK_DEPENDS.freetype2= freetype2>=2.0.9
GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-# Uses libtool 1.5 features
-#USE_LIBTOOL= YES
+USE_BUILDLINK3= YES
+USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_GNU_TOOLS+= awk
PKGCONFIG_OVERRIDE= ${WRKSRC}/xft.pc.in
-#LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
MAKE_ENV+= EGREP="${EGREP}"
BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2
-.include "../../mk/bsd.prefs.mk"
-
-# XXX: Temporal fix for systems where libXft.so.$(MAJOR_VERSION).$(MINOR_VERSION)
-# is not built (we have to use libtool 1.5 to have the same library between all
-# systems)
-
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
-PLIST_SUBST+= LIBXFT="@comment "
-.else
-PLIST_SUBST+= LIBXFT=""
-.endif
-
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../fonts/fontconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../x11/Xrender/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/Xft2/PLIST b/fonts/Xft2/PLIST
index 9ae7cf5bfea..40d1636ae93 100644
--- a/fonts/Xft2/PLIST
+++ b/fonts/Xft2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/10/03 20:13:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/09 04:17:28 xtraeme Exp $
bin/xft-config
include/X11/Xft/Xft.h
include/X11/Xft/XftCompat.h
@@ -6,7 +6,7 @@ lib/libXft.a
lib/libXft.la
lib/libXft.so
lib/libXft.so.2
-${LIBXFT}lib/libXft.so.2.1
+lib/libXft.so.2.1
lib/pkgconfig/xft.pc
man/man3/Xft.3
@dirrm include/X11/Xft