diff options
author | wiz <wiz> | 2003-08-31 19:19:12 +0000 |
---|---|---|
committer | wiz <wiz> | 2003-08-31 19:19:12 +0000 |
commit | 9e4bb6f3f85a1494ef83a37d133d44838a483f95 (patch) | |
tree | 5b982f3795dc1c731a2ab0dbab1f6ee20f598502 /fonts/fontconfig | |
parent | 97f13189254a4c80d50393500885eb6425b2976c (diff) | |
download | pkgsrc-9e4bb6f3f85a1494ef83a37d133d44838a483f95.tar.gz |
Update to 2.2.1.
Lots more documentation installed, fontconfig-config replaced
with pkgconfig file.
Changelog covered some versions only:
Release 2.2.0:
* Change version number to 2.2.0
Prerelease 2.1.94:
* BDF property support for foundry and width (Juliusz Chroboczek)
* Clean up GCC warnings (Colin Walters)
Prerelease 2.1.93:
* Use Type1 FontInfoRec to get more detailed weight information
* Run fc-cache from source tree to try and resolve LFS install issues
* Fix fontconfig-user.html generation (was getting smashed)
* Debian build files are in CVS now
* Fixes to build on Windows
* Compute monospacing by looking at glyphs instead of trusting font
* Get widths and more detailed weight from TrueType OS/2 table
* Global cache was re-statting a lot of files.
* Yet more RPM fixes from RedHat
Diffstat (limited to 'fonts/fontconfig')
-rw-r--r-- | fonts/fontconfig/Makefile | 18 | ||||
-rw-r--r-- | fonts/fontconfig/PLIST | 267 | ||||
-rw-r--r-- | fonts/fontconfig/distinfo | 12 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-aa | 51 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ab | 13 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ac | 13 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ad | 13 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ae | 26 |
8 files changed, 313 insertions, 100 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index de2fb1ae973..bfb20475472 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 21:37:02 grant Exp $ +# $NetBSD: Makefile,v 1.14 2003/08/31 19:19:12 wiz Exp $ # -DISTNAME= fcpackage.2_1 -PKGNAME= fontconfig-2.1 -PKGREVISION= 5 -WRKSRC= ${WRKDIR}/${DISTNAME}/fontconfig +DISTNAME= fontconfig-2.2.1 CATEGORIES= fonts gnome MASTER_SITES= http://fontconfig.org/release/ @@ -18,9 +15,12 @@ BUILDLINK_DEPENDS.freetype2= freetype2>=2.0.9 GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_GMAKE= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + PKG_SYSCONFSUBDIR= fontconfig CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/lib/X11/fonts @@ -34,13 +34,7 @@ CONFIGURE_ARGS+= --with-x EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd - -post-install: - ${INSTALL_MAN} ${WRKSRC}/src/fontconfig.man \ - ${PREFIX}/man/man3/fontconfig.3 -.for f in fc-cache fc-list - ${INSTALL_MAN} ${WRKSRC}/$f/$f.man ${PREFIX}/man/man1/$f.1 -.endfor +CONF_FILES+= ${EGDIR}/local.conf ${PKG_SYSCONFDIR}/local.conf .include "../../graphics/freetype2/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index f0ae87b0f4a..a106ec826a9 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,18 +1,273 @@ -@comment $NetBSD: PLIST,v 1.3 2003/01/21 14:25:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/08/31 19:19:12 wiz Exp $ bin/fc-cache bin/fc-list -bin/fontconfig-config include/fontconfig/fcfreetype.h include/fontconfig/fcprivate.h include/fontconfig/fontconfig.h +lib/libfontconfig.a +lib/libfontconfig.la lib/libfontconfig.so lib/libfontconfig.so.1 -lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1.4 lib/pkgconfig/fontconfig.pc -man/man1/fc-cache.1 -man/man1/fc-list.1 -man/man3/fontconfig.3 +man/man3/FcAtomicCreate.3 +man/man3/FcAtomicDeleteNew.3 +man/man3/FcAtomicDestroy.3 +man/man3/FcAtomicLock.3 +man/man3/FcAtomicNewFile.3 +man/man3/FcAtomicOrigFile.3 +man/man3/FcAtomicReplaceOrig.3 +man/man3/FcAtomicUnlock.3 +man/man3/FcBlanksAdd.3 +man/man3/FcBlanksCreate.3 +man/man3/FcBlanksDestroy.3 +man/man3/FcBlanksIsMember.3 +man/man3/FcCharSetAddChar.3 +man/man3/FcCharSetCopy.3 +man/man3/FcCharSetCount.3 +man/man3/FcCharSetCreate.3 +man/man3/FcCharSetDestroy.3 +man/man3/FcCharSetEqual.3 +man/man3/FcCharSetFirstPage.3 +man/man3/FcCharSetHasChar.3 +man/man3/FcCharSetIntersect.3 +man/man3/FcCharSetIntersectCount.3 +man/man3/FcCharSetIsSubset.3 +man/man3/FcCharSetNextPage.3 +man/man3/FcCharSetSubtract.3 +man/man3/FcCharSetSubtractCount.3 +man/man3/FcCharSetUnion.3 +man/man3/FcConfigAppFontAddDir.3 +man/man3/FcConfigAppFontAddFile.3 +man/man3/FcConfigAppFontClear.3 +man/man3/FcConfigBuildFonts.3 +man/man3/FcConfigCreate.3 +man/man3/FcConfigDestroy.3 +man/man3/FcConfigFilename.3 +man/man3/FcConfigGetBlanks.3 +man/man3/FcConfigGetCache.3 +man/man3/FcConfigGetConfigDirs.3 +man/man3/FcConfigGetConfigFiles.3 +man/man3/FcConfigGetCurrent.3 +man/man3/FcConfigGetFontDirs.3 +man/man3/FcConfigGetFonts.3 +man/man3/FcConfigGetRescanInverval.3 +man/man3/FcConfigParseAndLoad.3 +man/man3/FcConfigSetCurrent.3 +man/man3/FcConfigSetRescanInverval.3 +man/man3/FcConfigSubstitute.3 +man/man3/FcConfigSubstituteWithPat.3 +man/man3/FcConfigUptoDate.3 +man/man3/FcDefaultSubstitute.3 +man/man3/FcDirCacheValid.3 +man/man3/FcDirSave.3 +man/man3/FcDirScan.3 +man/man3/FcFileScan.3 +man/man3/FcFontList.3 +man/man3/FcFontMatch.3 +man/man3/FcFontRenderPrepare.3 +man/man3/FcFontSetAdd.3 +man/man3/FcFontSetCreate.3 +man/man3/FcFontSetDestroy.3 +man/man3/FcFontSort.3 +man/man3/FcFreeTypeCharIndex.3 +man/man3/FcFreeTypeCharSet.3 +man/man3/FcFreeTypeQuery.3 +man/man3/FcGetVersion.3 +man/man3/FcInit.3 +man/man3/FcInitBringUptoDate.3 +man/man3/FcInitLoadConfig.3 +man/man3/FcInitLoadConfigAndFonts.3 +man/man3/FcInitReinitialize.3 +man/man3/FcMatrixCopy.3 +man/man3/FcMatrixEqual.3 +man/man3/FcMatrixInit.3 +man/man3/FcMatrixMultiply.3 +man/man3/FcMatrixRotate.3 +man/man3/FcMatrixScale.3 +man/man3/FcMatrixShear.3 +man/man3/FcNameConstant.3 +man/man3/FcNameGetConstant.3 +man/man3/FcNameGetObjectType.3 +man/man3/FcNameParse.3 +man/man3/FcNameRegisterConstants.3 +man/man3/FcNameRegisterObjectTypes.3 +man/man3/FcNameUnparse.3 +man/man3/FcNameUnregisterConstants.3 +man/man3/FcNameUnregisterObjectTypes.3 +man/man3/FcObjectSetAdd.3 +man/man3/FcObjectSetBuild.3 +man/man3/FcObjectSetCreate.3 +man/man3/FcObjectSetDestroy.3 +man/man3/FcPatternAdd-Type.3 +man/man3/FcPatternAdd.3 +man/man3/FcPatternAddWeak.3 +man/man3/FcPatternBuild.3 +man/man3/FcPatternCreate.3 +man/man3/FcPatternDel.3 +man/man3/FcPatternDestroy.3 +man/man3/FcPatternEqual.3 +man/man3/FcPatternEqualSubset.3 +man/man3/FcPatternGet-Type.3 +man/man3/FcPatternGet.3 +man/man3/FcPatternHash.3 +man/man3/FcPatternPrint.3 +man/man3/FcStrBasename.3 +man/man3/FcStrCmpIgnoreCase.3 +man/man3/FcStrCopy.3 +man/man3/FcStrCopyFilename.3 +man/man3/FcStrDirname.3 +man/man3/FcStrListCreate.3 +man/man3/FcStrListDone.3 +man/man3/FcStrListNext.3 +man/man3/FcStrSetAdd.3 +man/man3/FcStrSetAddFilename.3 +man/man3/FcStrSetCreate.3 +man/man3/FcStrSetDel.3 +man/man3/FcStrSetDestroy.3 +man/man3/FcStrSetMember.3 +man/man3/FcUcs4ToUtf8.3 +man/man3/FcUtf16Len.3 +man/man3/FcUtf16ToUcs4.3 +man/man3/FcUtf8Len.3 +man/man3/FcUtf8ToUcs4.3 +man/man3/FcValueDestroy.3 +man/man3/FcValueSave.3 +man/man5/fonts-conf.5 +share/doc/fontconfig/fontconfig-devel.txt +share/doc/fontconfig/fontconfig-devel/index.html +share/doc/fontconfig/fontconfig-devel/r1016.html +share/doc/fontconfig/fontconfig-devel/r1042.html +share/doc/fontconfig/fontconfig-devel/r1064.html +share/doc/fontconfig/fontconfig-devel/r1087.html +share/doc/fontconfig/fontconfig-devel/r1111.html +share/doc/fontconfig/fontconfig-devel/r1134.html +share/doc/fontconfig/fontconfig-devel/r1159.html +share/doc/fontconfig/fontconfig-devel/r1184.html +share/doc/fontconfig/fontconfig-devel/r120.html +share/doc/fontconfig/fontconfig-devel/r1209.html +share/doc/fontconfig/fontconfig-devel/r1234.html +share/doc/fontconfig/fontconfig-devel/r1259.html +share/doc/fontconfig/fontconfig-devel/r1281.html +share/doc/fontconfig/fontconfig-devel/r1306.html +share/doc/fontconfig/fontconfig-devel/r1331.html +share/doc/fontconfig/fontconfig-devel/r1356.html +share/doc/fontconfig/fontconfig-devel/r1383.html +share/doc/fontconfig/fontconfig-devel/r141.html +share/doc/fontconfig/fontconfig-devel/r1414.html +share/doc/fontconfig/fontconfig-devel/r1437.html +share/doc/fontconfig/fontconfig-devel/r1460.html +share/doc/fontconfig/fontconfig-devel/r1486.html +share/doc/fontconfig/fontconfig-devel/r1515.html +share/doc/fontconfig/fontconfig-devel/r1545.html +share/doc/fontconfig/fontconfig-devel/r1575.html +share/doc/fontconfig/fontconfig-devel/r1608.html +share/doc/fontconfig/fontconfig-devel/r162.html +share/doc/fontconfig/fontconfig-devel/r1629.html +share/doc/fontconfig/fontconfig-devel/r1650.html +share/doc/fontconfig/fontconfig-devel/r1672.html +share/doc/fontconfig/fontconfig-devel/r1693.html +share/doc/fontconfig/fontconfig-devel/r1715.html +share/doc/fontconfig/fontconfig-devel/r1736.html +share/doc/fontconfig/fontconfig-devel/r1758.html +share/doc/fontconfig/fontconfig-devel/r1780.html +share/doc/fontconfig/fontconfig-devel/r1802.html +share/doc/fontconfig/fontconfig-devel/r1823.html +share/doc/fontconfig/fontconfig-devel/r183.html +share/doc/fontconfig/fontconfig-devel/r1847.html +share/doc/fontconfig/fontconfig-devel/r1868.html +share/doc/fontconfig/fontconfig-devel/r1890.html +share/doc/fontconfig/fontconfig-devel/r1913.html +share/doc/fontconfig/fontconfig-devel/r1936.html +share/doc/fontconfig/fontconfig-devel/r1959.html +share/doc/fontconfig/fontconfig-devel/r1980.html +share/doc/fontconfig/fontconfig-devel/r2009.html +share/doc/fontconfig/fontconfig-devel/r2034.html +share/doc/fontconfig/fontconfig-devel/r204.html +share/doc/fontconfig/fontconfig-devel/r2062.html +share/doc/fontconfig/fontconfig-devel/r2099.html +share/doc/fontconfig/fontconfig-devel/r2130.html +share/doc/fontconfig/fontconfig-devel/r2157.html +share/doc/fontconfig/fontconfig-devel/r2181.html +share/doc/fontconfig/fontconfig-devel/r2207.html +share/doc/fontconfig/fontconfig-devel/r2231.html +share/doc/fontconfig/fontconfig-devel/r2255.html +share/doc/fontconfig/fontconfig-devel/r228.html +share/doc/fontconfig/fontconfig-devel/r2280.html +share/doc/fontconfig/fontconfig-devel/r2304.html +share/doc/fontconfig/fontconfig-devel/r2328.html +share/doc/fontconfig/fontconfig-devel/r2350.html +share/doc/fontconfig/fontconfig-devel/r2378.html +share/doc/fontconfig/fontconfig-devel/r2399.html +share/doc/fontconfig/fontconfig-devel/r2420.html +share/doc/fontconfig/fontconfig-devel/r2443.html +share/doc/fontconfig/fontconfig-devel/r2469.html +share/doc/fontconfig/fontconfig-devel/r249.html +share/doc/fontconfig/fontconfig-devel/r2491.html +share/doc/fontconfig/fontconfig-devel/r2513.html +share/doc/fontconfig/fontconfig-devel/r2535.html +share/doc/fontconfig/fontconfig-devel/r2557.html +share/doc/fontconfig/fontconfig-devel/r2579.html +share/doc/fontconfig/fontconfig-devel/r2600.html +share/doc/fontconfig/fontconfig-devel/r2621.html +share/doc/fontconfig/fontconfig-devel/r2646.html +share/doc/fontconfig/fontconfig-devel/r2682.html +share/doc/fontconfig/fontconfig-devel/r270.html +share/doc/fontconfig/fontconfig-devel/r2717.html +share/doc/fontconfig/fontconfig-devel/r2745.html +share/doc/fontconfig/fontconfig-devel/r2770.html +share/doc/fontconfig/fontconfig-devel/r2791.html +share/doc/fontconfig/fontconfig-devel/r2816.html +share/doc/fontconfig/fontconfig-devel/r2841.html +share/doc/fontconfig/fontconfig-devel/r2866.html +share/doc/fontconfig/fontconfig-devel/r2892.html +share/doc/fontconfig/fontconfig-devel/r2914.html +share/doc/fontconfig/fontconfig-devel/r2936.html +share/doc/fontconfig/fontconfig-devel/r295.html +share/doc/fontconfig/fontconfig-devel/r2958.html +share/doc/fontconfig/fontconfig-devel/r2983.html +share/doc/fontconfig/fontconfig-devel/r3012.html +share/doc/fontconfig/fontconfig-devel/r3037.html +share/doc/fontconfig/fontconfig-devel/r3069.html +share/doc/fontconfig/fontconfig-devel/r3102.html +share/doc/fontconfig/fontconfig-devel/r3138.html +share/doc/fontconfig/fontconfig-devel/r3161.html +share/doc/fontconfig/fontconfig-devel/r3184.html +share/doc/fontconfig/fontconfig-devel/r3209.html +share/doc/fontconfig/fontconfig-devel/r323.html +share/doc/fontconfig/fontconfig-devel/r3231.html +share/doc/fontconfig/fontconfig-devel/r344.html +share/doc/fontconfig/fontconfig-devel/r372.html +share/doc/fontconfig/fontconfig-devel/r401.html +share/doc/fontconfig/fontconfig-devel/r476.html +share/doc/fontconfig/fontconfig-devel/r504.html +share/doc/fontconfig/fontconfig-devel/r591.html +share/doc/fontconfig/fontconfig-devel/r632.html +share/doc/fontconfig/fontconfig-devel/r655.html +share/doc/fontconfig/fontconfig-devel/r676.html +share/doc/fontconfig/fontconfig-devel/r704.html +share/doc/fontconfig/fontconfig-devel/r726.html +share/doc/fontconfig/fontconfig-devel/r750.html +share/doc/fontconfig/fontconfig-devel/r771.html +share/doc/fontconfig/fontconfig-devel/r792.html +share/doc/fontconfig/fontconfig-devel/r818.html +share/doc/fontconfig/fontconfig-devel/r839.html +share/doc/fontconfig/fontconfig-devel/r862.html +share/doc/fontconfig/fontconfig-devel/r883.html +share/doc/fontconfig/fontconfig-devel/r917.html +share/doc/fontconfig/fontconfig-devel/r940.html +share/doc/fontconfig/fontconfig-devel/r963.html +share/doc/fontconfig/fontconfig-devel/r99.html +share/doc/fontconfig/fontconfig-devel/r994.html +share/doc/fontconfig/fontconfig-devel/x19.html +share/doc/fontconfig/fontconfig-devel/x31.html +share/doc/fontconfig/fontconfig-devel/x93.html +share/doc/fontconfig/fontconfig-user.html +share/doc/fontconfig/fontconfig-user.txt share/examples/fontconfig/fonts.conf share/examples/fontconfig/fonts.dtd +share/examples/fontconfig/local.conf @dirrm share/examples/fontconfig +@dirrm share/doc/fontconfig/fontconfig-devel +@dirrm share/doc/fontconfig @dirrm include/fontconfig diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 37a20d81a8b..15bbea56c67 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.2 2003/04/03 20:46:32 jmc Exp $ +$NetBSD: distinfo,v 1.3 2003/08/31 19:19:12 wiz Exp $ -SHA1 (fcpackage.2_1.tar.gz) = b4d960ea1e2384f48aa9fed05e90ad4755da12be -Size (fcpackage.2_1.tar.gz) = 544661 bytes -SHA1 (patch-aa) = ca5590f4ce5e5f7ff1706a31f6811449b445d704 -SHA1 (patch-ab) = 1423c86abfbbc5a47d64d855c8abbdb482ebab8c -SHA1 (patch-ac) = 76ff801c5c2abc21c815c9313624eaf636672409 -SHA1 (patch-ad) = cab8df9f2d1d701d9d39a186eb88f2573ecdcddd -SHA1 (patch-ae) = 278cf3c01256e85629126460b786836d1aaeed11 +SHA1 (fontconfig-2.2.1.tar.gz) = 1ba5a531cdc8df9f53c89e7de9241728628a6ab5 +Size (fontconfig-2.2.1.tar.gz) = 613391 bytes +SHA1 (patch-aa) = 9b2650c41e694d77202ddb99c33de117f77b8f6d diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index ab05ca4c978..a6fbb4dd044 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,14 +1,47 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/12/11 20:12:45 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2003/08/31 19:19:13 wiz Exp $ ---- Makefile.in.orig Thu Aug 1 17:57:25 2002 +--- Makefile.in.orig Sun Aug 31 18:53:15 2003 +++ Makefile.in -@@ -26,6 +26,9 @@ TOPDIR = . +@@ -201,14 +201,14 @@ fontconfig-zip: $(top_builddir)/config.s - include $(TOPDIR)/config/Makedefs + install-configDATA: $(config_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(configdir) ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/fontconfig + @list='$(config_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ +- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p"; \ +- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p; \ ++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p"; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p; \ + else if test -f $$p; then \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p; \ ++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p"; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p; \ + fi; fi; \ + done -+# Override CONFDIR in Makedefs, so we can install templates in EGDIR. -+CONFDIR = @datadir@/examples/fontconfig -+ - DIRS = src fc-cache fc-list fontconfig +@@ -465,16 +465,15 @@ mostlyclean distclean maintainer-clean - all install clean:: + + install-data-local: +- if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \ +- echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \ ++ if [ -f $(DESTDIR)$(datadir)/examples/fontconfig/local.conf ]; then \ ++ echo "not overwriting existing $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ + else if [ -f $(srcdir)/local.conf ]; then \ +- echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \ +- $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \ ++ echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ ++ $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \ + else if [ -f local.conf ]; then \ +- echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \ +- $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \ ++ echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ ++ $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \ + fi; fi; 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. diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab deleted file mode 100644 index bb206bbe92b..00000000000 --- a/fonts/fontconfig/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/12/11 20:12:45 jmmv Exp $ - ---- fc-list/Makefile.in.orig Thu Aug 1 17:57:26 2002 -+++ fc-list/Makefile.in -@@ -35,7 +35,7 @@ PROG=fc-cache - all:: $(PROG) - - $(PROG): $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG) -+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG) @LIBS@ @LDFLAGS@ - - $(OBJS): $(HEADERS) - diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac deleted file mode 100644 index c4a57f60149..00000000000 --- a/fonts/fontconfig/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/12/11 20:12:45 jmmv Exp $ - ---- fc-cache/Makefile.in.orig Thu Aug 1 17:57:26 2002 -+++ fc-cache/Makefile.in -@@ -35,7 +35,7 @@ PROG=fc-cache - all:: $(PROG) - - $(PROG): $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG) -+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBFONTCONFIG) @LIBS@ @LDFLAGS@ - - $(OBJS): $(HEADERS) - diff --git a/fonts/fontconfig/patches/patch-ad b/fonts/fontconfig/patches/patch-ad deleted file mode 100644 index 5bf0053813e..00000000000 --- a/fonts/fontconfig/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/12/11 20:12:45 jmmv Exp $ - ---- src/Makefile.in.orig Thu Aug 1 17:57:26 2002 -+++ src/Makefile.in -@@ -26,7 +26,7 @@ TOPDIR=.. - - include $(TOPDIR)/config/Makedefs - --LIBS=@LIBS@ -+LIBS=@LIBS@ @LDFLAGS@ - - SRCS=fcatomic.c \ - fcblanks.c \ diff --git a/fonts/fontconfig/patches/patch-ae b/fonts/fontconfig/patches/patch-ae deleted file mode 100644 index 308f6226b8b..00000000000 --- a/fonts/fontconfig/patches/patch-ae +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2003/04/03 20:46:32 jmc Exp $ - ---- configure.orig Fri Nov 22 02:30:00 2002 -+++ configure Thu Apr 3 19:34:49 2003 -@@ -611,7 +611,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 -@@ -1251,9 +1251,9 @@ - PACKAGE_VERSION=1.0.1 - - # Set major version --PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F . '{ print $1 }'` --PACKAGE_MINOR=`echo $PACKAGE_VERSION | awk -F . '{ print $2 }'` --PACKAGE_REVISION=`echo $PACKAGE_VERSION | awk -F . '{ print $3 }'` -+PACKAGE_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{ print $1 }'` -+PACKAGE_MINOR=`echo $PACKAGE_VERSION | awk -F. '{ print $2 }'` -+PACKAGE_REVISION=`echo $PACKAGE_VERSION | awk -F. '{ print $3 }'` - - - |