Update to 2.2.95 development release. Several bugs have been fixed,

in particular this fixes a problem where no font matches can be found
by gtk2 apps.  This should fix the problem where even the gtk-demo
program fails run.

5 files changed, 218 insertions, 117 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 70e0d8fbb9f..784a8ec4f91 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/04/28 14:33:58 dillo Exp $
+# $NetBSD: Makefile,v 1.32 2004/06/07 23:37:41 dmcmahill Exp $
 #
 
-DISTNAME=	fontconfig-2.2.2
+DISTNAME=	fontconfig-2.2.95
 CATEGORIES=	fonts gnome
 MASTER_SITES=	http://freedesktop.org/~fontconfig/release/
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-expat-includes=${BUILDLINK_PREFIX.expat}/include
 CONFIGURE_ARGS+=	--with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
 CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-x
-CONFIGURE_ARGS+=	--disable-docs
+CONFIGURE_ARGS+=	--enable-docs
 
 FONT_PATH=	${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
 .if ${X11PREFIX} != ${X11BASE}
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index 54a4236e178..b21cc135282 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/27 15:09:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/06/07 23:37:41 dmcmahill Exp $
 bin/fc-cache
 bin/fc-list
+bin/fc-match
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
@@ -10,8 +11,7 @@ lib/libfontconfig.so
 lib/libfontconfig.so.1
 lib/libfontconfig.so.1.4
 lib/pkgconfig/fontconfig.pc
-man/man1/fc-cache.1
-man/man1/fc-list.1
+man/man1/fc-match.1
 man/man3/FcAtomicCreate.3
 man/man3/FcAtomicDeleteNew.3
 man/man3/FcAtomicDestroy.3
@@ -65,6 +65,7 @@ man/man3/FcDirCacheValid.3
 man/man3/FcDirSave.3
 man/man3/FcDirScan.3
 man/man3/FcFileScan.3
+man/man3/FcFini.3
 man/man3/FcFontList.3
 man/man3/FcFontMatch.3
 man/man3/FcFontRenderPrepare.3
@@ -138,129 +139,130 @@ 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/r1015.html
+share/doc/fontconfig/fontconfig-devel/r1037.html
+share/doc/fontconfig/fontconfig-devel/r1063.html
+share/doc/fontconfig/fontconfig-devel/r1085.html
+share/doc/fontconfig/fontconfig-devel/r1108.html
+share/doc/fontconfig/fontconfig-devel/r1132.html
+share/doc/fontconfig/fontconfig-devel/r1155.html
+share/doc/fontconfig/fontconfig-devel/r1180.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/r1205.html
+share/doc/fontconfig/fontconfig-devel/r1230.html
+share/doc/fontconfig/fontconfig-devel/r1255.html
+share/doc/fontconfig/fontconfig-devel/r1280.html
+share/doc/fontconfig/fontconfig-devel/r1302.html
+share/doc/fontconfig/fontconfig-devel/r1327.html
+share/doc/fontconfig/fontconfig-devel/r1352.html
+share/doc/fontconfig/fontconfig-devel/r1377.html
+share/doc/fontconfig/fontconfig-devel/r1404.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/r1435.html
+share/doc/fontconfig/fontconfig-devel/r1458.html
+share/doc/fontconfig/fontconfig-devel/r1481.html
+share/doc/fontconfig/fontconfig-devel/r1507.html
+share/doc/fontconfig/fontconfig-devel/r1536.html
+share/doc/fontconfig/fontconfig-devel/r1566.html
+share/doc/fontconfig/fontconfig-devel/r1596.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/r1671.html
 share/doc/fontconfig/fontconfig-devel/r1693.html
-share/doc/fontconfig/fontconfig-devel/r1715.html
+share/doc/fontconfig/fontconfig-devel/r1714.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/r1757.html
+share/doc/fontconfig/fontconfig-devel/r1779.html
+share/doc/fontconfig/fontconfig-devel/r1801.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/r1844.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/r1889.html
+share/doc/fontconfig/fontconfig-devel/r1911.html
+share/doc/fontconfig/fontconfig-devel/r1934.html
+share/doc/fontconfig/fontconfig-devel/r1957.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/r2001.html
+share/doc/fontconfig/fontconfig-devel/r2030.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/r2055.html
+share/doc/fontconfig/fontconfig-devel/r2083.html
+share/doc/fontconfig/fontconfig-devel/r2120.html
+share/doc/fontconfig/fontconfig-devel/r2151.html
+share/doc/fontconfig/fontconfig-devel/r2178.html
+share/doc/fontconfig/fontconfig-devel/r2202.html
+share/doc/fontconfig/fontconfig-devel/r2228.html
+share/doc/fontconfig/fontconfig-devel/r225.html
+share/doc/fontconfig/fontconfig-devel/r2252.html
+share/doc/fontconfig/fontconfig-devel/r2276.html
+share/doc/fontconfig/fontconfig-devel/r2301.html
+share/doc/fontconfig/fontconfig-devel/r2325.html
+share/doc/fontconfig/fontconfig-devel/r2349.html
+share/doc/fontconfig/fontconfig-devel/r2371.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/r2441.html
+share/doc/fontconfig/fontconfig-devel/r2464.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/r2490.html
+share/doc/fontconfig/fontconfig-devel/r2512.html
+share/doc/fontconfig/fontconfig-devel/r2534.html
+share/doc/fontconfig/fontconfig-devel/r2556.html
+share/doc/fontconfig/fontconfig-devel/r2578.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/r2642.html
+share/doc/fontconfig/fontconfig-devel/r2667.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/r2703.html
+share/doc/fontconfig/fontconfig-devel/r2738.html
+share/doc/fontconfig/fontconfig-devel/r2766.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/r2812.html
+share/doc/fontconfig/fontconfig-devel/r2837.html
+share/doc/fontconfig/fontconfig-devel/r2862.html
+share/doc/fontconfig/fontconfig-devel/r2887.html
+share/doc/fontconfig/fontconfig-devel/r291.html
+share/doc/fontconfig/fontconfig-devel/r2913.html
+share/doc/fontconfig/fontconfig-devel/r2935.html
+share/doc/fontconfig/fontconfig-devel/r2957.html
+share/doc/fontconfig/fontconfig-devel/r2979.html
+share/doc/fontconfig/fontconfig-devel/r3004.html
+share/doc/fontconfig/fontconfig-devel/r3033.html
+share/doc/fontconfig/fontconfig-devel/r3058.html
+share/doc/fontconfig/fontconfig-devel/r3090.html
+share/doc/fontconfig/fontconfig-devel/r3123.html
+share/doc/fontconfig/fontconfig-devel/r3159.html
+share/doc/fontconfig/fontconfig-devel/r316.html
+share/doc/fontconfig/fontconfig-devel/r3182.html
+share/doc/fontconfig/fontconfig-devel/r3205.html
+share/doc/fontconfig/fontconfig-devel/r3230.html
+share/doc/fontconfig/fontconfig-devel/r3252.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/r365.html
+share/doc/fontconfig/fontconfig-devel/r393.html
+share/doc/fontconfig/fontconfig-devel/r422.html
+share/doc/fontconfig/fontconfig-devel/r497.html
+share/doc/fontconfig/fontconfig-devel/r525.html
+share/doc/fontconfig/fontconfig-devel/r612.html
+share/doc/fontconfig/fontconfig-devel/r653.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/r697.html
+share/doc/fontconfig/fontconfig-devel/r725.html
+share/doc/fontconfig/fontconfig-devel/r747.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/r813.html
 share/doc/fontconfig/fontconfig-devel/r839.html
-share/doc/fontconfig/fontconfig-devel/r862.html
+share/doc/fontconfig/fontconfig-devel/r860.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/r904.html
+share/doc/fontconfig/fontconfig-devel/r938.html
+share/doc/fontconfig/fontconfig-devel/r961.html
+share/doc/fontconfig/fontconfig-devel/r984.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
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 2d9061247e3..276179e8118 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2004/04/27 15:09:10 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/06/07 23:37:41 dmcmahill Exp $
 
-SHA1 (fontconfig-2.2.2.tar.gz) = 121b79bdb32981b78612cb6320939616b84fdb4c
-Size (fontconfig-2.2.2.tar.gz) = 743895 bytes
-SHA1 (patch-aa) = 740dd63a9f07a801ceab1b9a1d6ddac303ace436
+SHA1 (fontconfig-2.2.95.tar.gz) = 865e2fdcba16cc0f44c4fc7f1e446b022ca6c46e
+Size (fontconfig-2.2.95.tar.gz) = 777980 bytes
+SHA1 (patch-aa) = 5ac2316628124fe41c68aef7ab23e25389fffcc4
+SHA1 (patch-ab) = 6c795128c701d8dd98aeaa3a76c91b4a0a3f1b0c
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index d720833d677..ce112e4eb33 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
+$NetBSD: patch-aa,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
 
---- Makefile.in.orig	2004-04-14 15:12:47.000000000 +0000
+--- Makefile.in.orig	Sat May 29 19:43:19 2004
 +++ Makefile.in
-@@ -282,12 +282,12 @@ uninstall-info-am:
+@@ -290,12 +290,12 @@ uninstall-info-am:
  configDATA_INSTALL = $(INSTALL_DATA)
  install-configDATA: $(config_DATA)
  	@$(NORMAL_INSTALL)
@@ -13,15 +13,15 @@ $NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 -	  echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f"; \
 -	  $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
++	  echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
++	  $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
  	done
  
  uninstall-configDATA:
-@@ -671,16 +671,15 @@ uninstall-info: uninstall-info-recursive
- 
+@@ -680,14 +680,14 @@ uninstall-info: uninstall-info-recursive
  
  install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)/$(configdir)
 -	if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
 -	  echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
 +	if [ -f $(DESTDIR)$(datadir)/examples/fontconfig/local.conf ]; then \
