Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Oct 2016 15:21:13 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424427 - in head: archivers/lhasa archivers/liblz4 archivers/minizip archivers/unadf audio/libaacplus audio/libadplug audio/libmikmod audio/libmikmod/files audio/libtremor audio/libxmp...
Message-ID:  <201610211521.u9LFLDdD040363@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Oct 21 15:21:13 2016
New Revision: 424427
URL: https://svnweb.freebsd.org/changeset/ports/424427

Log:
  Use USES=pathfix where applicable.
  
  PR:		213195
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D8093

Deleted:
  head/audio/libmikmod/files/
  head/audio/libxmp/files/
  head/audio/rubberband/files/patch-Makefile.in
  head/comms/hamlib/files/patch-Makefile.am
  head/comms/unixcw/files/
  head/databases/libdrizzle/files/
  head/databases/opendbx/files/
  head/databases/postgresql-libpqxx/files/
  head/databases/postgresql-libpqxx3/files/patch-Makefile.in
  head/devel/cld/files/
  head/devel/codeblocks/files/patch-Makefile.am
  head/devel/codeblocks/files/patch-Makefile.in
  head/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am
  head/devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am
  head/devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in
  head/devel/cpputest/files/
  head/devel/flatzebra/files/patch-Makefile.in
  head/devel/ivykis/files/
  head/devel/lasi/files/patch-cmake+modules+pkg-config.cmake
  head/devel/libbrotli/files/patch-Makefile.am
  head/devel/libee/files/patch-Makefile.in
  head/devel/libelf/files/patch-Makefile.in
  head/devel/libestr/files/
  head/devel/lightning/files/
  head/devel/marisa-trie/files/
  head/devel/msgpack/files/
  head/devel/papi/files/patch-Makefile.inc
  head/devel/rudiments/files/patch-bin_Makefile
  head/devel/rudiments/files/patch-doc_Makefile
  head/devel/rudiments/files/patch-include_Makefile.in
  head/devel/rudiments/files/patch-man_Makefile
  head/devel/tex-libtexlua/files/
  head/devel/tex-libtexluajit/files/
  head/emulators/open-vm-tools/files/patch-libguestlib-Makefile
  head/graphics/Coin/files/patch-Makefile.in
  head/graphics/freeglut/files/patch-CMakeLists.txt
  head/graphics/leptonica/files/
  head/graphics/pfstools/files/patch-src-pfs-Makefile.in
  head/graphics/waffle/files/patch-CMakeLists.txt
  head/math/hfst/files/patch-libhfst-Makefile.in
  head/net/librdkafka/files/
  head/security/d0_blind_id/files/
  head/sysutils/cinnamon-control-center/files/patch-shell_Makefile.am
  head/sysutils/usbutils/files/patch-Makefile.am
  head/sysutils/usbutils/files/patch-Makefile.in
  head/textproc/btparse/files/
  head/textproc/libcue/files/
  head/textproc/turboxsl/files/patch-Makefile.am
  head/textproc/uim/files/patch-Makefile.in
  head/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
  head/www/trafficserver/files/patch-tools_Makefile.in
  head/x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am
  head/x11/libSM/files/patch-Makefile.am
