From 6d9a1f18f8b7037164af070820808fa614c00b78 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 19 Jan 2000 10:23:03 +0000 Subject: [PATCH] Upgrade to version 1.3. --- print/freetype/Makefile | 4 ++-- print/freetype/files/md5 | 6 +++--- print/freetype/patches/patch-aa | 10 +++++----- print/freetype/patches/patch-ab | 25 ++++++++++++++----------- print/freetype/pkg/PLIST | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/print/freetype/Makefile b/print/freetype/Makefile index f4ff8e126b8..ae1b797e885 100644 --- a/print/freetype/Makefile +++ b/print/freetype/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 1999/06/03 14:11:10 brad Exp $ +# $OpenBSD: Makefile,v 1.5 2000/01/19 10:23:03 kevlo Exp $ # $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger 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 --git a/print/freetype/files/md5 b/print/freetype/files/md5 index 0628798a91a..d6f7466087d 100644 --- a/print/freetype/files/md5 +++ b/print/freetype/files/md5 @@ -1,3 +1,3 @@ -MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc -RMD160 (freetype-1.2.tar.gz) = 32f17b841473a52fc43ea0eecf8eadc180c4a4a6 -SHA1 (freetype-1.2.tar.gz) = f776eef75630f133736944762716c4ff183d06ac +MD5 (freetype-1.3.tar.gz) = 8479c1fa3697a3aa8c9919aaeed81cc9 +RMD160 (freetype-1.3.tar.gz) = 34bab16f36c36c3f502647ac0a7b20c906e5e22c +SHA1 (freetype-1.3.tar.gz) = 7c5b62b6202a8707ecaa277887a5576130857a66 diff --git a/print/freetype/patches/patch-aa b/print/freetype/patches/patch-aa index d66067cd291..ece2904638a 100644 --- a/print/freetype/patches/patch-aa +++ b/print/freetype/patches/patch-aa @@ -1,11 +1,11 @@ ---- lib/arch/unix/Makefile.in.orig Wed Mar 31 16:24:18 1999 -+++ lib/arch/unix/Makefile.in Wed Mar 31 16:24:31 1999 -@@ -178,7 +178,7 @@ +--- lib/arch/unix/Makefile.in.orig Wed Jan 19 18:08:23 2000 ++++ lib/arch/unix/Makefile.in Wed Jan 19 18:09:09 2000 +@@ -197,7 +197,7 @@ libttf.la: $(LIB_FILES) $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \ -rpath $(libdir) \ - -version-info $(version_info) $(FT_LIBS) -+ -version-info 1:2:0 $(FT_LIBS) ++ -version-info 1:3:0 $(FT_LIBS) install: libttf.la - $(MKINSTALLDIRS) $(libdir) $(includedir) + $(MKINSTALLDIRS) $(libdir) $(includedir)/freetype diff --git a/print/freetype/patches/patch-ab b/print/freetype/patches/patch-ab index 4ae8332bef2..b7c35762b3f 100644 --- a/print/freetype/patches/patch-ab +++ b/print/freetype/patches/patch-ab @@ -1,19 +1,19 @@ ---- ltmain.sh.orig Wed Mar 31 16:04:27 1999 -+++ ltmain.sh Wed Mar 31 16:04:43 1999 -@@ -2023,37 +2023,6 @@ - done - fi +--- ltmain.sh.orig Wed Jan 19 18:09:52 2000 ++++ ltmain.sh Wed Jan 19 18:10:50 2000 +@@ -3522,40 +3522,6 @@ + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 -- echo "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to do one of the following:" +- echo "If you ever happen to want to link against installed libraries" +- echo "in a given directory, LIBDIR, you must either use libtool, and" +- echo "specify the full pathname of the library, or use \`-LLIBDIR'" +- echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" @@ -28,13 +28,16 @@ - - echo " - use the \`$flag' linker flag" - fi +- if test -n "$admincmds"; then +- echo " - have your system administrator run these commands:$admincmds" +- fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "------------------------------------------------------------------------------" +- echo "----------------------------------------------------------------------" exit 0 ;; diff --git a/print/freetype/pkg/PLIST b/print/freetype/pkg/PLIST index 8185944f0b5..4ea70e9e9b3 100644 --- a/print/freetype/pkg/PLIST +++ b/print/freetype/pkg/PLIST @@ -16,5 +16,5 @@ include/ftxpost.h include/ftxwidth.h lib/libttf.a lib/libttf.la -lib/libttf.so.1.2 +lib/libttf.so.1.3 @exec /sbin/ldconfig -m %B