aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>1998-10-04 22:47:14 +0800
committerkuriyama <kuriyama@FreeBSD.org>1998-10-04 22:47:14 +0800
commit80a4b1fd2ae6b31fd4d1454ded00932c8edc92f6 (patch)
treebf6b5d0f847c076ccd79546032d6a007282cc0dd
parent98c8b8725408514ec7460d4c463236634edb4753 (diff)
downloadfreebsd-ports-gnome-80a4b1fd2ae6b31fd4d1454ded00932c8edc92f6.tar.gz
freebsd-ports-gnome-80a4b1fd2ae6b31fd4d1454ded00932c8edc92f6.tar.zst
freebsd-ports-gnome-80a4b1fd2ae6b31fd4d1454ded00932c8edc92f6.zip
ELF patch for japanese/vflib
PR: ports/8114 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
-rw-r--r--japanese/vflib/Makefile5
-rw-r--r--japanese/vflib/files/patch-aa11
-rw-r--r--japanese/vflib/pkg-plist4
3 files changed, 9 insertions, 11 deletions
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 5b3f7030bc2d..bbae0b1adf4e 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -3,7 +3,7 @@
# Date created: 10 May 1996
# Whom: Mita Yoshio <mita@jp.FreeBSD.org>
#
-# $Id: Makefile,v 1.15 1998/09/09 08:39:05 max Exp $
+# $Id: Makefile,v 1.16 1998/09/21 08:41:44 asami Exp $
#
DISTNAME= VFlib-2.23-PL1
@@ -14,6 +14,7 @@ DISTFILES= TypeHack-19980625.tar.gz watanabe-vf.tar.Z
MAINTAINER= mita@jp.FreeBSD.org
+BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool
LIB_DEPENDS= ttf.2:${PORTSDIR}/print/freetype
EXTRACT_ONLY= TypeHack-19980625.tar.gz
@@ -33,6 +34,6 @@ post-install:
${MKDIR} ${PREFIX}/share/fonts/watanabe_font
tar -C ${PREFIX}/share/fonts/watanabe_font \
-xzf ${DISTDIR}/watanabe-vf.tar.Z
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff --git a/japanese/vflib/files/patch-aa b/japanese/vflib/files/patch-aa
index 665c98621d53..f995511c8a44 100644
--- a/japanese/vflib/files/patch-aa
+++ b/japanese/vflib/files/patch-aa
@@ -1,14 +1,11 @@
---- configure.in.ORIG Sat Jun 27 21:12:41 1998
-+++ configure.in Sat Jun 27 21:18:23 1998
-@@ -12,8 +12,10 @@
-
+--- configure.in.orig Tue Jun 23 19:56:28 1998
++++ configure.in Fri Sep 25 15:11:46 1998
+@@ -13,7 +13,7 @@
./ltconfig ltmain.sh
-+AC_SUBST(freetype_dir)
-+freetype_dir='$(prefix)/include'
AC_SUBST(freetype_objs)
-freetype_objs='$(FREETYPE_DIR)/*.lo'
-+freetype_objs='$(prefix)/lib/libttf.so'
++freetype_objs=''
AC_ARG_DISABLE(freetype,[ --disable-freetype Disable FreeType], freetype_objs="", AC_DEFINE(WITH_FREETYPE))
AC_SUBST(sony_fslib)
diff --git a/japanese/vflib/pkg-plist b/japanese/vflib/pkg-plist
index cff33a1d7619..f3d698874e74 100644
--- a/japanese/vflib/pkg-plist
+++ b/japanese/vflib/pkg-plist
@@ -438,5 +438,5 @@ share/fonts/watanabe_font/mincho.vf2
@dirrm share/VFlib
@dirrm share/doc/VFlib2-2.23.1/doc
@dirrm share/doc/VFlib2-2.23.1
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R