Modified:
  head/archivers/lhasa/Makefile   (contents, props changed)
  head/archivers/liblz4/Makefile   (contents, props changed)
  head/archivers/minizip/Makefile   (contents, props changed)
  head/archivers/unadf/Makefile   (contents, props changed)
  head/audio/libaacplus/Makefile   (contents, props changed)
  head/audio/libadplug/Makefile   (contents, props changed)
  head/audio/libmikmod/Makefile   (contents, props changed)
  head/audio/libtremor/Makefile   (contents, props changed)
  head/audio/libxmp/Makefile   (contents, props changed)
  head/audio/opusfile/Makefile   (contents, props changed)
  head/audio/rubberband/Makefile   (contents, props changed)
  head/audio/shout-idjc/Makefile   (contents, props changed)
  head/audio/soundtouch/Makefile   (contents, props changed)
  head/audio/vamp-plugin-sdk/Makefile   (contents, props changed)
  head/audio/vamp-plugin-sdk/files/patch-Makefile.in   (contents, props changed)
  head/biology/htslib/Makefile   (contents, props changed)
  head/biology/htslib/files/patch-Makefile   (contents, props changed)
  head/biology/jellyfish/Makefile   (contents, props changed)
  head/biology/libgtextutils/Makefile   (contents, props changed)
  head/chinese/librime/Makefile   (contents, props changed)
  head/chinese/librime/files/patch-CMakeLists.txt   (contents, props changed)
  head/chinese/pyzy/Makefile   (contents, props changed)
  head/comms/hamlib/Makefile   (contents, props changed)
  head/comms/libirman/Makefile   (contents, props changed)
  head/comms/libirman/files/patch-Makefile.in   (contents, props changed)
  head/comms/rtl-sdr/Makefile   (contents, props changed)
  head/comms/unixcw/Makefile   (contents, props changed)
  head/databases/akonadi/Makefile   (contents, props changed)
  head/databases/libdrizzle/Makefile   (contents, props changed)
  head/databases/libmongo-client/Makefile   (contents, props changed)
  head/databases/mdbtools/Makefile   (contents, props changed)
  head/databases/opendbx/Makefile   (contents, props changed)
  head/databases/postgresql-libpqxx/Makefile   (contents, props changed)
  head/databases/postgresql-libpqxx3/Makefile   (contents, props changed)
  head/databases/sqlite2/Makefile   (contents, props changed)
  head/databases/sqlite2/files/patch-Makefile.in   (contents, props changed)
  head/databases/sqlrelay/Makefile   (contents, props changed)
  head/databases/sqlrelay/files/patch-Makefile   (contents, props changed)
  head/databases/tokyocabinet/Makefile   (contents, props changed)
  head/databases/tokyotyrant/Makefile   (contents, props changed)
  head/devel/babeltrace/Makefile   (contents, props changed)
  head/devel/c-unit/Makefile   (contents, props changed)
  head/devel/cld/Makefile   (contents, props changed)
  head/devel/compiz-bcop/Makefile   (contents, props changed)
  head/devel/cpputest/Makefile   (contents, props changed)
  head/devel/cunit/Makefile   (contents, props changed)
  head/devel/dbus-c++/Makefile   (contents, props changed)
  head/devel/ding-libs/Makefile   (contents, props changed)
  head/devel/editline/Makefile   (contents, props changed)
  head/devel/efl/Makefile   (contents, props changed)
  head/devel/flatzebra/Makefile   (contents, props changed)
  head/devel/google-gdata/Makefile   (contents, props changed)
  head/devel/google-gdata/files/patch-Makefile   (contents, props changed)
  head/devel/gumbo/Makefile   (contents, props changed)
  head/devel/hyperscan/Makefile   (contents, props changed)
  head/devel/isl/Makefile   (contents, props changed)
  head/devel/ivykis/Makefile   (contents, props changed)
  head/devel/lasi/Makefile   (contents, props changed)
  head/devel/liballium/Makefile   (contents, props changed)
  head/devel/libbrotli/Makefile   (contents, props changed)
  head/devel/libcfu/Makefile   (contents, props changed)
  head/devel/libdlna/Makefile   (contents, props changed)
  head/devel/libdlna/files/patch-Makefile   (contents, props changed)
  head/devel/libee/Makefile   (contents, props changed)
  head/devel/libelf/Makefile   (contents, props changed)
  head/devel/libestr/Makefile   (contents, props changed)
  head/devel/libevent2/Makefile   (contents, props changed)
  head/devel/libfastjson/Makefile   (contents, props changed)
  head/devel/libfirm/Makefile   (contents, props changed)
  head/devel/libgit2/Makefile   (contents, props changed)
  head/devel/libhtp/Makefile   (contents, props changed)
  head/devel/liblouis/Makefile   (contents, props changed)
  head/devel/libmowgli/Makefile   (contents, props changed)
  head/devel/liboil/Makefile   (contents, props changed)
  head/devel/libopkele/Makefile   (contents, props changed)
  head/devel/libosmo-abis/Makefile   (contents, props changed)
  head/devel/libosmo-netif/Makefile   (contents, props changed)
  head/devel/libosmo-sccp/Makefile   (contents, props changed)
  head/devel/libosmocore/Makefile   (contents, props changed)
  head/devel/libr3/Makefile   (contents, props changed)
  head/devel/libsearpc/Makefile   (contents, props changed)
  head/devel/libsmpp34/Makefile   (contents, props changed)
  head/devel/libtermkey/Makefile   (contents, props changed)
  head/devel/libunwind/Makefile   (contents, props changed)
  head/devel/libuv/Makefile   (contents, props changed)
  head/devel/libxs/Makefile   (contents, props changed)
  head/devel/lightning/Makefile   (contents, props changed)
  head/devel/m17n-db/Makefile   (contents, props changed)
  head/devel/m17n-lib/Makefile   (contents, props changed)
  head/devel/marisa-trie/Makefile   (contents, props changed)
  head/devel/msgpack/Makefile   (contents, props changed)
  head/devel/ndesk-options/Makefile   (contents, props changed)
  head/devel/ois/Makefile   (contents, props changed)
  head/devel/oniguruma5/Makefile   (contents, props changed)
  head/devel/opendht/Makefile   (contents, props changed)
  head/devel/orc/Makefile   (contents, props changed)
  head/devel/papi/Makefile   (contents, props changed)
  head/devel/protobuf/Makefile   (contents, props changed)
  head/devel/ptlib/Makefile   (contents, props changed)
  head/devel/ptlib/files/patch-Makefile.in   (contents, props changed)
  head/devel/qjson/Makefile   (contents, props changed)
  head/devel/radare2/Makefile   (contents, props changed)
  head/devel/rapidjson/Makefile   (contents, props changed)
  head/devel/rudiments/Makefile   (contents, props changed)
  head/devel/rudiments/files/patch-Makefile   (contents, props changed)
  head/devel/rudiments/files/patch-configure   (contents, props changed)
  head/devel/rudiments/files/patch-src_Makefile.in   (contents, props changed)
  head/devel/simavr/Makefile   (contents, props changed)
  head/devel/simavr/files/patch-simavr_Makefile   (contents, props changed)
  head/devel/sparsehash/Makefile   (contents, props changed)
  head/devel/tex-kpathsea/Makefile   (contents, props changed)
  head/devel/tex-kpathsea/files/patch-Makefile.in   (contents, props changed)
  head/devel/tex-libtexlua/Makefile   (contents, props changed)
  head/devel/tex-libtexluajit/Makefile   (contents, props changed)
  head/devel/tex-synctex/Makefile   (contents, props changed)
  head/devel/tex-synctex/files/patch-Makefile.in   (contents, props changed)
  head/devel/tex-web2c/Makefile   (contents, props changed)
  head/devel/tex-web2c/files/patch-Makefile.in   (contents, props changed)
  head/devel/thrift-c_glib/Makefile   (contents, props changed)
  head/devel/thrift-cpp/Makefile   (contents, props changed)
  head/devel/unibilium/Makefile   (contents, props changed)
  head/devel/valgrind-devel/Makefile   (contents, props changed)
  head/devel/valgrind/Makefile   (contents, props changed)
  head/dns/bundy/Makefile   (contents, props changed)
  head/dns/getdns/Makefile   (contents, props changed)
  head/dns/libpsl/Makefile   (contents, props changed)
  head/emulators/open-vm-tools/Makefile   (contents, props changed)
  head/ftp/curl/Makefile   (contents, props changed)
  head/ftp/curl/files/patch-configure   (contents, props changed)
  head/ftp/curlpp/Makefile   (contents, props changed)
  head/games/liblcf/Makefile   (contents, props changed)
  head/games/poker-engine/Makefile   (contents, props changed)
  head/games/py-poker-eval/Makefile   (contents, props changed)
  head/games/py-poker-eval/files/patch-Makefile.am   (contents, props changed)
  head/games/qqwing/Makefile   (contents, props changed)
  head/graphics/Coin/Makefile   (contents, props changed)
  head/graphics/GraphicsMagick/Makefile   (contents, props changed)
  head/graphics/GraphicsMagick/files/patch-Makefile.in   (contents, props changed)
  head/graphics/agg/Makefile   (contents, props changed)
  head/graphics/cal3d/Makefile   (contents, props changed)
  head/graphics/freeglut/Makefile   (contents, props changed)
  head/graphics/iec16022/Makefile   (contents, props changed)
  head/graphics/leptonica/Makefile   (contents, props changed)
  head/graphics/libepoxy/Makefile   (contents, props changed)
  head/graphics/libpano13/Makefile   (contents, props changed)
  head/graphics/libpano13/files/patch-Makefile.am   (contents, props changed)
  head/graphics/libpgf/Makefile   (contents, props changed)
  head/graphics/libpgf/files/patch-Makefile.am   (contents, props changed)
  head/graphics/libreatlas/Makefile   (contents, props changed)
  head/graphics/libspiro/Makefile   (contents, props changed)
  head/graphics/libspiro/files/patch-Makefile.am   (contents, props changed)
  head/graphics/ming/Makefile   (contents, props changed)
  head/graphics/opengtl/Makefile   (contents, props changed)
  head/graphics/pfstools/Makefile   (contents, props changed)
  head/graphics/qtgtl/Makefile   (contents, props changed)
  head/graphics/s2tc/Makefile   (contents, props changed)
  head/graphics/sdl_gfx/Makefile   (contents, props changed)
  head/graphics/sekrit-twc-zimg/Makefile   (contents, props changed)
  head/graphics/tesseract/Makefile   (contents, props changed)
  head/graphics/tiff/Makefile   (contents, props changed)
  head/graphics/tiff/files/patch-Makefile.in   (contents, props changed)
  head/graphics/tiffgt/Makefile   (contents, props changed)
  head/graphics/tiffgt/files/patch-Makefile.in   (contents, props changed)
  head/graphics/waffle/Makefile   (contents, props changed)
  head/graphics/zathura/Makefile   (contents, props changed)
  head/graphics/zbar/Makefile   (contents, props changed)
  head/irc/ctrlproxy/Makefile   (contents, props changed)
  head/irc/ctrlproxy/files/patch-Makefile   (contents, props changed)
  head/irc/znc/Makefile   (contents, props changed)
  head/korean/gtkcomm/Makefile   (contents, props changed)
  head/korean/libhangul/Makefile   (contents, props changed)
  head/lang/cjs/Makefile   (contents, props changed)
  head/lang/python27/Makefile   (contents, props changed)
  head/lang/python33/Makefile   (contents, props changed)
  head/lang/python34/Makefile   (contents, props changed)
  head/lang/python35/Makefile   (contents, props changed)
  head/lang/qore/Makefile   (contents, props changed)
  head/lang/smalltalk/Makefile   (contents, props changed)
  head/mail/dspam/Makefile   (contents, props changed)
  head/mail/evolution-mapi/Makefile   (contents, props changed)
  head/mail/libmapi/Makefile   (contents, props changed)
  head/mail/libmapi/files/patch-Makefile   (contents, props changed)
  head/math/R/Makefile   (contents, props changed)
  head/math/coinmp/Makefile   (contents, props changed)
  head/math/cvc3/Makefile   (contents, props changed)
  head/math/cvc3/files/patch-src-Makefile   (contents, props changed)
  head/math/fann/Makefile   (contents, props changed)
  head/math/hfst/Makefile   (contents, props changed)
  head/math/igraph/Makefile   (contents, props changed)
  head/math/ipopt/Makefile   (contents, props changed)
  head/math/jags/Makefile   (contents, props changed)
  head/math/nlopt/Makefile   (contents, props changed)
  head/math/ufc/Makefile   (contents, props changed)
  head/misc/talkfilters/Makefile   (contents, props changed)
  head/multimedia/gstreamer-qt4/Makefile   (contents, props changed)
  head/multimedia/gstreamer1-vaapi/Makefile   (contents, props changed)
  head/multimedia/kvazaar/Makefile   (contents, props changed)
  head/multimedia/libass/Makefile   (contents, props changed)
  head/multimedia/libde265/Makefile   (contents, props changed)
  head/multimedia/libkate/Makefile   (contents, props changed)
  head/multimedia/libtheora/Makefile   (contents, props changed)
  head/multimedia/libtheora/files/patch-Makefile.in   (contents, props changed)
  head/multimedia/mlt/Makefile   (contents, props changed)
  head/multimedia/vapoursynth/Makefile   (contents, props changed)
  head/net-im/libaccounts-glib/Makefile   (contents, props changed)
  head/net-im/telepathy-farstream/Makefile   (contents, props changed)
  head/net-im/tox/Makefile   (contents, props changed)
  head/net-mgmt/ccnet/Makefile   (contents, props changed)
  head/net-mgmt/riemann-c-client/Makefile   (contents, props changed)
  head/net-mgmt/seafile/Makefile   (contents, props changed)
  head/net/GeoIP/Makefile   (contents, props changed)
  head/net/geoipupdate/Makefile   (contents, props changed)
  head/net/kea/Makefile   (contents, props changed)
  head/net/kea/files/patch-Makefile.am   (contents, props changed)
  head/net/libilbc/Makefile   (contents, props changed)
  head/net/libilbc/files/patch-CMakeLists.txt   (contents, props changed)
  head/net/librdkafka/Makefile   (contents, props changed)
  head/net/libvncserver/Makefile   (contents, props changed)
  head/net/mobile-broadband-provider-info/Makefile   (contents, props changed)
  head/net/openbsc/Makefile   (contents, props changed)
  head/net/openggsn/Makefile   (contents, props changed)
  head/net/openpgm/Makefile   (contents, props changed)
  head/net/pacemaker/Makefile   (contents, props changed)
  head/net/rabbitmq-c-devel/Makefile   (contents, props changed)
  head/net/shadowsocks-libev/Makefile   (contents, props changed)
  head/polish/gnugadu2/Makefile   (contents, props changed)
  head/polish/libgadu/Makefile   (contents, props changed)
  head/print/libijs/Makefile   (contents, props changed)
  head/print/libijs/files/patch-Makefile.in   (contents, props changed)
  head/print/panda/Makefile   (contents, props changed)
  head/print/tex-ptexenc/Makefile   (contents, props changed)
  head/print/tex-ptexenc/files/patch-Makefile.in   (contents, props changed)
  head/science/chemical-mime-data/Makefile   (contents, props changed)
  head/security/clamav/Makefile   (contents, props changed)
  head/security/d0_blind_id/Makefile   (contents, props changed)
  head/security/sssd/Makefile   (contents, props changed)
  head/security/suricata/Makefile   (contents, props changed)
  head/security/yara/Makefile   (contents, props changed)
  head/security/ykpers/Makefile   (contents, props changed)
  head/shells/bash-completion/Makefile   (contents, props changed)
  head/shells/bash-completion/files/patch-Makefile.am   (contents, props changed)
  head/sysutils/afflib/Makefile   (contents, props changed)
  head/sysutils/cinnamon-settings-daemon/Makefile   (contents, props changed)
  head/sysutils/dateutils/Makefile   (contents, props changed)
  head/sysutils/usbutils/Makefile   (contents, props changed)
  head/textproc/apertium/Makefile   (contents, props changed)
  head/textproc/augeas/Makefile   (contents, props changed)
  head/textproc/btparse/Makefile   (contents, props changed)
  head/textproc/hyperestraier/Makefile   (contents, props changed)
  head/textproc/ibus-table/Makefile   (contents, props changed)
  head/textproc/iksemel/Makefile   (contents, props changed)
  head/textproc/libcue/Makefile   (contents, props changed)
  head/textproc/libfo/files/patch-Makefile.am   (contents, props changed)
  head/textproc/libguess/Makefile   (contents, props changed)
  head/textproc/liblrdf/Makefile   (contents, props changed)
  head/textproc/libucl/Makefile   (contents, props changed)
  head/textproc/m17n-im-config/Makefile   (contents, props changed)
  head/textproc/ots/Makefile   (contents, props changed)
  head/textproc/tokyodystopia/Makefile   (contents, props changed)
  head/textproc/turboxsl/Makefile   (contents, props changed)
  head/textproc/uim/Makefile   (contents, props changed)
  head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in   (contents, props changed)
  head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in   (contents, props changed)
  head/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in   (contents, props changed)
  head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in   (contents, props changed)
  head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in   (contents, props changed)
  head/textproc/uim/files/patch-emacs_Makefile.in   (contents, props changed)
  head/textproc/uim/files/patch-po_Makefile.in.in   (contents, props changed)
  head/textproc/uim/files/patch-qt4_immodule_plugin.cpp   (contents, props changed)
  head/textproc/uim/files/patch-scm_sj3-custom.scm   (contents, props changed)
  head/textproc/uim/files/patch-sigscheme_doc_Makefile.in   (contents, props changed)
  head/textproc/uim/files/patch-uim_uim.c   (contents, props changed)
  head/textproc/uim/files/patch-uim_uim.h   (contents, props changed)
  head/textproc/uim/files/patch-xim_convdisp.cpp   (contents, props changed)
  head/textproc/xmlroff/Makefile   (contents, props changed)
  head/www/libhtp-suricata/Makefile   (contents, props changed)
  head/www/mod_webauth/Makefile   (contents, props changed)
  head/www/nghttp2/Makefile   (contents, props changed)
  head/www/trafficserver/Makefile   (contents, props changed)
  head/www/varnish4/Makefile   (contents, props changed)
  head/www/webkit-gtk2/Makefile   (contents, props changed)
  head/www/webkit-gtk3/Makefile   (contents, props changed)
  head/www/webkit-sharp/Makefile   (contents, props changed)
  head/www/yaws/Makefile   (contents, props changed)
  head/x11-drivers/xf86-input-joystick/Makefile   (contents, props changed)
  head/x11-toolkits/gai/Makefile   (contents, props changed)
  head/x11-toolkits/gai/files/patch-gai_Makefile.in   (contents, props changed)
  head/x11-toolkits/girara/Makefile   (contents, props changed)
  head/x11-wm/muffin/Makefile   (contents, props changed)
  head/x11/cinnamon-desktop/Makefile   (contents, props changed)
  head/x11/cinnamon-menus/Makefile   (contents, props changed)
  head/x11/cinnamon-screensaver/Makefile   (contents, props changed)
  head/x11/cinnamon-session/Makefile   (contents, props changed)
  head/x11/keybinder-gtk3/Makefile   (contents, props changed)
  head/x11/keybinder/Makefile   (contents, props changed)
  head/x11/libSM/Makefile   (contents, props changed)

