mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-23 20:51:43 +00:00
Code Issues Releases Activity

Update to 2.1.93.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2003-04-13 05:52:45 +00:00
parent 0ca11cdef6
commit 4e1bacd096
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=78842
7 changed files with 13 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-fonts/fontconfig/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= fontconfig
PORTVERSION= 2.1.92
PORTVERSION= 2.1.93
CATEGORIES= x11-fonts
MASTER_SITES= http://nexp.cs.pdx.edu/fontconfig/release/
@ -25,9 +25,9 @@ USE_LIBTOOL= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat_includes=${LOCALBASE}/include \
--with-expat_lib=${LOCALBASE}/lib \
--with-default_fonts=${X11BASE}/lib/X11/fonts
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
--with-default-fonts=${X11BASE}/lib/X11/fonts
MAKE_ENV= LC_ALL=C
PKGINSTALL= ${WRKDIR}/pkg-install

2
x11-fonts/fontconfig/distinfo
View File

@ -1 +1 @@
MD5 (fontconfig-2.1.92.tar.gz) = bb804a692d6c1057ea2f456b6226e873
MD5 (fontconfig-2.1.93.tar.gz) = a4fa9b2acf358baba42edda7efadcb0a

16
x11-fonts/fontconfig/files/patch-Makefile.in
View File

@ -1,15 +1,15 @@
--- Makefile.in.orig Mon Mar 31 20:48:41 2003
+++ Makefile.in Mon Mar 31 20:52:04 2003
@@ -116,7 +116,7 @@
--- Makefile.in.orig Sun Apr 13 01:41:17 2003
+++ Makefile.in Sun Apr 13 01:42:14 2003
@@ -120,7 +120,7 @@
SUBDIRS = fontconfig fc-lang src fc-cache fc-list doc test
-EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd local.conf fontconfig.spec.in fontconfig.spec
+EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd fontconfig.spec.in fontconfig.spec
-EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd local.conf fontconfig.spec.in fontconfig.spec fontconfig-zip.in
+EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd fontconfig.spec.in fontconfig.spec fontconfig-zip.in
pkgconfigdir = $(prefix)/libdata/pkgconfig
@@ -457,16 +457,7 @@
@@ -465,16 +465,7 @@
install-data-local:
@ -22,8 +22,8 @@
- echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
- $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
- fi; fi; fi
- if [ x$(DESTDIR) = x ]; then $(bindir)/fc-cache -f -v; fi
+# if [ x$(DESTDIR) = x ]; then $(bindir)/fc-cache -f -v; fi
- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+# if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

9
x11-fonts/fontconfig/files/patch-configure
View File

@ -8,12 +8,3 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -6402,7 +6403,7 @@
# Check whether --with-default_fonts or --without-default_fonts was given.
if test "${with_default_fonts+set}" = set; then
withval="$with_default_fonts"
- defaultfonts="$withval"
+ default_fonts="$withval"
else
default_fonts=yes
fi

38
x11-fonts/fontconfig/files/patch-src_fccache.c
View File

@ -1,38 +0,0 @@
--- src/fccache.c 2003/03/05 05:51:27 1.17
+++ src/fccache.c 2003/03/12 22:15:39 1.18
@@ -309,14 +309,14 @@
* Verify the saved timestamp for a file
*/
FcBool
-FcGlobalCacheCheckTime (FcGlobalCacheInfo *info)
+FcGlobalCacheCheckTime (const FcChar8 *file, FcGlobalCacheInfo *info)
{
struct stat statb;
- if (stat ((char *) info->file, &statb) < 0)
+ if (stat ((char *) file, &statb) < 0)
{
if (FcDebug () & FC_DBG_CACHE)
- printf (" file missing\n");
+ printf (" file %s missing\n", file);
return FcFalse;
}
if (statb.st_mtime != info->time)
@@ -549,7 +549,7 @@
* See if the timestamp recorded in the global cache
* matches the directory time, if not, return False
*/
- if (!FcGlobalCacheCheckTime (&d->info))
+ if (!FcGlobalCacheCheckTime (d->info.file, &d->info))
{
if (FcDebug () & FC_DBG_CACHE)
printf ("\tdir cache entry time mismatch\n");
@@ -633,7 +633,7 @@
}
}
if (count)
- *count = max;
+ *count = max + 1;
return match;
}

32
x11-fonts/fontconfig/files/patch-src_fcdir.c
View File

@ -1,32 +0,0 @@
diff -u -r1.14 -r1.15
--- src/fcdir.c 2003/03/05 05:51:27 1.14
+++ src/fcdir.c 2003/03/12 22:15:39 1.15
@@ -70,7 +70,7 @@
/*
* Found a cache entry for the file
*/
- if (FcGlobalCacheCheckTime (&cache_file->info))
+ if (FcGlobalCacheCheckTime (file, &cache_file->info))
{
name = cache_file->name;
need_scan = FcFalse;
@@ -89,7 +89,8 @@
strlen ((const char *) file),
FcFalse)))
{
- if (FcGlobalCacheCheckTime (&cache_dir->info))
+ if (FcGlobalCacheCheckTime (cache_dir->info.file,
+ &cache_dir->info))
{
font = 0;
need_scan = FcFalse;
@@ -199,6 +200,9 @@
strcat ((char *) file, "/");
base = file + strlen ((char *) file);
+ if (FcDebug () & FC_DBG_SCAN)
+ printf ("\tScanning dir %s\n", dir);
+
d = opendir ((char *) dir);
if (!d)

12
x11-fonts/fontconfig/files/patch-src_fcint.h
View File

@ -1,12 +0,0 @@
diff -u -r1.33 -r1.34
--- src/fcint.h 2003/03/05 05:52:31 1.33
+++ src/fcint.h 2003/03/12 22:15:39 1.34
@@ -338,7 +338,7 @@
FcGlobalCacheDestroy (FcGlobalCache *cache);
FcBool
-FcGlobalCacheCheckTime (FcGlobalCacheInfo *info);
+FcGlobalCacheCheckTime (const FcChar8*file, FcGlobalCacheInfo *info);
void
FcGlobalCacheReferenced (FcGlobalCache *cache,