diff --git a/compat32_fontconfig/orig/patch-aa b/compat32_fontconfig/orig/patch-aa
deleted file mode 100644
index a92c72946e..0000000000
--- a/compat32_fontconfig/orig/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2013/10/17 07:27:33 wiz Exp $
-
---- Makefile.in.orig	2013-10-11 04:28:46.000000000 +0000
-+++ Makefile.in
-@@ -380,6 +380,7 @@ datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
- dvidir = @dvidir@
-+egdir = $(prefix)/emul/netbsd32/share/examples/fontconfig
- exec_prefix = @exec_prefix@
- fc_cachedir = @fc_cachedir@
- host = @host@
-@@ -439,6 +440,7 @@ xml_DATA = fonts.dtd
- @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
- FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
- DISTCHECK_CONFIGURE_FLAGS = 
-+RUN_FC_CACHE_TEST = false
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -997,17 +999,13 @@ fonts.conf: fonts.conf.in Makefile
- 	mv $@.tmp $@
- 
- install-data-local: fonts.conf
--	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
--	if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
--	  echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
--	  mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
--	fi
-+	$(mkinstalldirs) $(DESTDIR)$(egdir)
- 	if [ -f $(srcdir)/fonts.conf ]; then \
--	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
--	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
-+	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
-+	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
- 	else if [ -f fonts.conf ]; then \
--	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
--	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
-+	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
-+	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
- 	fi; fi
- 	@(if $(RUN_FC_CACHE_TEST); then \
- 	    echo "fc-cache$(EXEEXT) -s -f -v"; \
diff --git a/compat32_fontconfig/orig/patch-ac b/compat32_fontconfig/orig/patch-ac
deleted file mode 100644
index 116eccbbe4..0000000000
--- a/compat32_fontconfig/orig/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.13 2013/10/17 07:27:33 wiz Exp $
-
---- conf.d/Makefile.in.orig	2013-10-11 04:28:47.000000000 +0000
-+++ conf.d/Makefile.in
-@@ -345,7 +345,7 @@ CONF_LINKS = \
- 
- EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
- CLEANFILES = $(DOC_FILES)
--configdir = $(CONFIGDIR)
-+configdir = $(prefix)/emul/netbsd32/share/examples/fontconfig/conf.d
- config_DATA = $(DOC_FILES)
- templatedir = $(TEMPLATEDIR)
- template_DATA = \
-@@ -628,6 +628,7 @@ README: $(srcdir)/README.in
- 	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
- 
- install-data-hook:
-+xinstall-data-hook:
- 	mkdir -p $(DESTDIR)$(configdir)
- 	@(echo cd $(DESTDIR)$(configdir);			\
- 	  cd $(DESTDIR)$(configdir);				\