Modified: head/archivers/lhasa/Makefile
==============================================================================
--- head/archivers/lhasa/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/archivers/lhasa/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,6 @@ LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf pathfix libtool
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--program-suffix=sa

Modified: head/archivers/liblz4/Makefile
==============================================================================
--- head/archivers/liblz4/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/archivers/liblz4/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,20 +16,19 @@ LICENSE_COMB=	multi
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cyan4973
 
-USES=		gmake pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
+PATHFIX_MAKEFILEIN=	Makefile
 
 ALL_TARGET=	default		# don't remove this
 SO_VER=		1.7.1
 PLIST_SUB+=	SO_VER=${SO_VER} SO_VER_MAJ=${SO_VER:R:R}
+LIBDIR=		${PREFIX}/lib
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
-		-e 's/LIBDIR?=/LOCALLIBDIR=/; s/$$(LIBDIR)/$$(LOCALLIBDIR)/g' \
-		-e 's|$$(LOCALLIBDIR)/pkgconfig|$$(PREFIX)/libdata/pkgconfig|' \
 		-e '/^MANDIR :=/s|share/||' \
-		-e 's/kFreeBSD/& FreeBSD/' \
-		-e 's|$$(MAKE)|${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}|'
+		-e 's/kFreeBSD/& FreeBSD/'
 	@${REINPLACE_CMD} -e '/^all:/s/$$/ liblz4.pc/' \
 		${WRKSRC}/lib/Makefile
 	@${REINPLACE_CMD} -e '/^all:/s|fullbench.*||' \

