Tue Nov 24 11:26:50 2009 UTC ()
ensure "freetype-config --libs" emits a run path.


(tnn)
diff -r1.70 -r1.71 pkgsrc/graphics/freetype2/Makefile
diff -r1.32 -r1.33 pkgsrc/graphics/freetype2/distinfo
diff -r0 -r1.19 pkgsrc/graphics/freetype2/patches/patch-aa
cvs diff -r1.70 -r1.71 pkgsrc/graphics/freetype2/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/freetype2/Makefile 2009/11/23 12:01:58 1.70
+++ pkgsrc/graphics/freetype2/Makefile 2009/11/24 11:26:50 1.71
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.70 2009/11/23 12:01:58 drochner Exp $ 1# $NetBSD: Makefile,v 1.71 2009/11/24 11:26:50 tnn Exp $
2 2
3DISTNAME= freetype-2.3.11 3DISTNAME= freetype-2.3.11
4PKGNAME= ${DISTNAME:S/-/2-/} 4PKGNAME= ${DISTNAME:S/-/2-/}
 5PKGREVISION= 1
5CATEGORIES= graphics 6CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \
7 ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/ 8 ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= rh@NetBSD.org 11MAINTAINER= rh@NetBSD.org
11HOMEPAGE= http://www.freetype.org/ 12HOMEPAGE= http://www.freetype.org/
12COMMENT= Font rendering engine and library API 13COMMENT= Font rendering engine and library API
13 14
14PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18USE_TOOLS+= grep gmake 19USE_TOOLS+= grep gmake
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20CONFIGURE_DIRS= ${WRKSRC}/builds/unix 21CONFIGURE_DIRS= ${WRKSRC}/builds/unix
21BUILD_DIRS= ${WRKSRC} 22BUILD_DIRS= ${WRKSRC}
22CONFIGURE_ARGS+= --includedir=${PREFIX}/include 23CONFIGURE_ARGS+= --includedir=${PREFIX}/include
 24CONFIGURE_ARGS+= --enable-shared
23CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q} 25CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q}
24 26
25.if exists(/System/Library/Frameworks/Carbon.framework) 27.if exists(/System/Library/Frameworks/Carbon.framework)
26LDFLAGS+= -framework Carbon 28LDFLAGS+= -framework Carbon
27.endif 29.endif
28 30
29PKGCONFIG_OVERRIDE= builds/unix/freetype2.in 31PKGCONFIG_OVERRIDE= builds/unix/freetype2.in
30 32
31.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
32.include "../../mk/compiler.mk" 34.include "../../mk/compiler.mk"
33 35
34PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2 36PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
35PKG_SUPPORTED_OPTIONS= truetype subpixel 37PKG_SUPPORTED_OPTIONS= truetype subpixel
cvs diff -r1.32 -r1.33 pkgsrc/graphics/freetype2/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/freetype2/distinfo 2009/11/23 12:01:58 1.32
+++ pkgsrc/graphics/freetype2/distinfo 2009/11/24 11:26:50 1.33
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.32 2009/11/23 12:01:58 drochner Exp $ 1$NetBSD: distinfo,v 1.33 2009/11/24 11:26:50 tnn Exp $
2 2
3SHA1 (freetype-2.3.11.tar.bz2) = 693e1b4e423557975c2b2aca63559bc592533a0e 3SHA1 (freetype-2.3.11.tar.bz2) = 693e1b4e423557975c2b2aca63559bc592533a0e
4RMD160 (freetype-2.3.11.tar.bz2) = ac69ed97aa662bc1dfb25422e64fc2afce1f863d 4RMD160 (freetype-2.3.11.tar.bz2) = ac69ed97aa662bc1dfb25422e64fc2afce1f863d
5Size (freetype-2.3.11.tar.bz2) = 1446474 bytes 5Size (freetype-2.3.11.tar.bz2) = 1446474 bytes
 6SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb
File Added: pkgsrc/graphics/freetype2/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.19 2009/11/24 11:26:50 tnn Exp $

--- builds/unix/freetype-config.in.orig	2009-03-14 14:45:26.000000000 +0100
+++ builds/unix/freetype-config.in
@@ -14,7 +14,7 @@ exec_prefix=@exec_prefix@
 exec_prefix_set=no
 includedir=@includedir@
 libdir=@libdir@
-enable_shared=@build_libtool_libs@
+enable_shared=yes # @build_libtool_libs@
 wl=@wl@
 hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'