35 files changed, 64 insertions, 154 deletions

diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 9619514b4a14..f1219889b423 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -23,7 +23,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index e00eafdd9f03..e62b584d3e00 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -15,7 +15,7 @@ TEST_DEPENDS=	bash:shells/bash \
 		gsed:textproc/gsed
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf cpe gmake libtool pkgconfig readline
+USES=		autoreconf cpe gmake libtool pathfix pkgconfig readline
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -23,7 +23,6 @@ INSTALL_TARGET=	install-strip
 LENSESDIR=	${PREFIX}/share/augeas/lenses
 
 post-patch:
-	@${REINPLACE_CMD} -e 's:$$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/tests/*.sh
 	@${REINPLACE_CMD} -e 's:sed:gsed:' ${WRKSRC}/tests/test-augtool.sh
 	@${REINPLACE_CMD} -e 's:/usr/local:${LOCALBASE}:' \
diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index 596c957ed16c..d439b79d095e 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C library for parsing and processing BibTeX data files
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		perl5 libtool
+USES=		perl5 libtool pathfix
 USE_PERL5=	build
 
 .include <bsd.port.mk>
diff --git a/textproc/btparse/files/patch-Makefile.in b/textproc/btparse/files/patch-Makefile.in
deleted file mode 100644
index c160ea838b43..000000000000
--- a/textproc/btparse/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Mar 19 11:21:45 2006
-+++ Makefile.in	Sun Mar 19 11:22:15 2006
-@@ -139,7 +139,7 @@
- SUBDIRS = src tests progs doc
- EXTRA_DIST = $(wildcard pccts/*.[ch]) btparse.pc.in
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
- pkgconfig_DATA = btparse.pc
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index 847c8fab7062..07fb782351d6 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libqdbm.so.14:databases/qdbm
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		iconv
+USES=		iconv pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
@@ -38,8 +38,7 @@ MECAB_LIB_DEPENDS=	libmecab.so:japanese/mecab
 MECAB_RUN_DEPENDS=	${LOCALBASE}/lib/mecab/dic/ipadic/matrix.bin:japanese/mecab-ipadic
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		-e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
+	@${REINPLACE_CMD} -e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 	@${RM} ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index 2db456344c32..c591d2348275 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GNOME=	pygtk2
-USES=		gmake pkgconfig python
+USES=		gmake pathfix pkgconfig python
 
 GNU_CONFIGURE=	yes
 
@@ -36,8 +36,6 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|/usr/|${PREFIX}/|g" ${WRKSRC}/engine/*.py
 
 .include <bsd.port.mk>
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 233176d4672c..66d79f75f90f 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -19,7 +19,6 @@ GH_ACCOUNT=	meduketto
 GH_TAGNAME=	6cddfef
 
 USES=		autoreconf libtool makeinfo pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/libcue/Makefile b/textproc/libcue/Makefile
index d841abaa8188..7af62b609fa8 100644
--- a/textproc/libcue/Makefile
+++ b/textproc/libcue/Makefile
@@ -18,6 +18,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lipnitsk
 
 USE_LDCONFIG=	yes
-USES=		bison cmake:outsource
+USES=		bison cmake:outsource pathfix
 
 .include <bsd.port.mk>
diff --git a/textproc/libcue/files/patch-CMakeLists.txt b/textproc/libcue/files/patch-CMakeLists.txt
deleted file mode 100644
index 623ed7a41860..000000000000
--- a/textproc/libcue/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2016-02-25 08:42:19 UTC
-+++ CMakeLists.txt
-@@ -19,7 +19,7 @@ SET (CUE_SOURCES
- 
- CONFIGURE_FILE(libcue.pc.in libcue.pc @ONLY)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/libcue.pc
--	DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+	DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
- 
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
- INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # for generated files
diff --git a/textproc/libfo/files/patch-Makefile.am b/textproc/libfo/files/patch-Makefile.am
index 76df93909123..10543495708d 100644
--- a/textproc/libfo/files/patch-Makefile.am
+++ b/textproc/libfo/files/patch-Makefile.am
@@ -9,12 +9,3 @@
  
  if PLATFORM_WIN32
  no_undefined = -no-undefined
-@@ -19,7 +19,7 @@ INCLUDES = \
- 	-Ilibfo
- 
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig
- pkgconfig_DATA = libfo-0.6.pc
- 
- xmldir = $(datadir)/xml/libfo-@VERSION@
diff --git a/textproc/libguess/Makefile b/textproc/libguess/Makefile
index 61466a6ebd14..83d5f241d32a 100644
--- a/textproc/libguess/Makefile
+++ b/textproc/libguess/Makefile
@@ -12,13 +12,10 @@ COMMENT=	High-speed character set detection library
 LIB_DEPENDS=	libmowgli.so:devel/libmowgli
 
 USES=		gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN=	Makefile
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${DESTDIR}$${libdir}/pkgconfig|$${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile
-
 .include <bsd.port.mk>
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index d0c9ed26f830..27c809dbc6b2 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -24,7 +24,6 @@ USES=		autoreconf iconv libtool pathfix pkgconfig
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=	-I${OPENSSLINC}
diff --git a/textproc/libucl/Makefile b/textproc/libucl/Makefile
index a8e7ed95c90e..01f49ca30a0c 100644
--- a/textproc/libucl/Makefile
+++ b/textproc/libucl/Makefile
@@ -44,7 +44,6 @@ GNU_CONFIGURE=	yes
 
 GH_ACCOUNT=	vstakhov
 
-PATHFIX_MAKEFILEIN=	Makefile.am
 CONFLICTS_INSTALL=	ucl
 
 INSTALL_TARGET=	install-strip
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index 9bceaa7bf2b6..fc02f6727d89 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 MAKE_JOBS_UNSAFE=	yes
 
 USE_GNOME=	gtk20 intltool intlhack glib20
-USES=		gettext pkgconfig libtool
+USES=		gettext pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -41,8 +41,4 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^pkgconfigdir = $${libdir}/pkgconfig|pkgconfigdir = $${prefix}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 002b011ed3b8..4c7f6f3e0d99 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		autoreconf gettext libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 2838a2baf8bf..3f9bfd25b342 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake pathfix
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include
 
@@ -29,8 +29,7 @@ post-extract:
 	@${RM} ${WRKSRC}/doc/index.html~
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
-		-e 's|DATADIR =.*|DATADIR = ${DOCSDIR}|' \
+	@${REINPLACE_CMD} -e 's|DATADIR =.*|DATADIR = ${DOCSDIR}|' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/turboxsl/Makefile b/textproc/turboxsl/Makefile
index 660c3ab40a84..49ae1574afa1 100644
--- a/textproc/turboxsl/Makefile
+++ b/textproc/turboxsl/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libck.so:devel/concurrencykit \
 
 BROKEN_powerpc64=	Does not build
 ONLY_FOR_ARCHS=	amd64 ia64 powerpc64 sparc64
-USES=		autoreconf libtool pkgconfig
+USES=		autoreconf libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	Litres
diff --git a/textproc/turboxsl/files/patch-Makefile.am b/textproc/turboxsl/files/patch-Makefile.am
deleted file mode 100644
index e0287274d6d8..000000000000
--- a/textproc/turboxsl/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	2015-07-02 18:01:10 UTC
-+++ Makefile.am
-@@ -8,6 +8,6 @@ ACLOCAL_AMFLAGS = -I m4
- 
- bin_SCRIPTS = turboxsl-config
- 
--pkgconfigdir=$(libdir)/pkgconfig
-+pkgconfigdir=$(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libturboxsl.pc
- 
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d72844234675..d065d704e1fc 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -16,7 +16,7 @@ COMMENT?=	Input method library
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_GNOME+=	glib20 intltool
-USES+=		gettext gmake iconv libedit libtool pkgconfig perl5 tar:bzip2
+USES+=		gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
index 6e38e60ba9b1..83ea3314bf75 100644
--- a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
@@ -1,7 +1,7 @@
---- gtk2/immodule/Makefile.in.orig	2012-04-01 04:00:38.000000000 +0900
-+++ gtk2/immodule/Makefile.in	2012-04-01 04:04:21.000000000 +0900
-@@ -82,8 +82,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+--- gtk2/immodule/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ gtk2/immodule/Makefile.in
+@@ -105,8 +105,7 @@ am__uninstall_files_from_dir = { \
+   }
  am__installdirs = "$(DESTDIR)$(moduledir)"
  LTLIBRARIES = $(module_LTLIBRARIES)
 -@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
@@ -10,7 +10,7 @@
  @GTK2_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
  @GTK2_TRUE@	$(am__append_1)
  am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
-@@ -411,8 +410,8 @@
+@@ -442,8 +441,8 @@ moduledir = $(uim_gtk_im_module_path)/@G
  @GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
  @GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
  @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
diff --git a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
index 01f417ff8f36..f36e2e0db757 100644
--- a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/pad/Makefile.in.orig	2012-04-01 03:20:14.000000000 +0900
-+++ gtk2/pad/Makefile.in	2012-04-01 03:21:13.000000000 +0900
-@@ -63,9 +63,7 @@
+--- gtk2/pad/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ gtk2/pad/Makefile.in
+@@ -80,9 +80,7 @@ am__uim_input_pad_ja_SOURCES_DIST = ja.c
  @GTK2_TRUE@am_uim_input_pad_ja_OBJECTS =  \
  @GTK2_TRUE@	uim_input_pad_ja-ja.$(OBJEXT)
  uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
@@ -11,7 +11,7 @@
  uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -353,8 +351,8 @@
+@@ -378,8 +376,8 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  uim_pixmapsdir = @uim_pixmapsdir@
  @GTK2_TRUE@uim_input_pad_ja_SOURCES = ja.c
diff --git a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
index a76eec25decd..b73282d6a8cb 100644
--- a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/pref/Makefile.in.orig	2012-04-01 03:22:10.000000000 +0900
-+++ gtk2/pref/Makefile.in	2012-04-01 03:28:01.000000000 +0900
-@@ -69,9 +69,6 @@
+--- gtk2/pref/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ gtk2/pref/Makefile.in
+@@ -86,9 +86,6 @@ am__uim_pref_gtk_SOURCES_DIST = gtk.c gt
  @GTK2_4_TRUE@@PREF_TRUE@	uim_pref_gtk-key-util-gtk.$(OBJEXT)
  uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
  @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES =  \
@@ -10,7 +10,7 @@
  @GTK2_4_TRUE@@PREF_TRUE@	$(am__append_1)
  uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
-@@ -367,9 +364,9 @@
+@@ -392,9 +389,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
  @GTK2_4_TRUE@@PREF_TRUE@			../immodule/key-util-gtk.h
  
  @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
diff --git a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
index ca383192b6b6..aa90ca6a2e75 100644
--- a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/switcher/Makefile.in.orig	2012-04-01 03:28:48.000000000 +0900
-+++ gtk2/switcher/Makefile.in	2012-04-01 03:30:27.000000000 +0900
-@@ -63,11 +63,7 @@
+--- gtk2/switcher/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ gtk2/switcher/Makefile.in
+@@ -80,11 +80,7 @@ am__uim_im_switcher_gtk_SOURCES_DIST = g
  @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS =  \
  @GTK2_TRUE@	uim_im_switcher_gtk-gtk.$(OBJEXT)
  uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
@@ -13,7 +13,7 @@
  uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -356,10 +352,9 @@
+@@ -381,10 +377,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  uim_pixmapsdir = @uim_pixmapsdir@
  @GTK2_TRUE@uim_im_switcher_gtk_SOURCES = gtk.c
diff --git a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
index cdb29fc9811f..0b3e2e0e187e 100644
--- a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/toolbar/Makefile.in.orig	2012-03-30 22:02:18.000000000 +0900
-+++ gtk2/toolbar/Makefile.in	2012-04-01 04:11:24.000000000 +0900
-@@ -71,10 +71,7 @@
+--- gtk2/toolbar/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ gtk2/toolbar/Makefile.in
+@@ -88,10 +88,7 @@ am__uim_toolbar_applet_SOURCES_DIST = ap
  @APPLET_GNOME_TRUE@	uim_toolbar_applet-applet-gnome.$(OBJEXT) \
  @APPLET_GNOME_TRUE@	uim_toolbar_applet-common-gtk.$(OBJEXT)
  uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
@@ -12,7 +12,7 @@
  uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -82,9 +79,7 @@
+@@ -99,9 +96,7 @@ uim_toolbar_applet_LINK = $(LIBTOOL) --t
  am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \
  	uim_toolbar_gtk-common-gtk.$(OBJEXT)
  uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
@@ -23,7 +23,7 @@
  uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -94,10 +89,7 @@
+@@ -111,10 +106,7 @@ am_uim_toolbar_gtk_systray_OBJECTS =  \
  	uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
  uim_toolbar_gtk_systray_OBJECTS =  \
  	$(am_uim_toolbar_gtk_systray_OBJECTS)
@@ -35,7 +35,7 @@
  uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -412,16 +404,16 @@
+@@ -443,9 +435,9 @@ uim_pixmapsdir = @uim_pixmapsdir@
  EXTRA_DIST = GNOME_UimApplet.server.in.in
  helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
  @APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
@@ -48,15 +48,7 @@
  
  @APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  @APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
- # recent version of gcc has the option to suppress the warning
- #uim_toolbar_applet_CFLAGS += -Wno-overlength-strings
- @APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = applet-gnome.c common-gtk.c
--@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers
-+@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
- @APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server
- @APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in)
- @APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in)
-@@ -429,9 +421,9 @@
+@@ -460,9 +452,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
  @APPLET_GNOME_TRUE@		 GNOME_UimApplet.server.in.tmp
  
  uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c
@@ -69,7 +61,7 @@
  
  uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
-@@ -440,9 +432,9 @@
+@@ -471,9 +463,9 @@ uim_toolbar_gtk_systray_SOURCES = systra
  
  uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
  				   @X11_LIBS@ \
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
deleted file mode 100644
index f7281bebff4b..000000000000
--- a/textproc/uim/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-03-15 05:37:43.000000000 +0900
-+++ Makefile.in	2007-09-25 00:15:31.000000000 +0900
-@@ -316,7 +316,7 @@
- 	uim.pc.in uim.desktop uim.spec.in uim.spec \
- 	intltool-extract.in intltool-merge.in intltool-update.in
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = uim.pc
- desktopdir = $(datadir)/applications
- desktop_in_files = uim.desktop.in
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
index e110aa935ef7..75fc0515604a 100644
--- a/textproc/uim/files/patch-emacs_Makefile.in
+++ b/textproc/uim/files/patch-emacs_Makefile.in
@@ -1,6 +1,6 @@
---- emacs/Makefile.in.orig	2013-03-31 19:14:02.000000000 +0900
-+++ emacs/Makefile.in	2013-05-13 22:11:19.000000000 +0900
-@@ -872,21 +872,6 @@
+--- emacs/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ emacs/Makefile.in
+@@ -872,21 +872,6 @@ mostlyclean-libtool:
  
  clean-libtool:
  	-rm -rf .libs _libs
diff --git a/textproc/uim/files/patch-po_Makefile.in.in b/textproc/uim/files/patch-po_Makefile.in.in
index f46b94abb208..ebd95543f233 100644
--- a/textproc/uim/files/patch-po_Makefile.in.in
+++ b/textproc/uim/files/patch-po_Makefile.in.in
@@ -1,6 +1,6 @@
---- po/Makefile.in.in.orig	2007-09-25 01:35:53.000000000 +0900
-+++ po/Makefile.in.in	2007-09-25 01:36:59.000000000 +0900
-@@ -33,7 +33,7 @@
+--- po/Makefile.in.in.orig	2013-06-30 04:27:11 UTC
++++ po/Makefile.in.in
+@@ -33,7 +33,7 @@ exec_prefix = @exec_prefix@
  datadir = @datadir@
  datarootdir = @datarootdir@
  libdir = @libdir@
diff --git a/textproc/uim/files/patch-qt4_immodule_plugin.cpp b/textproc/uim/files/patch-qt4_immodule_plugin.cpp
index 79b5b551db23..878b3d0ecc7f 100644
--- a/textproc/uim/files/patch-qt4_immodule_plugin.cpp
+++ b/textproc/uim/files/patch-qt4_immodule_plugin.cpp
@@ -8,9 +8,7 @@ Date:   Sun Mar 2 13:26:18 2014 +0200
       - Stop relying on implicit includes that may not always work and
         explicitly include <clocale> for the setlocale(3) call.
 
-diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
-index cb5863a..be2b9f2 100644
---- qt4/immodule/plugin.cpp
+--- qt4/immodule/plugin.cpp.orig	2013-06-30 04:26:20 UTC
 +++ qt4/immodule/plugin.cpp
 @@ -34,6 +34,8 @@
  
@@ -19,5 +17,5 @@ index cb5863a..be2b9f2 100644
 +#include <clocale>
 +
  #include <QtCore/QStringList>
+ #include <QtGui/QInputContext>
  #ifdef Q_WS_X11
- # include <QtGui/QX11Info>
diff --git a/textproc/uim/files/patch-scm_sj3-custom.scm b/textproc/uim/files/patch-scm_sj3-custom.scm
index 7886bcda53c3..53c1f4995ec0 100644
--- a/textproc/uim/files/patch-scm_sj3-custom.scm
+++ b/textproc/uim/files/patch-scm_sj3-custom.scm
@@ -1,5 +1,5 @@
---- scm/sj3-custom.scm.orig	2010-10-17 14:09:36.000000000 +0900
-+++ scm/sj3-custom.scm	2010-10-17 14:10:09.000000000 +0900
+--- scm/sj3-custom.scm.orig	2013-06-30 04:26:09 UTC
++++ scm/sj3-custom.scm
 @@ -339,7 +339,7 @@
    (N_ "SJ3 user name")
    (N_ "long description will be here."))
diff --git a/textproc/uim/files/patch-sigscheme_doc_Makefile.in b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
index 46c9c30d01b4..d00f0fb7dd4f 100644
--- a/textproc/uim/files/patch-sigscheme_doc_Makefile.in
+++ b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
@@ -1,6 +1,6 @@
---- sigscheme/doc/Makefile.in.orig	2007-09-25 01:31:53.000000000 +0900
-+++ sigscheme/doc/Makefile.in	2007-09-25 01:33:45.000000000 +0900
-@@ -151,7 +151,7 @@
+--- sigscheme/doc/Makefile.in.orig	2016-10-14 09:57:35 UTC
++++ sigscheme/doc/Makefile.in
+@@ -210,7 +210,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in b/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
deleted file mode 100644
index bbdc4069ecd5..000000000000
--- a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigscheme/libgcroots/Makefile.in.orig	2007-09-25 01:58:25.000000000 +0900
-+++ sigscheme/libgcroots/Makefile.in	2007-09-25 01:59:00.000000000 +0900
-@@ -345,7 +345,7 @@
- 	include/gc_config_macros.h include/private/gc_hdrs.h \
- 	include/private/gc_locks.h include/private/gc_priv.h \
- 	include/private/gcconfig.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gcroots.pc
- libgcroots_la_SOURCES = mark.c gcroots.c
- 
diff --git a/textproc/uim/files/patch-uim_uim.c b/textproc/uim/files/patch-uim_uim.c
index 60da58bd3278..4e27f596b90c 100644
--- a/textproc/uim/files/patch-uim_uim.c
+++ b/textproc/uim/files/patch-uim_uim.c
@@ -1,6 +1,6 @@
---- uim/uim.c.orig	2008-04-29 10:39:34.000000000 +0900
-+++ uim/uim.c	2009-01-24 10:11:56.000000000 +0900
-@@ -90,10 +90,10 @@ fatal_error_hook(void)
+--- uim/uim.c.orig	2013-06-30 04:26:09 UTC
++++ uim/uim.c
+@@ -101,10 +101,10 @@ fatal_error_hook(void)
    uim_fatal_error("an unhandled error raised from Scheme interpreter");
  }
  
@@ -13,7 +13,7 @@
    char *sys_load_path;
  
    if (uim_initialized)
-@@ -108,7 +108,7 @@ uim_init(void)
+@@ -119,7 +119,7 @@ uim_init(void)
    uim_scm_init(sys_load_path);
    uim_scm_set_fatal_error_hook(fatal_error_hook);
  
diff --git a/textproc/uim/files/patch-uim_uim.h b/textproc/uim/files/patch-uim_uim.h
index d21e789c219f..a7bd530e6be2 100644
--- a/textproc/uim/files/patch-uim_uim.h
+++ b/textproc/uim/files/patch-uim_uim.h
@@ -1,6 +1,6 @@
---- uim/uim.h.orig	2008-09-07 23:05:06.000000000 +0900
-+++ uim/uim.h	2009-01-24 11:20:11.000000000 +0900
-@@ -431,7 +431,7 @@ struct uim_code_converter {
+--- uim/uim.h.orig	2013-06-30 04:26:09 UTC
++++ uim/uim.h
+@@ -430,7 +430,7 @@ struct uim_code_converter {
   *
   * @return 0 on success, otherwise -1
   */
diff --git a/textproc/uim/files/patch-xim_convdisp.cpp b/textproc/uim/files/patch-xim_convdisp.cpp
index fa4d1d08d4ba..d063027340da 100644
--- a/textproc/uim/files/patch-xim_convdisp.cpp
+++ b/textproc/uim/files/patch-xim_convdisp.cpp
@@ -1,6 +1,6 @@
---- ./xim/convdisp.cpp.orig	2009-01-21 11:16:35.000000000 +0900
-+++ ./xim/convdisp.cpp	2009-01-23 02:41:58.000000000 +0900
-@@ -87,14 +87,14 @@
+--- xim/convdisp.cpp.orig	2013-06-30 04:26:09 UTC
++++ xim/convdisp.cpp
+@@ -87,14 +87,14 @@ init_default_xftfont() {
      gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy),
  		    XFT_FAMILY, XftTypeString, fontname,
  		    XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -17,7 +17,7 @@
      }
  }
  
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ update_default_xftfont() {
  			DefaultScreen(XimServer::gDpy),
  			XFT_FAMILY, XftTypeString, fontname,
  			XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -26,7 +26,7 @@
  	if (xftfont) {
  	    if (gXftFont)
  		XftFontClose(XimServer::gDpy, gXftFont);
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ PeWin::PeWin(Window pw, const char *im_l
  			    DefaultScreen(XimServer::gDpy),
  			    XFT_FAMILY, XftTypeString, gXftFontName,
  			    XFT_PIXEL_SIZE, XftTypeDouble, (double)mXftFontSize,
@@ -35,7 +35,7 @@
  	}
  	mXftDraw = XftDrawCreate(XimServer::gDpy, mPixmap,
  			DefaultVisual(XimServer::gDpy, scr_num),
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ void PeWin::set_xftfont(const char *xfld
  			    DefaultScreen(XimServer::gDpy),
  			    XFT_FAMILY, XftTypeString, gXftFontName,
  			    XFT_PIXEL_SIZE, XftTypeDouble, (double)size,
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index 5063444d5022..ed458ec6f460 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	libfo>=0.6.2:textproc/libfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		autoreconf gmake gettext libtool pkgconfig pathfix
+USES=		autoreconf gmake gettext libtool pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	libgnomeprint libartlgpl2 pango glib20 \
 		libxslt libxml2 gdkpixbuf2