Modified: head/archivers/minizip/Makefile
==============================================================================
--- head/archivers/minizip/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/archivers/minizip/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,6 @@ COMMENT=	Zip library and programs from Z
 LICENSE=	ZLIB
 
 USES=		autoreconf libtool pathfix tar:xz
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-demos
 INSTALL_TARGET=	install-strip

Modified: head/archivers/unadf/Makefile
==============================================================================
--- head/archivers/unadf/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/archivers/unadf/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/adflib
 INSTALL_TARGET=	install-strip
 USES=		autoreconf libtool pathfix tar:bzip2
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/audio/libaacplus/Makefile
==============================================================================
--- head/audio/libaacplus/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/libaacplus/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -28,7 +28,6 @@ CONFLICTS=	aacplusenc-0*
 USE_CSTD=	gnu89
 USES=		autoreconf pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip

Modified: head/audio/libadplug/Makefile
==============================================================================
--- head/audio/libadplug/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/libadplug/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libbinio.so:devel/libbinio
 
-USES=		pkgconfig libtool makeinfo
+USES=		libtool makeinfo pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
@@ -38,9 +38,6 @@ post-patch:
 		${WRKSRC}/src/fprovide.cpp \
 		${WRKSRC}/src/database.cpp \
 		${WRKSRC}/src/dmo.cpp
-	@${REINPLACE_CMD} -e 's|^\(pkgconfigdir\ =\).*|\1 $$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: head/audio/libmikmod/Makefile
==============================================================================
--- head/audio/libmikmod/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/libmikmod/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -11,7 +11,7 @@ COMMENT=	MikMod Sound Library
 
 LICENSE=	LGPL21
 
-USES=		cpe gmake libtool pkgconfig
+USES=		cpe gmake libtool pathfix pkgconfig
 CPE_VENDOR=	raphael_assenat
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-esd

Modified: head/audio/libtremor/Makefile
==============================================================================
--- head/audio/libtremor/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/libtremor/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,6 @@ LIB_DEPENDS=	libogg.so:audio/libogg
 
 GIT_COMMIT=	b56ffc
 USES=		autoreconf libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

Modified: head/audio/libxmp/Makefile
==============================================================================
--- head/audio/libxmp/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/libxmp/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -12,7 +12,7 @@ COMMENT=	Module rendering library for xm
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.LIB
 
-USES=		gmake
+USES=		gmake pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/audio/opusfile/Makefile
==============================================================================
--- head/audio/opusfile/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/opusfile/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -19,7 +19,6 @@ USES=		autoreconf gmake libtool pathfix 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 PORTDOCS=	AUTHORS README.txt
 

Modified: head/audio/rubberband/Makefile
==============================================================================
--- head/audio/rubberband/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/rubberband/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndf
 		libfftw3.so:math/fftw3
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/audio/shout-idjc/Makefile
==============================================================================
--- head/audio/shout-idjc/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/shout-idjc/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libsamplerate.so:audio/libs
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig autoreconf
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS

Modified: head/audio/soundtouch/Makefile
==============================================================================
--- head/audio/soundtouch/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/soundtouch/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 USES=			autoreconf libtool pathfix
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 OPTIONS_DEFINE=	INTEGER_SAMPLES DOCS OPENMP
 OPTIONS_DEFAULT=	${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}

Modified: head/audio/vamp-plugin-sdk/Makefile
==============================================================================
--- head/audio/vamp-plugin-sdk/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/vamp-plugin-sdk/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 post-install:

Modified: head/audio/vamp-plugin-sdk/files/patch-Makefile.in
==============================================================================
--- head/audio/vamp-plugin-sdk/files/patch-Makefile.in	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/audio/vamp-plugin-sdk/files/patch-Makefile.in	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,11 +1,6 @@
 --- Makefile.in.orig	2015-06-22 08:28:58 UTC
 +++ Makefile.in
-@@ -90,11 +90,11 @@ INSTALL_HOSTSDK_LINK_DEV  = libvamp-host
- INSTALL_HOSTSDK_STATIC    = libvamp-hostsdk.a
- INSTALL_HOSTSDK_LA        = libvamp-hostsdk.la
- 
--INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/lib/pkgconfig
-+INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/libdata/pkgconfig
+@@ -94,7 +94,7 @@ INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/
  
  # Flags required to tell the compiler to create a dynamically loadable object
  #

