Date: Thu, 04 Nov 1999 14:43:26 +0900 From: taguchi@tohoku.iij.ad.jp To: freebsd-ports@FreeBSD.org Cc: jseger@FreeBSD.org Subject: freetype-1.3 Message-ID: <14369.7422.593913.26482Z@hirose.tohoku.iij.ad.jp>
next in thread | raw e-mail | index | archive | help
Hi,
Some peoples request me to update x11-servers/XttXF{86|98}srv-*.
I'm making new version of ports. and it's in test stage now.
many alpha testers report me many bugs/sugestions, so I can fix
them soon (I strongly hope so).
But I have a probrem. new X-TT 1.3 requires new freetype-1.3.
And the other hands, ${PORTSDIR}/print/freetype is still freetype-1.2.
So I made a patch which update freetype-1.2 to 1.3.
It's NOT a probrem. True probrem is following.
freetype-1.2 install thire include files to ${PREFIX}/include/.
but freetype-1.3 is NOT. it install include files to
${PREFIX}/include/freetype/.
Currenty, many ports depend freetype.
# grep freetype /usr/ports/INDEX | wc -l
77
This means, if we update freetype, then 76 ports will be "BROKEN".
It never sounds good.
So I discused some ports mainteners. One of them (Thanks, Kuriyama-san)
sugested following steps.
1. repository copy from freetype to freetype12
2. At the all ports which depend freetype, change LIB_DEPENDS from
freetype to freetype12
3. upgrade freetype ports from 1.2 to 1.3
4. At the any ports which depend freetype12, try to depend new freetype.
5. If all ports depend new freetype, then cvs remove freetype12.
How about this steps?
followings are freetype upgrade patch, and patch file for step2.
BEGIN>8---8<cut here>8---
diff -urN freetype.old/Makefile freetype/Makefile
--- freetype.old/Makefile Fri Oct 29 10:29:04 1999
+++ freetype/Makefile Fri Oct 29 10:45:58 1999
@@ -1,12 +1,12 @@
# New ports collection makefile for: freetype
-# Version required: 1.2
+# Version required: 1.3
# Date created: January 24, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD: ports/print/freetype/Makefile,v 1.12 1999/08/31 01:44:45 peter Exp $
#
-DISTNAME= freetype-1.2
+DISTNAME= freetype-1.3
CATEGORIES= print
MASTER_SITES= ftp://ftp.tux.org/pub/devel/freetype/ \
ftp://ftp.lerc.nasa.gov/ImageMagick/delegates/ \
diff -urN freetype.old/files/md5 freetype/files/md5
--- freetype.old/files/md5 Fri Oct 29 10:29:04 1999
+++ freetype/files/md5 Fri Oct 29 10:33:04 1999
@@ -1 +1 @@
-MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc
+MD5 (freetype-1.3.tar.gz) = 8479c1fa3697a3aa8c9919aaeed81cc9
diff -urN freetype.old/patches/patch-aa freetype/patches/patch-aa
--- freetype.old/patches/patch-aa Thu Jan 1 09:00:00 1970
+++ freetype/patches/patch-aa Fri Oct 29 10:44:50 1999
@@ -0,0 +1,15 @@
+*** lib/ttgload.c.adw Fri Jun 5 18:44:19 1998
+--- lib/ttgload.c Sun Aug 23 02:17:13 1998
+***************
+*** 95,102 ****
+--- 95,104 ----
+ {
+ TT_Get_Metrics( &face->horizontalHeader, index, lsb, aw );
+
++ #if 0
+ if ( check && face->postscript.isFixedPitch )
+ *aw = face->horizontalHeader.advance_Width_Max;
++ #endif /* for DynaLab FONT with X-TT */
+ }
+
+
diff -urN freetype.old/patches/patch-ac freetype/patches/patch-ac
--- freetype.old/patches/patch-ac Fri Oct 29 10:29:04 1999
+++ freetype/patches/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,44 +0,0 @@
---- ltmain.sh.orig Sat Sep 19 11:12:26 1998
-+++ ltmain.sh Sat Sep 19 11:19:06 1998
-@@ -967,6 +967,16 @@
- versuffix="$current.$revision"
- ;;
-
-+ freebsd)
-+ version_vars="$version_vars major versuffix"
-+ major="$current"
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ versuffix="$current"
-+ else
-+ versuffix="$current.$revision"
-+ fi
-+ ;;
-+
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig Sat Sep 19 11:12:21 1998
-+++ ltconfig Sat Sep 19 11:15:42 1998
-@@ -1123,10 +1123,21 @@
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='${libname}${release}.so.$versuffix $libname.so'
- finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd3* | freebsd4*)
-+ version_type=freebsd
-+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
diff -urN freetype.old/pkg/PLIST freetype/pkg/PLIST
--- freetype.old/pkg/PLIST Fri Oct 29 10:29:04 1999
+++ freetype/pkg/PLIST Fri Oct 29 10:55:45 1999
@@ -1,7 +1,11 @@
bin/ftdump
+bin/fterror
bin/ftlint
+bin/ftmetric
+bin/ftsbit
bin/ftstring
bin/ftstrpnm
+bin/ftstrtto
bin/fttimer
bin/ftview
bin/ftzoom
@@ -11,12 +15,17 @@
include/ftxcmap.h
include/ftxerr18.h
include/ftxgasp.h
+include/ftxgdef.h
+include/ftxgpos.h
+include/ftxgsub.h
include/ftxkern.h
+include/ftxopen.h
include/ftxpost.h
+include/ftxsbit.h
include/ftxwidth.h
lib/libttf.a
lib/libttf.la
lib/libttf.so
-lib/libttf.so.3
+lib/libttf.so.4
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
END>---8<cut here>8---
BEGIN>8---8<cut here>8---
diff -ur old/chinese/CJK/Makefile new/chinese/CJK/Makefile
--- old/chinese/CJK/Makefile Thu Nov 4 13:59:56 1999
+++ new/chinese/CJK/Makefile Thu Nov 4 14:03:19 1999
@@ -15,8 +15,8 @@
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \
${X11BASE}/lib/X11/fonts/TrueType/moe_lishu.ttf:${PORTSDIR}/chinese/moettf \
- ttf2pk:${PORTSDIR}/print/freetype:build
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+ ttf2pk:${PORTSDIR}/print/freetype12:build
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
NO_PACKAGE= Interactive
diff -ur old/editors/yudit/Makefile new/editors/yudit/Makefile
--- old/editors/yudit/Makefile Thu Nov 4 14:00:18 1999
+++ new/editors/yudit/Makefile Thu Nov 4 14:03:43 1999
@@ -13,7 +13,7 @@
MAINTAINER= rch@WriteMe.Com
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
CONFIGURE_ENV= LC_ALL=C CXXFLAGS="${CFLAGS}"
diff -ur old/games/powerpak/Makefile new/games/powerpak/Makefile
--- old/games/powerpak/Makefile Thu Nov 4 14:00:29 1999
+++ new/games/powerpak/Makefile Thu Nov 4 14:04:01 1999
@@ -14,7 +14,7 @@
MAINTAINER= andy@icc.surw.chel.su
LIB_DEPENDS= SDL.0:${PORTSDIR}/devel/sdl \
- ttf.3:${PORTSDIR}/print/freetype
+ ttf.3:${PORTSDIR}/print/freetype12
MAKEFILE= Makefile.FreeBSD
diff -ur old/graphics/ImageMagick/Makefile new/graphics/ImageMagick/Makefile
--- old/graphics/ImageMagick/Makefile Thu Nov 4 14:00:39 1999
+++ new/graphics/ImageMagick/Makefile Thu Nov 4 14:04:23 1999
@@ -22,7 +22,7 @@
tiff.4:${PORTSDIR}/graphics/tiff \
png.3:${PORTSDIR}/graphics/png \
jbig.1:${PORTSDIR}/graphics/jbigkit \
- ttf.3:${PORTSDIR}/print/freetype
+ ttf.3:${PORTSDIR}/print/freetype12
BUILD_DEPENDS= fig2dev:${PORTSDIR}/print/transfig \
picttoppm:${PORTSDIR}/graphics/netpbm \
mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
diff -ur old/graphics/libwmf/Makefile new/graphics/libwmf/Makefile
--- old/graphics/libwmf/Makefile Thu Nov 4 14:00:52 1999
+++ new/graphics/libwmf/Makefile Thu Nov 4 14:04:44 1999
@@ -13,7 +13,7 @@
MAINTAINER= cpiazza@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- ttf.3:${PORTSDIR}/print/freetype
+ ttf.3:${PORTSDIR}/print/freetype12
WRKSRC= ${WRKDIR}/libwmf
diff -ur old/japanese/vflib/Makefile new/japanese/vflib/Makefile
--- old/japanese/vflib/Makefile Thu Nov 4 14:01:05 1999
+++ new/japanese/vflib/Makefile Thu Nov 4 14:04:59 1999
@@ -15,7 +15,7 @@
MAINTAINER= mita@jp.FreeBSD.org
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
VFLIB_VERSION= 2.24.1
PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION}
diff -ur old/korean/ftghostscript5/Makefile new/korean/ftghostscript5/Makefile
--- old/korean/ftghostscript5/Makefile Thu Nov 4 14:01:18 1999
+++ new/korean/ftghostscript5/Makefile Thu Nov 4 14:05:39 1999
@@ -32,7 +32,7 @@
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \
/nonexistent:${PORTSDIR}/graphics/png:extract
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
- ttf.3:${PORTSDIR}/print/freetype
+ ttf.3:${PORTSDIR}/print/freetype12
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES} ${PCL3_DRV}
diff -ur old/misc/magicpoint/Makefile new/misc/magicpoint/Makefile
--- old/misc/magicpoint/Makefile Thu Nov 4 14:01:31 1999
+++ new/misc/magicpoint/Makefile Thu Nov 4 14:05:53 1999
@@ -14,7 +14,7 @@
MAINTAINER?= itojun@itojun.org
-LIB_DEPENDS+= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS+= ttf.3:${PORTSDIR}/print/freetype12
USE_IMAKE= yes
GNU_CONFIGURE= yes
diff -ur old/print/perlftlib/Makefile new/print/perlftlib/Makefile
--- old/print/perlftlib/Makefile Thu Nov 4 14:01:42 1999
+++ new/print/perlftlib/Makefile Thu Nov 4 14:06:11 1999
@@ -14,7 +14,7 @@
MAINTAINER= taoka@FreeBSD.org
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/jcode.pl:${PORTSDIR}/japanese/p5-jcode.pl
USE_PERL5= yes
diff -ur old/x11-fonts/ttmkfdir/Makefile new/x11-fonts/ttmkfdir/Makefile
--- old/x11-fonts/ttmkfdir/Makefile Thu Nov 4 14:01:53 1999
+++ new/x11-fonts/ttmkfdir/Makefile Thu Nov 4 14:06:30 1999
@@ -12,7 +12,7 @@
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
diff -ur old/x11-fonts/xmbdfed/Makefile new/x11-fonts/xmbdfed/Makefile
--- old/x11-fonts/xmbdfed/Makefile Thu Nov 4 14:02:06 1999
+++ new/x11-fonts/xmbdfed/Makefile Thu Nov 4 14:06:52 1999
@@ -16,7 +16,7 @@
MAINTAINER= jfieber@FreeBSD.org
.if defined(USE_FREETYPE)
-LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype12
.endif
USE_X_PREFIX= yes
diff -ur old/x11-servers/XttXF86srv-common/Makefile new/x11-servers/XttXF86srv-common/Makefile
--- old/x11-servers/XttXF86srv-common/Makefile Thu Nov 4 14:02:22 1999
+++ new/x11-servers/XttXF86srv-common/Makefile Thu Nov 4 14:07:12 1999
@@ -21,7 +21,7 @@
MAINTAINER= taguchi@tohoku.iij.ad.jp
-LIB_DEPENDS+= ttf.3:${PORTSDIR}/print/freetype
+LIB_DEPENDS+= ttf.3:${PORTSDIR}/print/freetype12
RUN_DEPENDS= mkttfdir:${PORTSDIR}/print/perlftlib
VERSION= 1.2
Only in old/x11-servers/XttXF86srv-common: Makefile~
Only in old/x11-servers/XttXF86srv-common: TODO~
diff -ur old/x11-wm/enlightenment/Makefile new/x11-wm/enlightenment/Makefile
--- old/x11-wm/enlightenment/Makefile Thu Nov 4 14:02:36 1999
+++ new/x11-wm/enlightenment/Makefile Thu Nov 4 14:07:29 1999
@@ -20,7 +20,7 @@
gif.5:${PORTSDIR}/graphics/giflib \
Imlib.5:${PORTSDIR}/graphics/imlib \
tiff.4:${PORTSDIR}/graphics/tiff \
- ttf.3:${PORTSDIR}/print/freetype \
+ ttf.3:${PORTSDIR}/print/freetype12 \
ghttp.1:${PORTSDIR}/www/libghttp
USE_GMAKE= yes
END>---8<cut here>8---
Thanks.
Taguchi, T.
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?14369.7422.593913.26482Z>