Date: Wed, 30 Sep 1998 23:07:48 -0700 (PDT) From: taoka@infonets.hiroshima-u.ac.jp To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/8114: ELF patch for japanese/vflib Message-ID: <199810010607.XAA21425@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 8114
>Category: ports
>Synopsis: ELF patch for japanese/vflib
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 30 23:10:00 PDT 1998
>Last-Modified:
>Originator: Satoshi Taoka
>Organization:
Hiroshima Univ. in Japan
>Release: FreeBSD 3.0-19980921-BETA
>Environment:
>Description:
ELF patch for japanese/vflib
>How-To-Repeat:
>Fix:
diff -ruaN -x CVS /usr/ports/japanese/vflib/Makefile vflib/Makefile
--- /usr/ports/japanese/vflib/Makefile Tue Sep 22 08:32:15 1998
+++ vflib/Makefile Fri Sep 25 17:12:53 1998
@@ -14,6 +14,7 @@
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 @@
${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 -ruaN -x CVS /usr/ports/japanese/vflib/patches/patch-aa vflib/patches/patch-aa
--- /usr/ports/japanese/vflib/patches/patch-aa Sun Aug 2 03:07:21 1998
+++ vflib/patches/patch-aa Fri Sep 25 15:12:11 1998
@@ -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 -ruaN -x CVS /usr/ports/japanese/vflib/patches/patch-ab vflib/patches/patch-ab
--- /usr/ports/japanese/vflib/patches/patch-ab Sun Aug 2 03:07:22 1998
+++ vflib/patches/patch-ab Fri Sep 25 15:22:34 1998
@@ -1,11 +1,25 @@
---- src/Makefile.in.ORIG Sat Jun 27 20:55:45 1998
-+++ src/Makefile.in Sat Jun 27 21:19:05 1998
-@@ -40,7 +40,7 @@
+--- src/Makefile.in.orig Thu Jun 11 15:11:33 1998
++++ src/Makefile.in Fri Sep 25 15:22:27 1998
+@@ -25,7 +25,7 @@
+ default: all
+
+ # GNU Libtool
+-LIBTOOL=../libtool
++LIBTOOL=$(prefix)/bin/libtool
+
+ # defs
+ include ../make-sub
+@@ -38,11 +38,11 @@
+
+
#DEBUGOPT = -DDYNAMIC_OPEN_CLOSE_DEBUG
- LIBS = @sony_fslib@ $(SYS_LIBS)
+-LIBS = @sony_fslib@ $(SYS_LIBS)
++LIBS = @sony_fslib@ $(SYS_LIBS) -L$(prefix)/lib -lttf
--FREETYPE_DIR=../../freetype/lib
-+FREETYPE_DIR=@freetype_dir@
+ FREETYPE_DIR=../../freetype/lib
FREETYPE_OBJS=@freetype_objs@
- FREETYPE_INC=-I$(FREETYPE_DIR)
+-FREETYPE_INC=-I$(FREETYPE_DIR)
++FREETYPE_INC=-I$(prefix)/include
+ # for the HBF API
+ #ifdef __MSDOS__
diff -ruaN -x CVS /usr/ports/japanese/vflib/patches/patch-ac vflib/patches/patch-ac
--- /usr/ports/japanese/vflib/patches/patch-ac Sun Aug 2 03:07:23 1998
+++ vflib/patches/patch-ac Fri Sep 25 15:15:25 1998
@@ -1,15 +1,16 @@
---- tools/Imakefile.in.orig Wed Jul 15 21:37:11 1998
-+++ tools/Imakefile.in Wed Jul 15 21:39:28 1998
+--- tools/Imakefile.in.orig Fri Jun 5 11:04:35 1998
++++ tools/Imakefile.in Fri Sep 25 15:14:21 1998
@@ -19,12 +19,18 @@
* copies.
*/
+- LIBTOOL = ../libtool
+# Default macros setting
+ PREFIX ?= /usr/local
+ FREETYPELIBDIR ?= ${PREFIX}/lib
+ FREETYPEINCDIR ?= ${PREFIX}/include
+
- LIBTOOL = ../libtool
++ LIBTOOL = ${PREFIX}/bin/libtool
VFLIB_INCDIR = ../src
VFLIB_LIBDIR = ../src
diff -ruaN -x CVS /usr/ports/japanese/vflib/patches/patch-ad vflib/patches/patch-ad
--- /usr/ports/japanese/vflib/patches/patch-ad Thu Jan 1 09:00:00 1970
+++ vflib/patches/patch-ad Fri Sep 25 14:36:00 1998
@@ -0,0 +1,12 @@
+--- ../../../w/TypeHack-19980625/VFlib2-2.23.1/Makefile.in Thu Jun 11 15:11:15 1998
++++ Makefile.in Fri Sep 25 13:01:31 1998
+@@ -7,7 +7,8 @@
+
+ #-------------------------------------------------
+ include make-sub
+-LIBTOOL=./libtool
++#LIBTOOL=./libtool
++LIBTOOL=$(prefix)/bin/libtool
+
+ all:
+ (cd src; $(MAKE) $@)
diff -ruaN -x CVS /usr/ports/japanese/vflib/pkg/PLIST vflib/pkg/PLIST
--- /usr/ports/japanese/vflib/pkg/PLIST Sun Aug 2 03:07:25 1998
+++ vflib/pkg/PLIST Fri Sep 25 15:39:54 1998
@@ -438,5 +438,5 @@
@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
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199810010607.XAA21425>