Modified: head/biology/htslib/Makefile
==============================================================================
--- head/biology/htslib/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/biology/htslib/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,10 +17,11 @@ TEST_DEPENDS=	bash:shells/bash
 USE_GITHUB=	yes
 GH_ACCOUNT=	samtools
 
-USES=		autoreconf gmake perl5 shebangfix
+USES=		autoreconf gmake pathfix perl5 shebangfix
 USE_PERL5=	test
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+PATHFIX_MAKEFILEIN=	Makefile
 SHEBANG_FILES=	test/compare_sam.pl test/test.pl
 
 OPTIONS_DEFINE=		CURL

Modified: head/biology/htslib/files/patch-Makefile
==============================================================================
--- head/biology/htslib/files/patch-Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/biology/htslib/files/patch-Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,4 +1,4 @@
---- Makefile.orig	2015-12-15 16:34:33 UTC
+--- Makefile.orig	2016-04-22 08:45:12 UTC
 +++ Makefile
 @@ -22,16 +22,7 @@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
@@ -17,7 +17,7 @@
  
  # For now these don't work too well as samtools also needs to know to
  # add -lbz2 and -llzma if linking against the static libhts.a library.
-@@ -58,16 +49,10 @@ includedir  = $(prefix)/include
+@@ -58,17 +49,11 @@ includedir  = $(prefix)/include
  libdir      = $(exec_prefix)/lib
  libexecdir  = $(exec_prefix)/libexec
  datarootdir = $(prefix)/share
@@ -25,17 +25,17 @@
 +mandir      = $(prefix)/man
  man1dir     = $(mandir)/man1
  man5dir     = $(mandir)/man5
--pkgconfigdir= $(libdir)/pkgconfig
--
+ pkgconfigdir= $(prefix)/libdata/pkgconfig
+ 
 -MKDIR_P = mkdir -p
 -INSTALL = install -p
 -INSTALL_PROGRAM = $(INSTALL)
 -INSTALL_DATA    = $(INSTALL) -m 644
 -INSTALL_DIR     = $(MKDIR_P) -m 755
-+pkgconfigdir= $(exec_prefix)/libdata/pkgconfig
- 
+-
  # Set by config.mk if plugins are enabled
  plugindir =
+ 
 @@ -86,7 +71,7 @@ BUILT_TEST_PROGRAMS = \
  	test/test-vcf-api \
  	test/test-vcf-sweep
@@ -45,7 +45,7 @@
  
  HTSPREFIX =
  include htslib_vars.mk
-@@ -361,7 +346,7 @@ installdirs:
+@@ -360,7 +345,7 @@ installdirs:
  # and libhts.so.NN (used by client executables at runtime).
  
  install-so: libhts.so installdirs

Modified: head/biology/jellyfish/Makefile
==============================================================================
--- head/biology/jellyfish/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/biology/jellyfish/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	yaggo:devel/yaggo
 GNU_CONFIGURE=	yes
 
 USES=		autoreconf compiler:c++11-lib gmake \
-		libtool pkgconfig
+		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -35,10 +35,4 @@ BROKEN_FreeBSD_9_i386=	multiple code iss
 CONFIGURE_ARGS+=--without-sse
 .endif
 
-# configure does not support --with-pkgconfigdir
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
-
 .include <bsd.port.post.mk>

Modified: head/biology/libgtextutils/Makefile
==============================================================================
--- head/biology/libgtextutils/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/biology/libgtextutils/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -10,7 +10,7 @@ COMMENT=	Gordon's text utilities
 
 LICENSE=	AGPLv3
 
-USES=		autoreconf libtool pkgconfig
+USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -19,9 +19,4 @@ GH_ACCOUNT=	agordon
 
 INSTALL_TARGET=	install-strip
 
-post-patch:
-	@${REINPLACE_CMD} \
-		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.am
-
 .include <bsd.port.mk>

Modified: head/chinese/librime/Makefile
==============================================================================
--- head/chinese/librime/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/chinese/librime/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/bo
 		libopencc.so:chinese/opencc \
 		libyaml-cpp.so:devel/yaml-cpp
 
-USES=		cmake compiler:c++11-lib pkgconfig gettext perl5
+USES=		cmake compiler:c++11-lib pathfix pkgconfig gettext perl5
 USE_PERL5=	build patch
 USE_LDCONFIG=	yes
 USE_XORG=	xproto

Modified: head/chinese/librime/files/patch-CMakeLists.txt
==============================================================================
--- head/chinese/librime/files/patch-CMakeLists.txt	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/chinese/librime/files/patch-CMakeLists.txt	Fri Oct 21 15:21:13 2016	(r424427)
@@ -9,15 +9,6 @@
    # uninstall target
    configure_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-@@ -142,7 +142,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-       ${PROJECT_BINARY_DIR}/rime.pc
-       @ONLY)
-   install(FILES include/rime_api.h DESTINATION include)
--  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-+  install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
-   install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
-   if(BUILD_DATA)
-     install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
 @@ -153,7 +153,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
      file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
      install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})

Modified: head/chinese/pyzy/Makefile
==============================================================================
--- head/chinese/pyzy/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/chinese/pyzy/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -18,7 +18,7 @@ BROKEN=		Unfetchable (google code has go
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
-USES=		compiler:c++11-lib gettext-runtime gmake libtool pkgconfig python:build shebangfix
+USES=		compiler:c++11-lib gettext-runtime gmake libtool pathfix pkgconfig python:build shebangfix
 SHEBANG_FILES=	data/db/android/create_db.py
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
@@ -47,9 +47,6 @@ OPENCC_LIB_DEPENDS=		libopencc.so:chines
 post-extract-OPENPHRASE_DB-on:
 	@${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so
 

Modified: head/comms/hamlib/Makefile
==============================================================================
--- head/comms/hamlib/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/comms/hamlib/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	swig:devel/swig13
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 INFO=		hamlib
-USES=		autoreconf libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
+USES=		autoreconf libtool:keepla pathfix perl5 pathfix pkgconfig python shebangfix tcl
 USE_PYTHON=	py3kplist
 SHEBANG_FILES=	bindings/perltest.pl
 USE_PERL5=	build run

Modified: head/comms/libirman/Makefile
==============================================================================
--- head/comms/libirman/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/comms/libirman/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -11,7 +11,7 @@ COMMENT=	Library for Evation's Irman inf
 
 LICENSE=	LGPL20
 
-USES=		gmake libtool tar:bzip2
+USES=		gmake libtool pathfix tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/comms/libirman/files/patch-Makefile.in
==============================================================================
--- head/comms/libirman/files/patch-Makefile.in	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/comms/libirman/files/patch-Makefile.in	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,14 +1,5 @@
 --- Makefile.in.orig	2015-08-18 19:51:04 UTC
 +++ Makefile.in
-@@ -399,7 +399,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign dist-bzip2
- ACLOCAL_AMFLAGS = -I m4
- dist_doc_DATA = README TECHNICAL
--pkgconfigdir = @libdir@/pkgconfig
-+pkgconfigdir = @prefix@/libdata/pkgconfig
- dist_pkgconfig_DATA = libirman.pc
- EXTRA_DIST = COPYING.lib TECHNICAL libirman.pc.in
- EXTRA_LTLIBRARIES = libirman_sw.la
 @@ -778,7 +778,7 @@ install-dist_sysconfDATA: $(dist_sysconf
  	done | $(am__base_list) | \
  	while read files; do \

Modified: head/comms/rtl-sdr/Makefile
==============================================================================
--- head/comms/rtl-sdr/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/comms/rtl-sdr/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -13,7 +13,7 @@ COMMENT=	Commandline tool that performs 
 
 LICENSE=	GPLv2
 
-USES=		autoreconf gmake pkgconfig libtool tar:tgz
+USES=		autoreconf gmake pkgconfig libtool pathfix tar:tgz
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -31,7 +31,5 @@ DOXYGEN_EXTRA_PATCHES_OFF=	${FILESDIR}/e
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \
 		${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} 's|^pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>

Modified: head/comms/unixcw/Makefile
==============================================================================
--- head/comms/unixcw/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/comms/unixcw/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--includedir="${LOCALBA
 			--disable-alsa --disable-pulseaudio
 
 USE_LDCONFIG=	yes
-USES+=		gmake libtool ncurses pkgconfig
+USES+=		gmake libtool ncurses pathfix pkgconfig
 USE_CSTD=	gnu99
 WRKSRC=		${WRKDIR}/unixcw-${PORTVERSION}
 MAJOR_LIB_VER=	6

Modified: head/databases/akonadi/Makefile
==============================================================================
--- head/databases/akonadi/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/akonadi/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/bo
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		cmake:outsource execinfo kde:4 shared-mime-info \
-		compiler:c++11-lang tar:bzip2
+		compiler:c++11-lang pathfix tar:bzip2
 USE_KDE=	automoc4 soprano
 USE_QT4=	corelib dbus gui network qtestlib_build sql xml \
 		moc_build qmake_build rcc_build uic_build
@@ -48,8 +48,6 @@ SQLITE_CMAKE_OFF=	-DAKONADI_BUILD_QSQLIT
 OPTIONS_DEFAULT=	MYSQL
 
 post-patch:
-	${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \
-		${PATCH_WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \
 		${PATCH_WRKSRC}/server/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Modified: head/databases/libdrizzle/Makefile
==============================================================================
--- head/databases/libdrizzle/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/libdrizzle/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sql
 OPTIONS_DEFINE=	DOXYGEN EXAMPLES DOCS
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool
+USES=		gmake libtool pathfix
 CONFIGURE_ARGS+=--enable-libsqlite3
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

Modified: head/databases/libmongo-client/Makefile
==============================================================================
--- head/databases/libmongo-client/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/libmongo-client/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -19,6 +19,5 @@ GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig gmake pathfix
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
-PATHFIX_MAKEFILEIN=Makefile.am
 
 .include <bsd.port.mk>

Modified: head/databases/mdbtools/Makefile
==============================================================================
--- head/databases/mdbtools/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/mdbtools/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -22,7 +22,6 @@ OPTIONS_SUB=	yes
 USES=		autoreconf bison iconv libtool pathfix pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	brianb
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes

Modified: head/databases/opendbx/Makefile
==============================================================================
--- head/databases/opendbx/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/opendbx/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -12,7 +12,7 @@ COMMENT=	C library for accessing databas
 
 LICENSE=	LGPL21
 
-USES=		gmake libtool readline
+USES=		gmake libtool pathfix readline
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${WRKSRC}/lib -L${LOCALBASE}/lib

Modified: head/databases/postgresql-libpqxx/Makefile
==============================================================================
--- head/databases/postgresql-libpqxx/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/postgresql-libpqxx/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
 PORTSCOUT=	limit:^2\.
 
-USES+=		gmake libtool pgsql python:build shebangfix
+USES+=		gmake libtool pathfix pgsql python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}

Modified: head/databases/postgresql-libpqxx3/Makefile
==============================================================================
--- head/databases/postgresql-libpqxx3/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/postgresql-libpqxx3/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,7 @@ COMMENT=	New C++ interface for PostgreSQ
 CONFLICTS=	postgresql-libpqxx-[2-4].*
 PORTSCOUT=	limit:^2\.
 
-USES+=		gmake libtool pgsql pkgconfig python:build shebangfix
+USES+=		gmake libtool pathfix pgsql pkgconfig python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}

Modified: head/databases/sqlite2/Makefile
==============================================================================
--- head/databases/sqlite2/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/sqlite2/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQL database engine in a C library
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pkgconfig readline
+USES=		gmake libtool pathfix pkgconfig readline
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-hints=freebsd.hints

Modified: head/databases/sqlite2/files/patch-Makefile.in
==============================================================================
--- head/databases/sqlite2/files/patch-Makefile.in	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/sqlite2/files/patch-Makefile.in	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2005-04-23 18:43:23.000000000 -0400
-+++ Makefile.in	2015-03-26 18:36:07.358178000 -0400
-@@ -38,7 +38,7 @@
+--- Makefile.in.orig	2005-04-23 22:43:23 UTC
++++ Makefile.in
+@@ -38,7 +38,7 @@ RELEASE = @ALLOWRELEASE@
  
  # libtool compile/link/install
  LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC)
@@ -9,18 +9,14 @@
  LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
  
  # Compiler options needed for programs that use the TCL library.
-@@ -471,8 +471,12 @@
- 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
-+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
-+
+@@ -474,6 +474,10 @@ install:	sqlite libsqlite.la sqlite.h
+ 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+ 	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+ 
 +install-tcl:	libtclsqlite.la
 +	$(INSTALL) -d $(DESTDIR)$(prefix)/lib/sqlite
 +	$(LTINSTALL) libtclsqlite.la $(DESTDIR)$(prefix)/lib/sqlite
- 
++
  clean:	
  	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
+ 	rm -rf .libs .deps 

Modified: head/databases/sqlrelay/Makefile
==============================================================================
--- head/databases/sqlrelay/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/sqlrelay/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,8 @@ LICENSE=	LGPL20
 LIB_DEPENDS=	librudiments.so:devel/rudiments
 
 WANT_GNOME=	yes
-USES=		gmake libtool python
+USES=		gmake libtool pathfix python
+PATHFIX_MAKEFILEIN=	Makefile
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \

Modified: head/databases/sqlrelay/files/patch-Makefile
==============================================================================
--- head/databases/sqlrelay/files/patch-Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/sqlrelay/files/patch-Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,6 +1,6 @@
 --- Makefile.orig	2016-01-17 07:20:04 UTC
 +++ Makefile
-@@ -30,16 +30,13 @@ install-doc:
+@@ -30,9 +30,6 @@ install-doc:
  	cd doc $(AND) $(MAKE) install
  
  install-license:
@@ -9,19 +9,7 @@
 -	$(CHMOD) 0644 $(licensedir)/COPYING
  
  install-pkgconfig:
--	$(MKINSTALLDIRS) $(libdir)/pkgconfig
--	$(CP) sqlrelay-c.pc $(libdir)/pkgconfig/$(SQLRELAY)-c.pc
--	$(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c.pc
--	$(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc
--	$(CHMOD) 0644 $(libdir)/pkgconfig/$(SQLRELAY)-c++.pc
-+	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
-+	$(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
-+	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
-+	$(CP) sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
-+	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
- 
- uninstall: $(UNINSTALLSUBDIRS)
- 	$(RMTREE) $(libexecdir)
+ 	$(MKINSTALLDIRS) $(libdir)/pkgconfig
 @@ -63,7 +60,6 @@ uninstall-doc:
  	cd doc $(AND) $(MAKE) uninstall
  

Modified: head/databases/tokyocabinet/Makefile
==============================================================================
--- head/databases/tokyocabinet/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/tokyocabinet/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		pathfix gmake
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
@@ -66,11 +66,8 @@ SHLIB_VER_MAJ=	9
 
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ}
 
-# Because gnomehack will search "(libdir)" and it doesn't work, we need
-# to patch it manually.
 post-patch:
-	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
-		-e 's|@datarootdir@|@datarootdir@/doc|' \
+	${REINPLACE_CMD} -e 's|@datarootdir@|@datarootdir@/doc|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-FASTEST-on:

Modified: head/databases/tokyotyrant/Makefile
==============================================================================
--- head/databases/tokyotyrant/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/databases/tokyotyrant/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libtokyocabinet.so:database
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake pathfix
 USE_RC_SUBR=	ttserver
 
 OPTIONS_DEFINE=	LUA
@@ -29,11 +29,7 @@ LUA_CFLAGS+=	-I${LUA_INCDIR}
 LUA_CPPFLAGS+=	-I${LUA_INCDIR}
 LUA_USES=		lua
 
-# Since gnomehack only works for "(libdir)" case, we need to patch it
-# manually.
 post-patch:
-	${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g' ${WRKSRC}/configure
 
 post-install:

Modified: head/devel/babeltrace/Makefile
==============================================================================
--- head/devel/babeltrace/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/babeltrace/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 USE_GITHUB=	yes
 GH_ACCOUNT=	efficios
 
-USES=		autoreconf:build bison gettext-runtime gmake libtool pkgconfig
+USES=		autoreconf:build bison gettext-runtime gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug-info
 USE_GNOME=	glib20
@@ -41,8 +41,6 @@ BUILD_DEPENDS+=	flex>=2.5.35:textproc/fl
 post-patch:
 	@${REINPLACE_CMD} -e 's|LICENSE mit-license.txt gpl-2.0.txt||' \
 		${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|/pkgconfig|/../libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|machine\/endian|sys\/endian|' \
 		${WRKSRC}/include/babeltrace/endian.h
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033

Modified: head/devel/c-unit/Makefile
==============================================================================
--- head/devel/c-unit/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/c-unit/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -24,8 +24,6 @@ INSTALL_TARGET=	install-strip
 DATADIR=	${PREFIX}/share/CUnit
 EXAMPLESDIR=	${PREFIX}/share/examples/CUnit
 
-PATHFIX_MAKEFILEIN=	Makefile.am
-
 OPTIONS_DEFINE=		AUT BAS CON CUR DEB EXA ITE MEM
 OPTIONS_DEFAULT=	AUT BAS CON
 OPTIONS_SUB=		yes

Modified: head/devel/cld/Makefile
==============================================================================
--- head/devel/cld/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/cld/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,7 @@ COMMENT=	Chromium compact language detec
 
 BROKEN=		Unfetchable (google code has gone away)
 
-USES=		libtool
+USES=		libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/devel/compiz-bcop/Makefile
==============================================================================
--- head/devel/compiz-bcop/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/compiz-bcop/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/bash:shell
 
 GNU_CONFIGURE=	yes
 
-USES=		pkgconfig tar:bzip2
+USES=		pathfix pkgconfig tar:bzip2
 USE_GNOME=	libxslt
 
 post-patch:
@@ -23,8 +23,5 @@ post-patch:
 		-e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
 		-e 's|getopt|${LOCALBASE}/bin/getopt|' \
 		${WRKSRC}/src/bcop.in
-	@${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>

Modified: head/devel/cpputest/Makefile
==============================================================================
--- head/devel/cpputest/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/cpputest/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 
-USES=		autoreconf libtool
+USES=		autoreconf libtool pathfix
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>

Modified: head/devel/cunit/Makefile
==============================================================================
--- head/devel/cunit/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/cunit/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -40,8 +40,6 @@ PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-PATHFIX_MAKEFILEIN=	Makefile.am
-
 AUTOMATED_CONFIGURE_ENABLE=	automated
 BASIC_CONFIGURE_ENABLE=	basic
 CONSOLE_CONFIGURE_ENABLE=	console

Modified: head/devel/dbus-c++/Makefile
==============================================================================
--- head/devel/dbus-c++/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/dbus-c++/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	andreas-volz
 GH_PROJECT=	dbus-cplusplus
 
-USES=		autoreconf compiler:c++11-lib gettext gmake libtool localbase pkgconfig
+USES=		autoreconf compiler:c++11-lib gettext gmake libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
@@ -32,9 +32,6 @@ CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
 		--disable-examples \
 		--disable-doxygen-docs
 
-post-patch:
-	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir=$${prefix}/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbus-c++-1.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbus-c++-glib-1.so

Modified: head/devel/ding-libs/Makefile
==============================================================================
--- head/devel/ding-libs/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/ding-libs/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lintl
 
-USES=		autoreconf iconv gettext libtool pkgconfig
+USES=		autoreconf iconv gettext libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -26,7 +26,6 @@ CONFIGURE_ENV+=	DOXYGEN=""
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/collection/collection_tools.c \
 		${WRKSRC}/refarray/ref_array.c
 	@${REINPLACE_CMD} -e 's|git log -1 &>/dev/null|true|g' \

Modified: head/devel/editline/Makefile
==============================================================================
--- head/devel/editline/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/editline/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -9,7 +9,7 @@ COMMENT=	Minix editline: A free readline
 
 LICENSE=	BSD4CLAUSE
 
-USES=		autoreconf libtool ncurses
+USES=		autoreconf libtool ncurses pathfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	troglobit
 
@@ -20,8 +20,6 @@ INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
 post-patch:
-	${REINPLACE_CMD} '/^pkgconfigdir/s|=.*|= ${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.am
 	# rename to libeditline.3 to avoid conflict with libedit
 	${REINPLACE_CMD} 's|editline.3|lib&|' ${WRKSRC}/man/Makefile.am
 	cd ${WRKSRC}/man; ${MV} editline.3 libeditline.3

Modified: head/devel/efl/Makefile
==============================================================================
--- head/devel/efl/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/efl/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -152,11 +152,6 @@ LIB_DEPENDS+=			libluajit-5.1.so:lang/lu
 PLIST_SUB+=			ELUA=""
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.am
-
 post-stage:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
 	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \

Modified: head/devel/flatzebra/Makefile
==============================================================================
--- head/devel/flatzebra/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/flatzebra/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -13,7 +13,7 @@ COMMENT=	Generic game engine for 2D doub
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include
 
-USES=		pkgconfig libtool
+USES=		pathfix pkgconfig libtool
 USE_SDL=	sdl mixer image
 
 USE_LDCONFIG=	yes

Modified: head/devel/google-gdata/Makefile
==============================================================================
--- head/devel/google-gdata/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/google-gdata/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgc
 USE_GITHUB=	yes
 GH_TUPLE=	google:google-gdata:edcd096379
 
-USES=		dos2unix gmake mono
+USES=		dos2unix gmake mono pathfix
+PATHFIX_MAKEFILEIN=	Makefile
 WRKSRC_SUBDIR=	clients/cs
 DOS2UNIX_FILES=	${WRKSRC}/Makefile ${WRKSRC}/misc/gdata-sharp-core.pc.in
 MAKE_ARGS=	CSC=${LOCALBASE}/bin/mcs

Modified: head/devel/google-gdata/files/patch-Makefile
==============================================================================
--- head/devel/google-gdata/files/patch-Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/google-gdata/files/patch-Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,14 +1,5 @@
 --- Makefile.orig	2016-10-16 13:47:41 UTC
 +++ Makefile
-@@ -5,7 +5,7 @@ DEFINES=/d:TRACE
- 
- VERSION=$(shell egrep AssemblyVersion version/AssemblyVersion.cs | egrep -o \([[:digit:]]\.\)+[[:digit:]]+)
- PREFIX=/usr/local
--PKGCONFIGDIR = $(PREFIX)/lib/pkgconfig
-+PKGCONFIGDIR = $(PREFIX)/libdata/pkgconfig
- 
- CORELIBS= \
-   Google.GData.Client.dll \
 @@ -33,7 +33,7 @@ ALLLIBS = \
  
  UNINSTALLLIBS = $(basename $(ALLLIBS))

Modified: head/devel/gumbo/Makefile
==============================================================================
--- head/devel/gumbo/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/gumbo/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -18,7 +18,6 @@ USES=		autoreconf gmake pathfix libtool
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-PATHFIX_MAKEFILEIN=Makefile.am
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgumbo.so.1.0.0

Modified: head/devel/hyperscan/Makefile
==============================================================================
--- head/devel/hyperscan/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/hyperscan/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	ragel:devel/ragel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
-USES=	compiler:c++11-lib cmake:outsource python:build pkgconfig
+USES=	compiler:c++11-lib cmake:outsource pathfix python:build pkgconfig
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	SSSE3 is required for work
 
@@ -52,9 +52,4 @@ PLIST_SUB+=	SHARED="" \
 PLIST_SUB+=	SHARED="@comment "
 .endif
 
-post-stage:
-	${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/libhs.pc \
-		${STAGEDIR}/${PREFIX}/libdata/pkgconfig/
-	${RMDIR} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/
-
 .include <bsd.port.mk>

Modified: head/devel/isl/Makefile
==============================================================================
--- head/devel/isl/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/isl/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,10 +17,8 @@ LIB_DEPENDS=	libgmp.so:math/gmp
 CONFIGURE_ARGS=	--with-gmp-prefix=${LOCALBASE}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool tar:xz
+USES=		libtool pathfix tar:xz
+PATHFIX_MAKEFILEIN=	configure
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's@pkgconfig_libdir=.*@pkgconfig_libdir=$${prefix}/libdata/pkgconfig@' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/devel/ivykis/Makefile
==============================================================================
--- head/devel/ivykis/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/ivykis/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -10,7 +10,7 @@ COMMENT=	Asynchronous I/O readiness noti
 
 LICENSE=	LGPL21
 
-USES=		libtool pkgconfig
+USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
@@ -18,9 +18,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	buytenh
 
 post-stage:
-	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/ivykis.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ivykis.pc
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libivykis.so.0.4.2
 
 .include <bsd.port.mk>

Modified: head/devel/lasi/Makefile
==============================================================================
--- head/devel/lasi/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/lasi/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,8 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		cmake pkgconfig
+USES=		cmake pathfix pkgconfig
+PATHFIX_CMAKELISTSTXT=	pkg-config.cmake
 USE_GNOME=	pango
 PKG_CONFIG_PATH=	${PREFIX}/libdata/pkgconfig
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${PKG_CONFIG_PATH}

Modified: head/devel/liballium/Makefile
==============================================================================
--- head/devel/liballium/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/liballium/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -14,7 +14,6 @@ GH_TAGNAME=	0c9b50f
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN=Makefile.am
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 

Modified: head/devel/libbrotli/Makefile
==============================================================================
--- head/devel/libbrotli/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libbrotli/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -21,7 +21,7 @@ GH_PROJECT=	brotli:brotli
 GH_TAGNAME=	${BROTLI_VERSION}:brotli
 GH_SUBDIR=	brotli:brotli
 
-USES=		pkgconfig autoreconf libtool compiler:c++0x
+USES=		pkgconfig autoreconf libtool compiler:c++0x pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}

Modified: head/devel/libcfu/Makefile
==============================================================================
--- head/devel/libcfu/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libcfu/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -15,7 +15,6 @@ GH_ACCOUNT=	crees
 GH_TAGNAME=	947dba4
 
 USES=		autoreconf makeinfo pkgconfig pathfix libtool
-PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALL_TARGET=	install-strip
 
 GNU_CONFIGURE=	yes

Modified: head/devel/libdlna/Makefile
==============================================================================
--- head/devel/libdlna/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libdlna/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -17,7 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 HAS_CONFIGURE=	yes
-USES=		gmake localbase pkgconfig tar:bzip2
+USES=		gmake localbase pathfix pkgconfig tar:bzip2
+PATHFIX_MAKEFILEIN=	Makefile
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/devel/libdlna/files/patch-Makefile
==============================================================================
--- head/devel/libdlna/files/patch-Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libdlna/files/patch-Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -1,14 +1,5 @@
 --- Makefile.orig	2007-11-26 20:47:43 UTC
 +++ Makefile
-@@ -4,7 +4,7 @@ endif
- include config.mak
- 
- DISTFILE = libdlna-$(VERSION).tar.bz2
--PKGCONFIG_DIR = $(libdir)/pkgconfig
-+PKGCONFIG_DIR = $(prefix)/libdata/pkgconfig
- PKGCONFIG_FILE = libdlna.pc
- 
- LIBTEST = test-libdlna
 @@ -19,7 +19,7 @@ EXTRADIST = AUTHORS \
  SUBDIRS = src \
  

Modified: head/devel/libee/Makefile
==============================================================================
--- head/devel/libee/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libee/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -16,7 +16,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 USE_LDCONFIG=	yes
 
-USES=		libtool
+USES=		libtool pathfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBESTR_CFLAGS="-I${LOCALBASE}/include" LIBESTR_LIBS="-L${LOCALBASE}/lib -lestr"
 CONFIGURE_ARGS+=	--prefix="${PREFIX}" --disable-testbench

Modified: head/devel/libelf/Makefile
==============================================================================
--- head/devel/libelf/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libelf/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -22,7 +22,7 @@ SANITY_DESC=	Avoid loading invalid ELF f
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared --disable-compat
 USE_LDCONFIG=	yes
-USES=		desthack
+USES=		desthack pathfix
 
 .if ${PORT_OPTIONS:MNLS}
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/devel/libestr/Makefile
==============================================================================
--- head/devel/libestr/Makefile	Fri Oct 21 15:19:57 2016	(r424426)
+++ head/devel/libestr/Makefile	Fri Oct 21 15:21:13 2016	(r424427)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://libestr.adiscon.com
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Library for some string essentials
 
-USES=		libtool
+USES=		libtool pathfix

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610211521.u9LFLDdD040363>