diff options
| author | dillo <dillo@pkgsrc.org> | 2003-03-21 22:25:50 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2003-03-21 22:25:50 +0000 |
| commit | 830413cb6298c4f4c03256eb29d3169602ea514f (patch) | |
| tree | 6ea62c822be9f14d312eb206ae8f7e799016e0ec /graphics | |
| parent | d13412f14d4eefb2cebc69340762cbf9f9fd2d6d (diff) | |
| download | pkgsrc-830413cb6298c4f4c03256eb29d3169602ea514f.tar.gz | |
fix two bugs in freetype-config that prevent it from working outside
of pkgsrc:
- place -I${LOCALBASE}/freetype2 before -I${LOCALBASE}, since
otherwise freetype 1 headers might be used
- add -Wl,${RPATH_FLAG}
bump pkgrevision
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/freetype2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/freetype2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/freetype2/patches/patch-aa | 22 | ||||
| -rw-r--r-- | graphics/freetype2/patches/patch-ab | 12 |
4 files changed, 40 insertions, 2 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 9cf07af5931..59ae8a26a2c 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2002/12/24 00:04:16 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2003/03/21 22:25:50 dillo Exp $ # DISTNAME= freetype-2.1.3 PKGNAME= freetype2-2.1.3 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ ftp://ftp.freetype.org/freetype/freetype2/ \ @@ -21,6 +22,7 @@ USE_GMAKE= YES GNU_CONFIGURE= YES CONFIGURE_DIRS= ${WRKSRC}/builds/unix CONFIGURE_ARGS+= --includedir=${PREFIX}/include +CONFIGURE_ENV+= RPATH_FLAG="${RPATH_FLAG}" USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/builds/unix/libtool diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo index 9316c835cd2..11e52693e48 100644 --- a/graphics/freetype2/distinfo +++ b/graphics/freetype2/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/12/24 00:04:16 wiz Exp $ +$NetBSD: distinfo,v 1.6 2003/03/21 22:25:50 dillo Exp $ SHA1 (freetype-2.1.3.tar.bz2) = 7b101c9220c1a64061eec8f007301fb249a52737 Size (freetype-2.1.3.tar.bz2) = 790213 bytes +SHA1 (patch-aa) = e95285428ba58ce9ceeeec89d6f3fef04099488c +SHA1 (patch-ab) = 62ce099789f031845fcf71506302b4cdb1672066 diff --git a/graphics/freetype2/patches/patch-aa b/graphics/freetype2/patches/patch-aa new file mode 100644 index 00000000000..e30861952ac --- /dev/null +++ b/graphics/freetype2/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2003/03/21 22:25:51 dillo Exp $ + +--- builds/unix/freetype-config.in.orig Sat Feb 2 16:05:38 2002 ++++ builds/unix/freetype-config.in +@@ -81,7 +81,7 @@ fi + if test "$echo_cflags" = "yes" ; then + cflags="-I@includedir@/freetype2" + if test "@includedir@" != "/usr/include" ; then +- echo -I@includedir@ $cflags ++ echo $cflags -I@includedir@ + else + echo $cflags + fi +@@ -90,7 +90,7 @@ fi + if test "$echo_libs" = "yes" ; then + libs="-lfreetype" + if test "@libdir@" != "/usr/lib" ; then +- echo -L@libdir@ $libs ++ echo -L@libdir@ -Wl,@RPATH_FLAG@@libdir@ $libs + else + echo $libs + fi diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab new file mode 100644 index 00000000000..918d629fd82 --- /dev/null +++ b/graphics/freetype2/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2003/03/21 22:25:51 dillo Exp $ + +--- builds/unix/configure.orig Fri Mar 21 23:12:07 2003 ++++ builds/unix/configure +@@ -9259,6 +9259,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t + s,@STRIP@,$STRIP,;t t + s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t + s,@LIBTOOL@,$LIBTOOL,;t t ++s,@RPATH_FLAG@,$RPATH_FLAG,;t t + CEOF + + _ACEOF |