@@ -37,7 +37,5 @@ $NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
 +	  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
+ 	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.
- .NOEXPORT:
diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab
new file mode 100644
index 00000000000..8ce7ce95a18
--- /dev/null
+++ b/fonts/fontconfig/patches/patch-ab
@@ -0,0 +1,100 @@
+$NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
+
+--- doc/Makefile.in.orig	Sat May 29 19:43:19 2004
++++ doc/Makefile.in
+@@ -374,6 +374,53 @@ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++man3dir = $(mandir)/man3
++install-man3: $(man3_MANS) $(man_MANS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
++	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.3*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
++	  else file=$$i; fi; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    3*) ;; \
++	    *) ext='3' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
++	done
++uninstall-man3:
++	@$(NORMAL_UNINSTALL)
++	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.3*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    3*) ;; \
++	    *) ext='5' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
++	done
++
+ man5dir = $(mandir)/man5
+ install-man5: $(man5_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+@@ -548,7 +595,7 @@ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) all-local
+ 
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(man5dir) $(DESTDIR)$(docdir) $(DESTDIR)$(htmldocdir)
++	$(mkinstalldirs) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(docdir) $(DESTDIR)$(htmldocdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -599,7 +646,7 @@ install-exec-am:
+ 
+ install-info: install-info-am
+ 
+-install-man: install-man5
++install-man: install-man3 install-man5
+ 
+ installcheck-am:
+ 
+@@ -624,7 +671,7 @@ ps-am:
+ uninstall-am: uninstall-docDATA uninstall-htmldocDATA uninstall-info-am \
+ 	uninstall-man
+ 
+-uninstall-man: uninstall-man5
++uninstall-man: uninstall-man3 uninstall-man5
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
+ 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
+@@ -633,12 +680,12 @@ uninstall-man: uninstall-man5
+ 	info-am install install-am install-data install-data-am \
+ 	install-docDATA install-exec install-exec-am \
+ 	install-htmldocDATA install-info install-info-am install-man \
+-	install-man5 install-strip installcheck installcheck-am \
++	install-man3 install-man5 install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+ 	mostlyclean mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ 	uninstall-am uninstall-docDATA uninstall-htmldocDATA \
+-	uninstall-info-am uninstall-man uninstall-man5
++	uninstall-info-am uninstall-man uninstall-man3 uninstall-man5
+ 
+ 
+ @USEDOCBOOK_TRUE@.fncs.sgml: