diff options
| author | jlam <jlam@pkgsrc.org> | 2000-07-19 21:42:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-07-19 21:42:11 +0000 |
| commit | 8b6674701128bede2ea8839e1de71a4ce1dca9b8 (patch) | |
| tree | d0e6549931825447dd23fc2c20e28434dc8f7597 /japanese | |
| parent | b1a1b52e0d1446dc5c47cd4328dbe777cbac513e (diff) | |
| download | pkgsrc-8b6674701128bede2ea8839e1de71a4ce1dca9b8.tar.gz | |
Pass correct flags at link time to find libraries at runtime, a.k.a. fix
for ELF and new libtool.
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/vflib-lib/Makefile.common | 6 | ||||
| -rw-r--r-- | japanese/vflib-lib/files/patch-sum | 4 | ||||
| -rw-r--r-- | japanese/vflib-lib/patches/patch-ab | 17 |
3 files changed, 20 insertions, 7 deletions
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common index 33c5b24b4f7..25d6926ca83 100644 --- a/japanese/vflib-lib/Makefile.common +++ b/japanese/vflib-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2000/07/14 06:53:57 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2000/07/19 21:42:11 jlam Exp $ # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $ DISTNAME= VFlib2-${VFLIB_VERSION} @@ -11,7 +11,7 @@ VFLIB_SRC= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf:../../devel/autoconf DEPENDS+= freetype-lib-1.2:../../graphics/freetype-lib VFLIB_VERSION= 2.24.2 @@ -33,6 +33,6 @@ PATCHDIR= ${.CURDIR}/../../japanese/vflib-lib/patches EXTRACT_ONLY= ${VFLIB_SRC} pre-configure: - cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf + cd ${WRKSRC} && autoconf .include "../../mk/bsd.pkg.mk" diff --git a/japanese/vflib-lib/files/patch-sum b/japanese/vflib-lib/files/patch-sum index b54e7a551b2..f3d98ce5523 100644 --- a/japanese/vflib-lib/files/patch-sum +++ b/japanese/vflib-lib/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/07/19 21:42:12 jlam Exp $ MD5 (patch-aa) = 2a3491bd8c9c5b46c58d6b67338c9c1a -MD5 (patch-ab) = 6dbd8b61a65ce0edf2f707953b356543 +MD5 (patch-ab) = 6df94b79d6c8c27f6f517031da056e48 MD5 (patch-ac) = 05e4bed17f11977828f8ec2b2f6b10b1 MD5 (patch-ad) = 252cdba34ca026a9101caf93b99219b8 diff --git a/japanese/vflib-lib/patches/patch-ab b/japanese/vflib-lib/patches/patch-ab index e5787681c6b..d300e040fe7 100644 --- a/japanese/vflib-lib/patches/patch-ab +++ b/japanese/vflib-lib/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2000/07/19 21:42:12 jlam Exp $ --- configure.in.orig Wed Feb 17 23:58:02 1999 -+++ configure.in Mon May 1 04:37:48 2000 ++++ configure.in Wed Jul 19 17:36:22 2000 @@ -54,6 +54,11 @@ fi AC_SUBST(XX_CFLAGS) @@ -14,6 +14,19 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $ AC_SUBST(freetype_includedir) AC_SUBST(freetype_libdir) +@@ -75,10 +80,10 @@ + AC_ARG_WITH( + freetype-libdir, + [ --with-freetype-libdir=DIR FreeType library files are in DIR], +- if test "${withval}" = yes; then withval=""; fi; ++ [if test "${withval}" = yes; then withval=""; fi; + if test "${withval}" = ""; + then freetype_libdir="" +- else freetype_libdir=-L${withval}; fi) ++ else freetype_libdir="-Wl,-R${withval} -L${withval}"; fi]) + if test -n "$freetype_lib" ; then + echo "Enabled the TrueType font driver"; + OLD_CPPFLAGS=${CPPFLAGS}; OLD_LIBS=${LIBS} @@ -117,6 +122,7 @@ AC_CONFIG_HEADER(src/with.h src/config.h) AC_OUTPUT(Makefile make-sub src/Makefile tools/Imakefile) |