Page MenuHomeFreeBSD

D8093.id21248.diff
No OneTemporary

D8093.id21248.diff

Index: Mk/Uses/pathfix.mk
===================================================================
--- Mk/Uses/pathfix.mk
+++ Mk/Uses/pathfix.mk
@@ -17,7 +17,11 @@
.endif
PATHFIX_CMAKELISTSTXT?= CMakeLists.txt
+.if ${USES:Mautoreconf*}
+PATHFIX_MAKEFILEIN?= Makefile.am
+.else
PATHFIX_MAKEFILEIN?= Makefile.in
+.endif
PATHFIX_WRKSRC?= ${WRKSRC}
_USES_patch+= 190:pathfix
@@ -39,10 +43,14 @@
's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
+ s|@libdir@/locale|@prefix@/share/locale|g ; \
+ s|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g ; \
s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+ s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+ s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
.endif
Index: archivers/lhasa/Makefile
===================================================================
--- archivers/lhasa/Makefile
+++ archivers/lhasa/Makefile
@@ -14,7 +14,6 @@
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf pathfix libtool
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --program-suffix=sa
Index: archivers/liblz4/Makefile
===================================================================
--- archivers/liblz4/Makefile
+++ archivers/liblz4/Makefile
@@ -16,20 +16,19 @@
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.*||' \
Index: archivers/minizip/Makefile
===================================================================
--- archivers/minizip/Makefile
+++ archivers/minizip/Makefile
@@ -14,7 +14,6 @@
LICENSE= ZLIB
USES= autoreconf libtool pathfix tar:xz
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-demos
INSTALL_TARGET= install-strip
Index: archivers/unadf/Makefile
===================================================================
--- archivers/unadf/Makefile
+++ archivers/unadf/Makefile
@@ -18,7 +18,6 @@
CONFIGURE_ARGS= --includedir=${PREFIX}/include/adflib
INSTALL_TARGET= install-strip
USES= autoreconf libtool pathfix tar:bzip2
-PATHFIX_MAKEFILEIN= Makefile.am
OPTIONS_DEFINE= DOCS
Index: audio/libaacplus/Makefile
===================================================================
--- audio/libaacplus/Makefile
+++ audio/libaacplus/Makefile
@@ -28,7 +28,6 @@
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
Index: audio/libadplug/Makefile
===================================================================
--- audio/libadplug/Makefile
+++ audio/libadplug/Makefile
@@ -15,7 +15,7 @@
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 @@
${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>
Index: audio/libmikmod/Makefile
===================================================================
--- audio/libmikmod/Makefile
+++ audio/libmikmod/Makefile
@@ -11,7 +11,7 @@
LICENSE= LGPL21
-USES= cpe gmake libtool pkgconfig
+USES= cpe gmake libtool pathfix pkgconfig
CPE_VENDOR= raphael_assenat
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-esd
Index: audio/libmikmod/files/patch-Makefile.in
===================================================================
--- audio/libmikmod/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-11-11 10:02:02 UTC
-+++ Makefile.in
-@@ -372,7 +372,7 @@ EXTRA_DIST = libmikmod-config.in libmikm
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libmikmod.m4
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libmikmod.pc
- ACLOCAL_AMFLAGS = -I m4
-
Index: audio/libtremor/Makefile
===================================================================
--- audio/libtremor/Makefile
+++ audio/libtremor/Makefile
@@ -16,7 +16,6 @@
GIT_COMMIT= b56ffc
USES= autoreconf libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Index: audio/libxmp/Makefile
===================================================================
--- audio/libxmp/Makefile
+++ audio/libxmp/Makefile
@@ -9,7 +9,7 @@
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Module rendering library for xmp
-USES= gmake
+USES= gmake pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: audio/libxmp/files/patch-Makefile.in
===================================================================
--- audio/libxmp/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig 2016-07-16 11:29:48 UTC
-+++ Makefile.in
-@@ -146,8 +146,8 @@ install: all
- @echo "Installing xmp.h..."
- @$(INSTALL) -m644 include/xmp.h $(DESTDIR)$(INCLUDEDIR)
- @echo "Installing libxmp.pc..."
-- @mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-- @$(INSTALL) -m644 libxmp.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ @mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
-+ @$(INSTALL) -m644 libxmp.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
-
- depend:
- @echo Building dependencies...
Index: audio/opusfile/Makefile
===================================================================
--- audio/opusfile/Makefile
+++ audio/opusfile/Makefile
@@ -19,7 +19,6 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
PORTDOCS= AUTHORS README.txt
Index: audio/rubberband/Makefile
===================================================================
--- audio/rubberband/Makefile
+++ audio/rubberband/Makefile
@@ -19,7 +19,7 @@
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
Index: audio/rubberband/files/patch-Makefile.in
===================================================================
--- audio/rubberband/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2012-10-28 10:30:09 UTC
-+++ Makefile.in
-@@ -32,7 +32,7 @@ INSTALL_LIBDIR := @prefix@/lib
- INSTALL_VAMPDIR := @prefix@/lib/vamp
- INSTALL_LADSPADIR := @prefix@/lib/ladspa
- INSTALL_LRDFDIR := @prefix@/share/ladspa/rdf
--INSTALL_PKGDIR := @prefix@/lib/pkgconfig
-+INSTALL_PKGDIR := @prefix@/libdata/pkgconfig
-
- all: bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
-
Index: audio/shout-idjc/Makefile
===================================================================
--- audio/shout-idjc/Makefile
+++ audio/shout-idjc/Makefile
@@ -20,7 +20,6 @@
GNU_CONFIGURE= yes
USES= libtool pathfix pkgconfig autoreconf
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS
Index: audio/soundtouch/Makefile
===================================================================
--- audio/soundtouch/Makefile
+++ audio/soundtouch/Makefile
@@ -17,7 +17,6 @@
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/}
Index: audio/vamp-plugin-sdk/Makefile
===================================================================
--- audio/vamp-plugin-sdk/Makefile
+++ audio/vamp-plugin-sdk/Makefile
@@ -15,7 +15,7 @@
LIB_DEPENDS= libsndfile.so:audio/libsndfile
GNU_CONFIGURE= yes
-USES= gmake pkgconfig
+USES= gmake pathfix pkgconfig
USE_LDCONFIG= yes
post-install:
Index: audio/vamp-plugin-sdk/files/patch-Makefile.in
===================================================================
--- audio/vamp-plugin-sdk/files/patch-Makefile.in
+++ audio/vamp-plugin-sdk/files/patch-Makefile.in
@@ -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
#
Index: biology/htslib/Makefile
===================================================================
--- biology/htslib/Makefile
+++ biology/htslib/Makefile
@@ -17,10 +17,11 @@
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
Index: biology/htslib/files/patch-Makefile
===================================================================
--- biology/htslib/files/patch-Makefile
+++ biology/htslib/files/patch-Makefile
@@ -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
Index: biology/jellyfish/Makefile
===================================================================
--- biology/jellyfish/Makefile
+++ biology/jellyfish/Makefile
@@ -17,7 +17,7 @@
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 @@
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>
Index: biology/libgtextutils/Makefile
===================================================================
--- biology/libgtextutils/Makefile
+++ biology/libgtextutils/Makefile
@@ -10,7 +10,7 @@
LICENSE= AGPLv3
-USES= autoreconf libtool pkgconfig
+USES= autoreconf libtool pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -19,9 +19,4 @@
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} \
- 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.am
-
.include <bsd.port.mk>
Index: chinese/librime/Makefile
===================================================================
--- chinese/librime/Makefile
+++ chinese/librime/Makefile
@@ -19,7 +19,7 @@
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
Index: chinese/librime/files/patch-CMakeLists.txt
===================================================================
--- chinese/librime/files/patch-CMakeLists.txt
+++ chinese/librime/files/patch-CMakeLists.txt
@@ -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})
Index: chinese/pyzy/Makefile
===================================================================
--- chinese/pyzy/Makefile
+++ chinese/pyzy/Makefile
@@ -18,7 +18,7 @@
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 @@
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
Index: comms/hamlib/Makefile
===================================================================
--- comms/hamlib/Makefile
+++ comms/hamlib/Makefile
@@ -15,7 +15,7 @@
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
Index: comms/hamlib/files/patch-Makefile.am
===================================================================
--- comms/hamlib/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2015-09-19 12:08:54 UTC
-+++ Makefile.am
-@@ -3,7 +3,7 @@
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = hamlib.m4
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = hamlib.pc
-
- EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
Index: comms/libirman/Makefile
===================================================================
--- comms/libirman/Makefile
+++ comms/libirman/Makefile
@@ -11,7 +11,7 @@
LICENSE= LGPL20
-USES= gmake libtool tar:bzip2
+USES= gmake libtool pathfix tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: comms/libirman/files/patch-Makefile.in
===================================================================
--- comms/libirman/files/patch-Makefile.in
+++ comms/libirman/files/patch-Makefile.in
@@ -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 \
Index: comms/rtl-sdr/Makefile
===================================================================
--- comms/rtl-sdr/Makefile
+++ comms/rtl-sdr/Makefile
@@ -13,7 +13,7 @@
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 @@
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>
Index: comms/unixcw/Makefile
===================================================================
--- comms/unixcw/Makefile
+++ comms/unixcw/Makefile
@@ -24,7 +24,7 @@
--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
Index: comms/unixcw/files/patch-src_libcw_Makefile.in
===================================================================
--- comms/unixcw/files/patch-src_libcw_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libcw/Makefile.in.orig 2015-10-06 17:17:18 UTC
-+++ src/libcw/Makefile.in
-@@ -676,7 +676,7 @@ libcw_test_internal_LDADD = -lm -lpthrea
- libcw_test_internal_CFLAGS = -rdynamic
-
- # target: libcw.pc
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
-
- # CLEANFILES extends list of files that need to be removed when
- # calling "make clean"
Index: databases/akonadi/Makefile
===================================================================
--- databases/akonadi/Makefile
+++ databases/akonadi/Makefile
@@ -17,7 +17,7 @@
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 @@
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}|' \
Index: databases/libdrizzle/Makefile
===================================================================
--- databases/libdrizzle/Makefile
+++ databases/libdrizzle/Makefile
@@ -18,7 +18,7 @@
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
Index: databases/libdrizzle/files/patch-Makefile.in
===================================================================
--- databases/libdrizzle/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.in.orig 2010-03-12 12:09:51.000000000 -0500
-+++ ./Makefile.in 2010-03-12 12:10:03.000000000 -0500
-@@ -526,7 +526,7 @@
- docs/doxygen.h \
- tests/run.sh
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = support/libdrizzle.pc
- TESTS_ENVIRONMENT = ${top_srcdir}/tests/run.sh
- TESTS = $(check_PROGRAMS)
Index: databases/libmongo-client/Makefile
===================================================================
--- databases/libmongo-client/Makefile
+++ databases/libmongo-client/Makefile
@@ -19,6 +19,5 @@
USES= autoreconf libtool pkgconfig gmake pathfix
USE_GNOME= glib20
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN=Makefile.am
.include <bsd.port.mk>
Index: databases/mdbtools/Makefile
===================================================================
--- databases/mdbtools/Makefile
+++ databases/mdbtools/Makefile
@@ -22,7 +22,6 @@
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
Index: databases/opendbx/Makefile
===================================================================
--- databases/opendbx/Makefile
+++ databases/opendbx/Makefile
@@ -12,7 +12,7 @@
LICENSE= LGPL21
-USES= gmake libtool readline
+USES= gmake libtool pathfix readline
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -lpthread -L${WRKSRC}/lib -L${LOCALBASE}/lib
Index: databases/opendbx/files/patch-Makefile.in
===================================================================
--- databases/opendbx/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.in.orig 2012-06-10 18:33:53.000000000 -0300
-+++ ./Makefile.in 2014-01-19 00:08:50.000000000 -0200
-@@ -308,7 +308,7 @@
- opendbx.spec \
- ABOUT-NLS
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
- pkgconfig_DATA = opendbx.pc opendbxplus.pc
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
Index: databases/postgresql-libpqxx/Makefile
===================================================================
--- databases/postgresql-libpqxx/Makefile
+++ databases/postgresql-libpqxx/Makefile
@@ -17,7 +17,7 @@
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}
Index: databases/postgresql-libpqxx/files/patch-Makefile.in
===================================================================
--- databases/postgresql-libpqxx/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2011-09-12 11:39:56.000000000 +0200
-+++ Makefile.in 2011-09-12 11:40:48.000000000 +0200
-@@ -270,7 +270,7 @@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
- stamp-h.in
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libpqxx.pc
- bin_SCRIPTS = pqxx-config
- all: all-recursive
Index: databases/postgresql-libpqxx3/Makefile
===================================================================
--- databases/postgresql-libpqxx3/Makefile
+++ databases/postgresql-libpqxx3/Makefile
@@ -16,7 +16,7 @@
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}
Index: databases/postgresql-libpqxx3/files/patch-Makefile.in
===================================================================
--- databases/postgresql-libpqxx3/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2011-09-12 11:39:56.000000000 +0200
-+++ Makefile.in 2011-09-12 11:40:48.000000000 +0200
-@@ -270,7 +270,7 @@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
- stamp-h.in
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libpqxx.pc
- bin_SCRIPTS = pqxx-config
- all: all-recursive
Index: databases/sqlite2/Makefile
===================================================================
--- databases/sqlite2/Makefile
+++ databases/sqlite2/Makefile
@@ -11,7 +11,7 @@
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
Index: databases/sqlite2/files/patch-Makefile.in
===================================================================
--- databases/sqlite2/files/patch-Makefile.in
+++ databases/sqlite2/files/patch-Makefile.in
@@ -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
Index: databases/sqlrelay/Makefile
===================================================================
--- databases/sqlrelay/Makefile
+++ databases/sqlrelay/Makefile
@@ -14,7 +14,8 @@
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} \
Index: databases/sqlrelay/files/patch-Makefile
===================================================================
--- databases/sqlrelay/files/patch-Makefile
+++ databases/sqlrelay/files/patch-Makefile
@@ -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
Index: databases/tokyocabinet/Makefile
===================================================================
--- databases/tokyocabinet/Makefile
+++ databases/tokyocabinet/Makefile
@@ -14,7 +14,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-USES= gmake
+USES= pathfix gmake
USE_LDCONFIG= yes
PORTDOCS= *
@@ -66,11 +66,8 @@
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:
Index: databases/tokyotyrant/Makefile
===================================================================
--- databases/tokyotyrant/Makefile
+++ databases/tokyotyrant/Makefile
@@ -15,7 +15,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake
+USES= gmake pathfix
USE_RC_SUBR= ttserver
OPTIONS_DEFINE= LUA
@@ -29,11 +29,7 @@
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:
Index: devel/babeltrace/Makefile
===================================================================
--- devel/babeltrace/Makefile
+++ devel/babeltrace/Makefile
@@ -22,7 +22,7 @@
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 @@
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
Index: devel/c-unit/Makefile
===================================================================
--- devel/c-unit/Makefile
+++ devel/c-unit/Makefile
@@ -24,8 +24,6 @@
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
Index: devel/cld/Makefile
===================================================================
--- devel/cld/Makefile
+++ devel/cld/Makefile
@@ -14,7 +14,7 @@
BROKEN= Unfetchable (google code has gone away)
-USES= libtool
+USES= libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: devel/cld/files/patch-Makefile.in
===================================================================
--- devel/cld/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2012-05-23 14:35:00.000000000 +0400
-+++ Makefile.in 2013-02-08 15:37:27.000000000 +0400
-@@ -282,7 +282,7 @@
-
- # autogen.sh and cleanrepo.sh are script for maintainance use. Not for distribution.
- # dist_noinst_SCRIPTS = autogen.sh
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${exec_prefix}/libdata/pkgconfig
- pkgconfig_DATA = cld.pc
- basic_test_SOURCES = tests/basic_test.cc
- basic_test_CXXFLAGS = -Wall -fPIC -Isrc/ -I../src -O2 -DCLD_WINDOWS
Index: devel/codeblocks/files/patch-Makefile.am
===================================================================
--- devel/codeblocks/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2016-01-23 16:43:26 UTC
-+++ Makefile.am
-@@ -10,7 +10,7 @@ endif
-
- am__tar = @am__tar@ $(ADDITIONAL_MAKE_DIST_OPTIONS)
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = codeblocks.pc
-
- EXTRA_DIST = bootstrap \
Index: devel/codeblocks/files/patch-Makefile.in
===================================================================
--- devel/codeblocks/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2016-05-06 22:17:30 UTC
-+++ Makefile.in
-@@ -455,7 +455,7 @@ SUBDIRS = src
- ACLOCAL_AMFLAGS = -I m4
- @KEEP_DLLS_FALSE@ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn" --exclude="*.dll"
- @KEEP_DLLS_TRUE@ADDITIONAL_MAKE_DIST_OPTIONS = --exclude=".svn"
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = codeblocks.pc
- EXTRA_DIST = bootstrap \
- codeblocks.spec \
Index: devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/SpellChecker/hunspell/Makefile.am.orig 2016-05-06 22:18:30 UTC
-+++ src/plugins/contrib/SpellChecker/hunspell/Makefile.am
-@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS= intl po src man m4 tests
-
--pkgconfdir = $(libdir)/pkgconfig
-+pkgconfdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconf_DATA = hunspell.pc
-
- EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \
Index: devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_SpellChecker_hunspell_Makefile.in.org
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/SpellChecker/hunspell/Makefile.in.org.orig 2016-05-06 22:19:18 UTC
-+++ src/plugins/contrib/SpellChecker/hunspell/Makefile.in.org
-@@ -429,7 +429,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = intl po src man m4 tests
--pkgconfdir = $(libdir)/pkgconfig
-+pkgconfdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconf_DATA = hunspell.pc
- EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \
- ChangeLog.O COPYING.MPL COPYING.LGPL hunspell.pc.in
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/plugins/contrib/wxContribItems/Makefile.am.orig 2016-05-06 22:22:42 UTC
-+++ src/plugins/contrib/wxContribItems/Makefile.am
-@@ -9,5 +9,5 @@ SUBDIRS = wxchart wxFlatNotebook wxthing
-
- EXTRA_DIST = $(srcdir)/*.cbp $(TREELIST_DIST)
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmith-contrib.pc cb_wxcontrib.pc cb_wxchartctrl.pc cb_wxcustombutton.pc cb_wxflatnotebook.pc cb_wximagepanel.pc cb_wxspeedbutton.pc cb_wxKWIC.pc $(TREELIST_PC) cb_wxled.pc cb_wxmathplot.pc
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxContribItems_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/wxContribItems/Makefile.in.orig 2016-05-06 22:22:44 UTC
-+++ src/plugins/contrib/wxContribItems/Makefile.in
-@@ -444,7 +444,7 @@ top_srcdir = @top_srcdir@
- @HAVE_WX29_TRUE@TREELIST_DIST = $(srcdir)/wxTreeList/src/treelistctrl.cpp $(srcdir)/wxTreeList/include/wx/treelistctrl.h
- SUBDIRS = wxchart wxFlatNotebook wxthings wxImagePanel wxSpeedButton KWIC $(TREELIST_DIR) wxled wxmathplot .
- EXTRA_DIST = $(srcdir)/*.cbp $(TREELIST_DIST)
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmith-contrib.pc cb_wxcontrib.pc cb_wxchartctrl.pc cb_wxcustombutton.pc cb_wxflatnotebook.pc cb_wximagepanel.pc cb_wxspeedbutton.pc cb_wxKWIC.pc $(TREELIST_PC) cb_wxled.pc cb_wxmathplot.pc
- all: all-recursive
-
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/wxSmithAui/Makefile.am.orig 2016-05-06 22:24:09 UTC
-+++ src/plugins/contrib/wxSmithAui/Makefile.am
-@@ -45,7 +45,7 @@ libwxSmithAui_la_SOURCES = \
- ./wxAuiToolBar/wxSmithAuiToolBar.cpp \
- ./wxSmithAui.cpp
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmithaui.pc
-
- noinst_HEADERS = \
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxSmithAui_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/wxSmithAui/Makefile.in.orig 2016-05-06 22:24:06 UTC
-+++ src/plugins/contrib/wxSmithAui/Makefile.in
-@@ -478,7 +478,7 @@ libwxSmithAui_la_SOURCES = \
- ./wxAuiToolBar/wxSmithAuiToolBar.cpp \
- ./wxSmithAui.cpp
-
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmithaui.pc
- noinst_HEADERS = \
- ./wxAuiManager/wxsAuiManager.h \
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/wxSmith/Makefile.am.orig 2016-05-06 22:22:03 UTC
-+++ src/plugins/contrib/wxSmith/Makefile.am
-@@ -70,7 +70,7 @@ noinst_HEADERS = \
- ./wxsversionconverter.h \
- ./wxssettings.h
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmith.pc
-
- EXTRA_DIST = \
Index: devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in
===================================================================
--- devel/codeblocks/files/patch-src_plugins_contrib_wxSmith_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/contrib/wxSmith/Makefile.in.orig 2016-05-06 22:20:29 UTC
-+++ src/plugins/contrib/wxSmith/Makefile.in
-@@ -546,7 +546,7 @@ noinst_HEADERS = \
- ./wxsversionconverter.h \
- ./wxssettings.h
-
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- pkgconfig_DATA = wxsmith.pc
- EXTRA_DIST = \
- $(srcdir)/*.cbp \
Index: devel/compiz-bcop/Makefile
===================================================================
--- devel/compiz-bcop/Makefile
+++ devel/compiz-bcop/Makefile
@@ -15,7 +15,7 @@
GNU_CONFIGURE= yes
-USES= pkgconfig tar:bzip2
+USES= pathfix pkgconfig tar:bzip2
USE_GNOME= libxslt
post-patch:
@@ -23,8 +23,5 @@
-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>
Index: devel/cpputest/Makefile
===================================================================
--- devel/cpputest/Makefile
+++ devel/cpputest/Makefile
@@ -12,7 +12,7 @@
USE_GITHUB= yes
-USES= autoreconf libtool
+USES= autoreconf libtool pathfix
GNU_CONFIGURE= yes
.include <bsd.port.mk>
Index: devel/cpputest/files/patch-Makefile.am
===================================================================
--- devel/cpputest/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2015-05-04 05:36:02 UTC
-+++ Makefile.am
-@@ -21,7 +21,7 @@ endif
-
- TESTS = $(check_PROGRAMS)
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = cpputest.pc
-
- EXTRA_DIST = \
Index: devel/cunit/Makefile
===================================================================
--- devel/cunit/Makefile
+++ devel/cunit/Makefile
@@ -40,8 +40,6 @@
PORTDOCS= *
PORTEXAMPLES= *
-PATHFIX_MAKEFILEIN= Makefile.am
-
AUTOMATED_CONFIGURE_ENABLE= automated
BASIC_CONFIGURE_ENABLE= basic
CONSOLE_CONFIGURE_ENABLE= console
Index: devel/dbus-c++/Makefile
===================================================================
--- devel/dbus-c++/Makefile
+++ devel/dbus-c++/Makefile
@@ -20,7 +20,7 @@
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 @@
--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
Index: devel/ding-libs/Makefile
===================================================================
--- devel/ding-libs/Makefile
+++ devel/ding-libs/Makefile
@@ -17,7 +17,7 @@
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 @@
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' \
Index: devel/editline/Makefile
===================================================================
--- devel/editline/Makefile
+++ devel/editline/Makefile
@@ -9,7 +9,7 @@
LICENSE= BSD4CLAUSE
-USES= autoreconf libtool ncurses
+USES= autoreconf libtool ncurses pathfix
USE_GITHUB= yes
GH_ACCOUNT= troglobit
@@ -20,8 +20,6 @@
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
Index: devel/efl/Makefile
===================================================================
--- devel/efl/Makefile
+++ devel/efl/Makefile
@@ -152,11 +152,6 @@
PLIST_SUB+= ELUA=""
.endif
-pre-patch:
- @${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
-
post-stage:
${RM} -rf ${STAGEDIR}${PREFIX}/share/gdb
for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
Index: devel/flatzebra/Makefile
===================================================================
--- devel/flatzebra/Makefile
+++ devel/flatzebra/Makefile
@@ -13,7 +13,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include
-USES= pkgconfig libtool
+USES= pathfix pkgconfig libtool
USE_SDL= sdl mixer image
USE_LDCONFIG= yes
Index: devel/flatzebra/files/patch-Makefile.in
===================================================================
--- devel/flatzebra/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2009-08-21 08:55:05.575153056 +0000
-+++ Makefile.in 2009-08-21 08:56:07.604907117 +0000
-@@ -204,7 +204,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = $(PACKAGE)-$(API).pc
- doc_DATA = \
- AUTHORS \
Index: devel/google-gdata/Makefile
===================================================================
--- devel/google-gdata/Makefile
+++ devel/google-gdata/Makefile
@@ -16,7 +16,8 @@
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
-USES= dos2unix gmake mono
+USES= dos2unix gmake mono pathfix
+PATHFIX_MAKEFILEIN= Makefile
DOS2UNIX_FILES= Makefile misc/gdata-sharp-core.pc.in
MAKE_ARGS= CSC=${LOCALBASE}/bin/mcs
Index: devel/google-gdata/files/patch-Makefile
===================================================================
--- devel/google-gdata/files/patch-Makefile
+++ devel/google-gdata/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig 2014-10-03 03:48:04.991079598 +0600
-+++ Makefile 2014-10-03 03:48:20.722118155 +0600
-@@ -5,7 +5,7 @@
-
- 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 @@
+--- Makefile.orig 2016-09-30 14:59:09 UTC
++++ Makefile
+@@ -33,7 +33,7 @@ ALLLIBS = \
UNINSTALLLIBS = $(basename $(ALLLIBS))
@@ -18,7 +9,7 @@
PKGCONFIG_FILES = $(patsubst %.pc.in,%.pc,$(wildcard misc/*.pc.in))
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ clean:
install: all
for i in $(ALLLIBS); do gacutil -i $$i -package GData-Sharp -root "$(DESTDIR)$(PREFIX)/lib"; done
install -d "$(DESTDIR)$(PKGCONFIGDIR)"
Index: devel/gumbo/Makefile
===================================================================
--- devel/gumbo/Makefile
+++ devel/gumbo/Makefile
@@ -18,7 +18,6 @@
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
Index: devel/hyperscan/Makefile
===================================================================
--- devel/hyperscan/Makefile
+++ devel/hyperscan/Makefile
@@ -16,7 +16,7 @@
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="@comment "
.endif
-post-stage:
- ${MV} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/libhs.pc \
- ${STAGEDIR}/${PREFIX}/libdata/pkgconfig/
- ${RMDIR} ${STAGEDIR}/${PREFIX}/lib/pkgconfig/
-
.include <bsd.port.mk>
Index: devel/isl/Makefile
===================================================================
--- devel/isl/Makefile
+++ devel/isl/Makefile
@@ -17,10 +17,8 @@
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>
Index: devel/ivykis/Makefile
===================================================================
--- devel/ivykis/Makefile
+++ devel/ivykis/Makefile
@@ -10,7 +10,7 @@
LICENSE= LGPL21
-USES= libtool pkgconfig
+USES= libtool pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -18,9 +18,6 @@
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>
Index: devel/ivykis/files/patch-misc_Makefile.am
===================================================================
--- devel/ivykis/files/patch-misc_Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- misc/Makefile.am.orig 2015-10-17 19:07:02 UTC
-+++ misc/Makefile.am
-@@ -1,3 +1,3 @@
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdatadir)/pkgconfig
-
- pkgconfig_DATA = ivykis.pc
Index: devel/lasi/Makefile
===================================================================
--- devel/lasi/Makefile
+++ devel/lasi/Makefile
@@ -16,7 +16,8 @@
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}
Index: devel/lasi/files/patch-cmake+modules+pkg-config.cmake
===================================================================
--- devel/lasi/files/patch-cmake+modules+pkg-config.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/pkg-config.cmake.orig 2008-12-31 14:38:25.000000000 -0500
-+++ cmake/modules/pkg-config.cmake 2008-12-31 14:42:58.000000000 -0500
-@@ -6,7 +6,7 @@
- if(PKG_CONFIG_EXECUTABLE)
- message(STATUS "Looking for pkg-config - found")
- set(pkg_config_true "")
-- set(PKG_CONFIG_DIR ${libdir}/pkgconfig)
-+ set(PKG_CONFIG_DIR ${exec_prefix}/libdata/pkgconfig)
- else(PKG_CONFIG_EXECUTABLE)
- message(STATUS "Looking for pkg-config - not found")
- set(pkg_config_true "#")
Index: devel/liballium/Makefile
===================================================================
--- devel/liballium/Makefile
+++ devel/liballium/Makefile
@@ -14,7 +14,6 @@
GNU_CONFIGURE= yes
USES= autoreconf libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN=Makefile.am
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Index: devel/libbrotli/Makefile
===================================================================
--- devel/libbrotli/Makefile
+++ devel/libbrotli/Makefile
@@ -21,7 +21,7 @@
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}
Index: devel/libbrotli/files/patch-Makefile.am
===================================================================
--- devel/libbrotli/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2016-04-16 19:40:04.016418000 -0400
-+++ Makefile.am 2016-04-16 19:40:13.154082000 -0400
-@@ -41,7 +41,7 @@
- # install headers in $(includedir) with subdirs
- nobase_include_HEADERS = $(DECODEHEADERS) $(ENCODEHEADERS)
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)/../libdata/pkgconfig
- pkgconfig_DATA = libbrotlienc.pc libbrotlidec.pc
- pkgincludedir= $(includedir)/brotli
- pkginclude_HEADERS =
Index: devel/libcfu/Makefile
===================================================================
--- devel/libcfu/Makefile
+++ devel/libcfu/Makefile
@@ -15,7 +15,6 @@
GH_TAGNAME= 947dba4
USES= autoreconf makeinfo pkgconfig pathfix libtool
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
Index: devel/libdlna/Makefile
===================================================================
--- devel/libdlna/Makefile
+++ devel/libdlna/Makefile
@@ -17,7 +17,8 @@
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
Index: devel/libdlna/files/patch-Makefile
===================================================================
--- devel/libdlna/files/patch-Makefile
+++ devel/libdlna/files/patch-Makefile
@@ -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 \
Index: devel/libee/Makefile
===================================================================
--- devel/libee/Makefile
+++ devel/libee/Makefile
@@ -16,7 +16,7 @@
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
Index: devel/libee/files/patch-Makefile.in
===================================================================
--- devel/libee/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2011-06-20 14:08:32.835431092 -0500
-+++ Makefile.in 2011-06-20 14:08:56.609771691 -0500
-@@ -257,7 +257,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = tests include src
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libee.pc
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
Index: devel/libelf/Makefile
===================================================================
--- devel/libelf/Makefile
+++ devel/libelf/Makefile
@@ -22,7 +22,7 @@
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
Index: devel/libelf/files/patch-Makefile.in
===================================================================
--- devel/libelf/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix the pkgconfig data directory path.
-Forwarded: not-needed
-Author: Peter Pentchev <roam@FreeBSD.org>
-Last-Update: 2009-11-20
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -23,7 +23,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-
--pkgdir = $(libdir)/pkgconfig
-+pkgdir = $(prefix)/libdata/pkgconfig
-
- MV = mv -f
- RM = rm -f
Index: devel/libestr/Makefile
===================================================================
--- devel/libestr/Makefile
+++ devel/libestr/Makefile
@@ -10,7 +10,7 @@
MAINTAINER= matthew@FreeBSD.org
COMMENT= Library for some string essentials
-USES= libtool
+USES= libtool pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" \
Index: devel/libestr/files/patch-Makefile.in
===================================================================
--- devel/libestr/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in..orig 2011-06-20 13:31:12.833335470 -0500
-+++ Makefile.in 2011-06-20 13:31:27.073909538 -0500
-@@ -251,7 +251,7 @@
- top_builddir = .
- top_srcdir = .
- SUBDIRS = include src
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libestr.pc
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
Index: devel/libevent2/Makefile
===================================================================
--- devel/libevent2/Makefile
+++ devel/libevent2/Makefile
@@ -20,7 +20,6 @@
GNU_CONFIGURE= yes
USES= autoreconf libtool pathfix
-PATHFIX_MAKEFILEIN=Makefile.am
USE_LDCONFIG= yes
OPTIONS_DEFINE= OPENSSL THREADS
Index: devel/libfastjson/Makefile
===================================================================
--- devel/libfastjson/Makefile
+++ devel/libfastjson/Makefile
@@ -16,7 +16,6 @@
GNU_CONFIGURE= yes
USES= autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Index: devel/libfirm/Makefile
===================================================================
--- devel/libfirm/Makefile
+++ devel/libfirm/Makefile
@@ -14,7 +14,6 @@
LICENSE_COMB= multi
USES= autoreconf gmake libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Index: devel/libgit2/Makefile
===================================================================
--- devel/libgit2/Makefile
+++ devel/libgit2/Makefile
@@ -13,7 +13,7 @@
USE_GITHUB= yes
GH_ACCOUNT= libgit2
-USES= cmake pkgconfig python:build
+USES= cmake pathfix pkgconfig python:build
USE_LDCONFIG= yes
USE_OPENSSL= yes
@@ -38,8 +38,7 @@
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
- /LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
.if ${SSL_DEFAULT} == base
@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
${WRKSRC}/CMakeLists.txt
Index: devel/libhtp/Makefile
===================================================================
--- devel/libhtp/Makefile
+++ devel/libhtp/Makefile
@@ -22,8 +22,6 @@
MAKE_ARGS= LIBS="-lz ${ICONV_LIB}"
LDFLAGS+= -L${LOCALBASE}/lib
-PATHFIX_MAKEFILEIN= Makefile.am
-
INSTALL_TARGET= install-strip
TEST_TARGET= check
Index: devel/liblouis/Makefile
===================================================================
--- devel/liblouis/Makefile
+++ devel/liblouis/Makefile
@@ -17,7 +17,6 @@
USE_GITHUB= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Index: devel/libmowgli/Makefile
===================================================================
--- devel/libmowgli/Makefile
+++ devel/libmowgli/Makefile
@@ -14,12 +14,9 @@
GH_ACCOUNT= atheme-legacy
GH_TAGNAME= 5ab559e3af5b11767ada53d4401fb1c4443f3723
-USES= gmake tar:bzip2
+USES= gmake pathfix tar:bzip2
+PATHFIX_MAKEFILEIN= Makefile
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-post-patch:
- @${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile
-
.include <bsd.port.mk>
Index: devel/liboil/Makefile
===================================================================
--- devel/liboil/Makefile
+++ devel/liboil/Makefile
@@ -16,7 +16,8 @@
BROKEN_powerpc64= fails to compile vec_memcpy.S
-USES= libtool pkgconfig
+USES= libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN= configure
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
@@ -24,8 +25,4 @@
INSTALL_TARGET= install-strip
CFLAGS:= ${CFLAGS:N-O*} -O2
-post-patch:
- @${REINPLACE_CMD} -e 's|\\$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
Index: devel/libopkele/Makefile
===================================================================
--- devel/libopkele/Makefile
+++ devel/libopkele/Makefile
@@ -19,7 +19,7 @@
libxslt.so:textproc/libxslt
USE_LDCONFIG= yes
-USES= libtool gmake pkgconfig compiler:c++11-lang ssl
+USES= libtool gmake pathfix pkgconfig compiler:c++11-lang ssl
GNU_CONFIGURE= yes
CONFIGURE_ENV= "OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
OPENSSL_LIBS=-L${OPENSSLLIB}
@@ -33,10 +33,8 @@
# by design, we need to remove the openssl dependency
# in pkgconfig/libopkele.pc.
-post-patch:
- @ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
- ${WRKSRC}/Makefile.in
.if ${SSL_DEFAULT} == base
+post-patch:
@ ${REINPLACE_CMD} -e "s|Requires: openssl|Requires:|" ${WRKSRC}/libopkele.pc.in
.endif
Index: devel/libosmo-abis/Makefile
===================================================================
--- devel/libosmo-abis/Makefile
+++ devel/libosmo-abis/Makefile
@@ -17,7 +17,6 @@
libortp.so:net/ortp
USES= autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=Makefile.am
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Index: devel/libosmo-netif/Makefile
===================================================================
--- devel/libosmo-netif/Makefile
+++ devel/libosmo-netif/Makefile
@@ -21,7 +21,6 @@
BROKEN_sparc64= Does not build: undefined reference to __bswap_16
USES= autoreconf libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=Makefile.am
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Index: devel/libosmo-sccp/Makefile
===================================================================
--- devel/libosmo-sccp/Makefile
+++ devel/libosmo-sccp/Makefile
@@ -17,7 +17,6 @@
CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
USES= autoreconf gmake pathfix pkgconfig
-PATHFIX_MAKEFILEIN=Makefile.am
GNU_CONFIGURE= yes
post-patch:
Index: devel/libosmocore/Makefile
===================================================================
--- devel/libosmocore/Makefile
+++ devel/libosmocore/Makefile
@@ -15,7 +15,6 @@
LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite
USES= alias autoreconf execinfo gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=Makefile.am
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
USE_LDCONFIG= yes
Index: devel/libr3/Makefile
===================================================================
--- devel/libr3/Makefile
+++ devel/libr3/Makefile
@@ -16,15 +16,11 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-graphviz
-USES= autoreconf libtool pkgconfig
+USES= autoreconf libtool pathfix pkgconfig
INSTALL_TARGET= install-strip
USE_GITHUB= yes
GH_ACCOUNT= c9s
GH_PROJECT= r3
-post-patch:
- @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' \
- ${WRKSRC}/Makefile.am
-
.include <bsd.port.mk>
Index: devel/libsearpc/Makefile
===================================================================
--- devel/libsearpc/Makefile
+++ devel/libsearpc/Makefile
@@ -20,7 +20,6 @@
USES= autoreconf gettext libtool pathfix pkgconfig python:2
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
Index: devel/libsmpp34/Makefile
===================================================================
--- devel/libsmpp34/Makefile
+++ devel/libsmpp34/Makefile
@@ -14,7 +14,7 @@
LIB_DEPENDS= libxml2.so:textproc/libxml2
-USES= autoreconf libtool gmake
+USES= autoreconf libtool gmake pathfix
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
@@ -22,8 +22,6 @@
MAKE_JOBS_UNSAFE=yes
post-patch:
- ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
${REINPLACE_CMD} -e 's|AC_CONFIG_AUX_DIR.*|AC_CONFIG_AUX_DIR([.])|g' \
${WRKSRC}/configure.ac
${REINPLACE_CMD} -e 's|AM_CONFIG_HEADER.*|AM_CONFIG_HEADER([./config.h])|g' \
Index: devel/libtermkey/Makefile
===================================================================
--- devel/libtermkey/Makefile
+++ devel/libtermkey/Makefile
@@ -11,14 +11,12 @@
LICENSE= MIT
-USES= gmake libtool:build ncurses pkgconfig
+USES= gmake libtool:build ncurses pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
LIB_DEPENDS= libunibilium.so:devel/unibilium
USE_LDCONFIG= yes
MAKE_ARGS= MANDIR=${MANPREFIX}/man
-post-patch:
- ${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile
-
post-stage:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtermkey.so.1.12.0
Index: devel/libunwind/Makefile
===================================================================
--- devel/libunwind/Makefile
+++ devel/libunwind/Makefile
@@ -17,7 +17,6 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
USES= autoreconf libtool pathfix pkgconfig
Index: devel/libuv/Makefile
===================================================================
--- devel/libuv/Makefile
+++ devel/libuv/Makefile
@@ -20,7 +20,6 @@
USES= autoreconf libtool pathfix pkgconfig
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Index: devel/libxs/Makefile
===================================================================
--- devel/libxs/Makefile
+++ devel/libxs/Makefile
@@ -18,8 +18,6 @@
GH_ACCOUNT= crossroads-io
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
-
OPTIONS_DEFINE= DEBUG DOCS PLUGINS ZMQ
EXTERNAL_DESC= PGM extension from ports
INTERNAL_DESC= PGM extension
Index: devel/lightning/Makefile
===================================================================
--- devel/lightning/Makefile
+++ devel/lightning/Makefile
@@ -12,7 +12,7 @@
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
-USES= libtool
+USES= libtool pathfix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-disassembler=no
INSTALL_TARGET= install-strip
Index: devel/lightning/files/patch-Makefile.in
===================================================================
--- devel/lightning/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-02-08 17:45:49.524068441 +0600
-+++ Makefile.in 2015-02-08 17:49:09.021055899 +0600
-@@ -407,7 +407,7 @@
- include \
- lib
-
--pkgconfiglibdir = $(libdir)/pkgconfig
-+pkgconfiglibdir = $(prefix)/libdata/pkgconfig
- pkgconfiglib_DATA = lightning.pc
- @get_jit_size_TRUE@JIT_SIZE_PATH = "$(top_builddir)/jit_$(cpu)-sz.c"
- @get_jit_size_TRUE@AM_CPPFLAGS = -DGET_JIT_SIZE=1 -DJIT_SIZE_PATH='$(JIT_SIZE_PATH)'
Index: devel/m17n-db/Makefile
===================================================================
--- devel/m17n-db/Makefile
+++ devel/m17n-db/Makefile
@@ -35,8 +35,6 @@
cd ${WRKSRC}; ${TAR} xjf ${DISTDIR}/${GLIBC_DISTFILE} ${CHARMAPSDIR}
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$${datadir}/pkgconfig|$${prefix}/libdata/pkgconfig|g'
@${REINPLACE_CMD} -E 's|(m17n_scriptdir = ).*|\1${PREFIX}/bin|' \
${WRKSRC}/Makefile.in
Index: devel/m17n-lib/Makefile
===================================================================
--- devel/m17n-lib/Makefile
+++ devel/m17n-lib/Makefile
@@ -21,7 +21,7 @@
MAKE_JOBS_UNSAFE= yes
-USES= autoreconf gettext-tools libtool pkgconfig
+USES= autoreconf gettext-tools libtool pathfix pkgconfig
USE_XORG= ice sm x11 xaw xft xt
USE_GNOME= libxml2
USE_LDCONFIG= yes
@@ -47,8 +47,6 @@
THAI_CONFIGURE_OFF= --without-libthai
post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|libdir}/pkgconfig|prefix}/libdata/pkgconfig|g ; \
- s|-ldl||g'
+ @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e 's|-ldl||g'
.include <bsd.port.mk>
Index: devel/marisa-trie/Makefile
===================================================================
--- devel/marisa-trie/Makefile
+++ devel/marisa-trie/Makefile
@@ -19,7 +19,7 @@
GH_PROJECT= marisa-trie
GH_TAGNAME= 961ed33
-USES= autoreconf libtool:build
+USES= autoreconf libtool:build pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Index: devel/marisa-trie/files/patch-Makefile.am
===================================================================
--- devel/marisa-trie/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2016-07-03 09:34:09 UTC
-+++ Makefile.am
-@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = include lib tools tests
-
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
- pkgconfig_DATA = marisa.pc
-
- EXTRA_DIST = \
Index: devel/msgpack/Makefile
===================================================================
--- devel/msgpack/Makefile
+++ devel/msgpack/Makefile
@@ -13,7 +13,7 @@
USE_GITHUB= yes
GH_PROJECT= msgpack-c
-USES= libtool:build autoreconf:build
+USES= libtool:build autoreconf:build pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: devel/msgpack/files/patch-Makefile.am
===================================================================
--- devel/msgpack/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2016-05-27 09:08:08 UTC
-+++ Makefile.am
-@@ -11,7 +11,7 @@ DOC_FILES = \
- EXTRA_DIST = \
- $(DOC_FILES) CMakeLists.txt test/CMakeLists.txt example
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = msgpack.pc
-
- doxygen:
Index: devel/ois/Makefile
===================================================================
--- devel/ois/Makefile
+++ devel/ois/Makefile
@@ -16,7 +16,6 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= autoreconf gmake libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
USE_XORG= x11 xaw
USE_LDCONFIG= yes
Index: devel/oniguruma5/Makefile
===================================================================
--- devel/oniguruma5/Makefile
+++ devel/oniguruma5/Makefile
@@ -24,7 +24,6 @@
GH_ACCOUNT= kkos
USES= pathfix autoreconf libtool
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Index: devel/opendht/Makefile
===================================================================
--- devel/opendht/Makefile
+++ devel/opendht/Makefile
@@ -23,13 +23,11 @@
CONFIGURE_ARGS+=--disable-python
USE_LDCONFIG= yes
-USES= autoreconf compiler:c++11-lib libtool pkgconfig
+USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig
CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -I${LOCALBASE}/include
post-stage:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/opendht.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
- @${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendht.so.0.0.0
.include <bsd.port.mk>
Index: devel/orc/Makefile
===================================================================
--- devel/orc/Makefile
+++ devel/orc/Makefile
@@ -13,7 +13,8 @@
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake libtool pkgconfig tar:xz
+USES= gmake libtool pathfix pkgconfig tar:xz
+PATHFIX_MAKEFILEIN= configure
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--disable-gtk-doc
@@ -42,7 +43,6 @@
post-patch:
@${REINPLACE_CMD} \
-E -e '/LIBS/s/-lrt(\ )*//; /LIBRT/s/-lrt//' \
- -e 's|pkgconfigdir=.*|pkgconfigdir=\"\\$$(prefix)/libdata/pkgconfig\"|g' \
${WRKSRC}/configure
post-install:
Index: devel/papi/Makefile
===================================================================
--- devel/papi/Makefile
+++ devel/papi/Makefile
@@ -23,7 +23,8 @@
STRIP= # empty
USE_LDCONFIG= yes
LIB_DEPENDS+= libopa.so:net/mpich2
-USES= fortran gmake pkgconfig
+USES= fortran gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile.inc
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
WRKMAN= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
Index: devel/papi/files/patch-Makefile.inc
===================================================================
--- devel/papi/files/patch-Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.inc.orig 2015-12-09 12:02:38 UTC
-+++ Makefile.inc
-@@ -18,7 +18,7 @@ HEADERS = $(MISCHDRS) $(OSFILESHDR) pa
- LIBCFLAGS += -I. $(CFLAGS) -DOSLOCK=\"$(OSLOCK)\" -DOSCONTEXT=\"$(OSCONTEXT)\"
- FHEADERS = fpapi.h f77papi.h f90papi.h
- # pkgconfig directory
--LIBPC = $(LIBDIR)/pkgconfig
-+LIBPC = $(prefix)/libdata/pkgconfig
-
- all: $(SHOW_CONF) $(LIBS) utils tests cuda_sampling
- .PHONY : all test fulltest tests testlib utils ctests ftests comp_tests null
Index: devel/protobuf/Makefile
===================================================================
--- devel/protobuf/Makefile
+++ devel/protobuf/Makefile
@@ -15,7 +15,6 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
ONLY_FOR_ARCHS= amd64 armv6 i386
-PATHFIX_MAKEFILEIN= Makefile.am
TEST_TARGET= check
USE_CSTD= c99 # for audio/clementine-player support
USE_LDCONFIG= yes
Index: devel/ptlib/Makefile
===================================================================
--- devel/ptlib/Makefile
+++ devel/ptlib/Makefile
@@ -15,7 +15,8 @@
CONFLICTS= pwlib-1.*
-USES= autoreconf:build bison gmake pkgconfig ssl tar:xz
+USES= autoreconf:build bison gmake pathfix pkgconfig ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.in
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include
Index: devel/ptlib/files/patch-Makefile.in
===================================================================
--- devel/ptlib/files/patch-Makefile.in
+++ devel/ptlib/files/patch-Makefile.in
@@ -11,25 +11,3 @@
do \
( if test -e $$lib ; then \
$(INSTALL) -m 444 $$lib $(DESTDIR)$(LIBDIR); \
-@@ -160,9 +158,9 @@
- $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
- (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
-
-- mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-- chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
-- $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
-+ chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
-+ $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
-
- uninstall:
- rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
-@@ -171,7 +169,7 @@
- $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
- $(DESTDIR)$(PREFIX)/share/ptlib \
- $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
-- $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
-+ $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
- rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
- $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
- $(DESTDIR)$(LIBDIR)/$(LIB_SONAME)
Index: devel/qjson/Makefile
===================================================================
--- devel/qjson/Makefile
+++ devel/qjson/Makefile
@@ -11,7 +11,7 @@
LICENSE= LGPL21
USE_QT4= corelib moc_build qmake_build rcc_build uic_build
-USES= cmake tar:bzip2
+USES= cmake pathfix tar:bzip2
USE_LDCONFIG= yes
PORTDOCS= *
@@ -24,10 +24,6 @@
BUILD_DEPENDS+= doxygen:devel/doxygen
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's,/pkgconfig,/../libdata/pkgconfig,' \
- ${WRKSRC}/CMakeLists.txt
-
post-build:
.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/doc && doxygen
Index: devel/radare2/Makefile
===================================================================
--- devel/radare2/Makefile
+++ devel/radare2/Makefile
@@ -19,7 +19,8 @@
CONFIGURE_ARGS+= --with-syscapstone
-USES= gmake pkgconfig tar:xz
+USES= gmake pathfix pkgconfig tar:xz
+PATHFIX_MAKEFILEIN= Makefile
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -29,8 +30,6 @@
OPTIONS_DEFINE= DOCS
post-patch:
- ${REINPLACE_CMD} -e 's|..LIBDIR./pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/libr/Makefile
${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/anal/Makefile
${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/asm/Makefile
Index: devel/rapidjson/Makefile
===================================================================
--- devel/rapidjson/Makefile
+++ devel/rapidjson/Makefile
@@ -21,7 +21,7 @@
USE_GITHUB= yes
GH_ACCOUNT= miloyip
-USES= cmake compiler:c++11-lang gmake
+USES= cmake compiler:c++11-lang gmake pathfix
OPTIONS_DEFINE= DOXYGEN EXAMPLES
OPTIONS_DEFAULT=${OPTIONS_DEFINE}
@@ -40,7 +40,6 @@
PORTDATA= *
post-patch:
- @${REINPLACE_CMD} -e 's|LIB_INSTALL_DIR}/pkgconfig"|CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"|' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"|' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt ${WRKSRC}/test/unittest/CMakeLists.txt
@${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt # travis_doc breaks cmake, see https://github.com/miloyip/rapidjson/issues/715
Index: devel/rudiments/Makefile
===================================================================
--- devel/rudiments/Makefile
+++ devel/rudiments/Makefile
@@ -12,7 +12,8 @@
LICENSE= LGPL20
GNU_CONFIGURE= yes
-USES= libtool pkgconfig shebangfix
+USES= libtool pathfix pkgconfig shebangfix
+PATHFIX_MAKEFILEIN= Makefile
SHEBANG_FILES= doc/programming/insert.pl
USE_LDCONFIG= yes
Index: devel/rudiments/files/patch-Makefile
===================================================================
--- devel/rudiments/files/patch-Makefile
+++ devel/rudiments/files/patch-Makefile
@@ -1,28 +1,20 @@
---- Makefile.orig 2015-08-05 23:06:25.000000000 +0200
-+++ Makefile 2015-08-08 12:40:43.305908000 +0200
-@@ -16,12 +16,9 @@
+--- Makefile.orig 2016-10-03 12:37:06 UTC
++++ Makefile
+@@ -17,9 +17,6 @@ install:
cd bin $(AND) $(MAKE) install
cd doc $(AND) $(MAKE) install
cd man $(AND) $(MAKE) install
- $(MKINSTALLDIRS) $(licensedir)
- $(CP) COPYING $(licensedir)
- $(CHMOD) 0644 $(licensedir)/COPYING
-- $(MKINSTALLDIRS) $(libdir)/pkgconfig
-- $(CP) rudiments.pc $(libdir)/pkgconfig
-- $(CHMOD) 644 $(libdir)/pkgconfig/rudiments.pc
-+ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/libdata/pkgconfig
-+ $(CP) rudiments.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
-+ $(CHMOD) 644 $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc
-
- uninstall:
- cd src $(AND) $(MAKE) uninstall
-@@ -29,8 +26,7 @@
+ $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
+ $(CP) rudiments.pc $(prefix)/libdata/pkgconfig
+ $(CHMOD) 644 $(prefix)/libdata/pkgconfig/rudiments.pc
+@@ -30,7 +27,6 @@ uninstall:
cd bin $(AND) $(MAKE) uninstall
cd doc $(AND) $(MAKE) uninstall
cd man $(AND) $(MAKE) uninstall
- $(RMTREE) $(licensedir)
-- $(RM) $(libdir)/pkgconfig/rudiments.pc
-+ $(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/rudiments.pc
+ $(RM) $(prefix)/libdata/pkgconfig/rudiments.pc
distclean: clean
- $(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/rudiments.opensdf msvc/rudiments.sdf msvc/rudiments.suo
Index: devel/rudiments/files/patch-bin_Makefile
===================================================================
--- devel/rudiments/files/patch-bin_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- bin/Makefile.orig 2015-01-13 22:38:32 UTC
-+++ bin/Makefile
-@@ -3,9 +3,9 @@ top_builddir = ..
- include ../config.mk
-
- install:
-- $(MKINSTALLDIRS) $(bindir)
-- $(CP) rudiments-config $(bindir)
-- $(CHMOD) 755 $(bindir)/rudiments-config
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+ $(CP) rudiments-config $(DESTDIR)$(bindir)
-+ $(CHMOD) 755 $(DESTDIR)$(bindir)/rudiments-config
-
- uninstall:
-- $(RM) $(bindir)/rudiments-config
-+ $(RM) $(DESTDIR)$(bindir)/rudiments-config
Index: devel/rudiments/files/patch-configure
===================================================================
--- devel/rudiments/files/patch-configure
+++ devel/rudiments/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2015-04-11 01:05:36 UTC
+--- configure.orig 2016-03-26 17:20:08 UTC
+++ configure
-@@ -9216,7 +9216,7 @@ $as_echo_n "checking whether the $compil
+@@ -9284,7 +9284,7 @@ $as_echo_n "checking whether the $compil
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
inherit_rpath=no
@@ -28,62 +28,3 @@
*)
;;
esac
-@@ -31537,47 +31540,47 @@ fi
- # prepend DESTDIR where appropriate
- if ( test "`echo $ac_default_prefix | cut -c1`" = "/" )
- then
-- ac_default_prefix='${DESTDIR}'"$ac_default_prefix"
-+ ac_default_prefix="$ac_default_prefix"
- fi
- if ( test "`echo $prefix | cut -c1`" = "/" )
- then
-- prefix='${DESTDIR}'"$prefix"
-+ prefix="$prefix"
- fi
- if ( test "`echo $exec_prefix | cut -c1`" = "/" )
- then
-- exec_prefix='${DESTDIR}'"$exec_prefix"
-+ exec_prefix="$exec_prefix"
- fi
- if ( test "`echo $includedir | cut -c1`" = "/" )
- then
-- includedir='${DESTDIR}'"$includedir"
-+ includedir="$includedir"
- fi
- if ( test "`echo $libdir | cut -c1`" = "/" )
- then
-- libdir='${DESTDIR}'"$libdir"
-+ libdir="$libdir"
- fi
- if ( test "`echo $libexecdir | cut -c1`" = "/" )
- then
-- libexecdir='${DESTDIR}'"$libexecdir"
-+ libexecdir="$libexecdir"
- fi
- if ( test "`echo $bindir | cut -c1`" = "/" )
- then
-- bindir='${DESTDIR}'"$bindir"
-+ bindir="$bindir"
- fi
- if ( test "`echo $localstatedir | cut -c1`" = "/" )
- then
-- localstatedir='${DESTDIR}'"$localstatedir"
-+ localstatedir="$localstatedir"
- fi
- if ( test "`echo $sysconfdir | cut -c1`" = "/" )
- then
-- sysconfdir='${DESTDIR}'"$sysconfdir"
-+ sysconfdir="$sysconfdir"
- fi
- if ( test "`echo $mandir | cut -c1`" = "/" )
- then
-- mandir='${DESTDIR}'"$mandir"
-+ mandir="$mandir"
- fi
- if ( test "`echo $datadir | cut -c1`" = "/" )
- then
-- datadir='${DESTDIR}'"$datadir"
-+ datadir="$datadir"
- fi
-
-
Index: devel/rudiments/files/patch-doc_Makefile
===================================================================
--- devel/rudiments/files/patch-doc_Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/Makefile.orig 2015-09-02 20:19:17 UTC
-+++ doc/Makefile
-@@ -5,46 +5,46 @@ include ../config.mk
- all:
-
- install:
-- $(MKINSTALLDIRS) $(docdir)
-- $(MKINSTALLDIRS) $(docdir)/css
-- $(MKINSTALLDIRS) $(docdir)/classes/html
-- $(MKINSTALLDIRS) $(docdir)/features
-- $(MKINSTALLDIRS) $(docdir)/programming
-- $(CP) installing.html $(docdir)
-- $(CP) index.html $(docdir)
-- $(CP) css/styles.css $(docdir)/css
-- $(CP) classes/html/*.html $(docdir)/classes/html
-- $(CP) classes/html/*.png $(docdir)/classes/html
-- $(CP) classes/html/*.css $(docdir)/classes/html
-- $(CP) classes/html/*.js $(docdir)/classes/html
-- $(CP) features/*.html $(docdir)/features
-- $(CP) programming/*.html $(docdir)/programming
-- $(CHMOD) 644 $(docdir)/*.html
-- $(CHMOD) 644 $(docdir)/css/*
-- $(CHMOD) 644 $(docdir)/classes/html/a*.html
-- $(CHMOD) 644 $(docdir)/classes/html/b*.html
-- $(CHMOD) 644 $(docdir)/classes/html/c*.html
-- $(CHMOD) 644 $(docdir)/classes/html/d*.html
-- $(CHMOD) 644 $(docdir)/classes/html/e*.html
-- $(CHMOD) 644 $(docdir)/classes/html/f*.html
-- $(CHMOD) 644 $(docdir)/classes/html/g*.html
-- $(CHMOD) 644 $(docdir)/classes/html/h*.html
-- $(CHMOD) 644 $(docdir)/classes/html/i*.html
-- $(CHMOD) 644 $(docdir)/classes/html/l*.html
-- $(CHMOD) 644 $(docdir)/classes/html/m*.html
-- $(CHMOD) 644 $(docdir)/classes/html/n*.html
-- $(CHMOD) 644 $(docdir)/classes/html/p*.html
-- $(CHMOD) 644 $(docdir)/classes/html/r*.html
-- $(CHMOD) 644 $(docdir)/classes/html/s*.html
-- $(CHMOD) 644 $(docdir)/classes/html/t*.html
-- $(CHMOD) 644 $(docdir)/classes/html/u*.html
-- $(CHMOD) 644 $(docdir)/classes/html/w*.html
-- $(CHMOD) 644 $(docdir)/classes/html/x*.html
-- $(CHMOD) 644 $(docdir)/classes/html/*.png
-- $(CHMOD) 644 $(docdir)/classes/html/*.css
-- $(CHMOD) 644 $(docdir)/classes/html/*.js
-- $(CHMOD) 644 $(docdir)/features/*.html
-- $(CHMOD) 644 $(docdir)/programming/*.html
-+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/css
-+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/classes/html
-+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/features
-+ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/programming
-+ $(CP) installing.html $(DESTDIR)$(docdir)
-+ $(CP) index.html $(DESTDIR)$(docdir)
-+ $(CP) css/styles.css $(DESTDIR)$(docdir)/css
-+ $(CP) classes/html/*.html $(DESTDIR)$(docdir)/classes/html
-+ $(CP) classes/html/*.png $(DESTDIR)$(docdir)/classes/html
-+ $(CP) classes/html/*.css $(DESTDIR)$(docdir)/classes/html
-+ $(CP) classes/html/*.js $(DESTDIR)$(docdir)/classes/html
-+ $(CP) features/*.html $(DESTDIR)$(docdir)/features
-+ $(CP) programming/*.html $(DESTDIR)$(docdir)/programming
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/css/*
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/a*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/b*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/c*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/d*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/e*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/f*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/g*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/h*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/i*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/l*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/m*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/n*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/p*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/r*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/s*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/t*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/u*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/w*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/x*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.png
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.css
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/classes/html/*.js
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/features/*.html
-+ $(CHMOD) 644 $(DESTDIR)$(docdir)/programming/*.html
-
- uninstall:
-- $(RMTREE) $(docdir)
-+ $(RMTREE) $(DESTDIR)$(docdir)
Index: devel/rudiments/files/patch-include_Makefile.in
===================================================================
--- devel/rudiments/files/patch-include_Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- include/Makefile.in.orig 2015-02-08 07:07:44 UTC
-+++ include/Makefile.in
-@@ -18,21 +18,21 @@ PRIVATEHEADERS7 = @PRIVATEHEADERS7@
- all:
-
- install:
-- $(MKINSTALLDIRS) $(includedir)/rudiments
-- $(MKINSTALLDIRS) $(includedir)/rudiments/private
-- cd rudiments $(AND) $(CP) $(HEADERS0) $(includedir)/rudiments
-- cd rudiments $(AND) $(CP) $(HEADERS1) $(includedir)/rudiments
-- cd rudiments $(AND) $(CP) $(HEADERS2) $(includedir)/rudiments
-- cd rudiments $(AND) $(CP) $(HEADERS3) $(includedir)/rudiments
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) $(includedir)/rudiments/private
-- cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) $(includedir)/rudiments/private
-- $(CHMOD) 644 $(includedir)/rudiments/*.h $(includedir)/rudiments/private/*.h
-+ $(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments
-+ $(MKINSTALLDIRS) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) $(CP) $(HEADERS0) ${DESTDIR}$(includedir)/rudiments
-+ cd rudiments $(AND) $(CP) $(HEADERS1) ${DESTDIR}$(includedir)/rudiments
-+ cd rudiments $(AND) $(CP) $(HEADERS2) ${DESTDIR}$(includedir)/rudiments
-+ cd rudiments $(AND) $(CP) $(HEADERS3) ${DESTDIR}$(includedir)/rudiments
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS0) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS1) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS2) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS3) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS4) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS5) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS6) ${DESTDIR}$(includedir)/rudiments/private
-+ cd rudiments $(AND) cd private $(AND) $(CP) $(PRIVATEHEADERS7) ${DESTDIR}$(includedir)/rudiments/private
-+ $(CHMOD) 644 ${DESTDIR}$(includedir)/rudiments/*.h ${DESTDIR}$(includedir)/rudiments/private/*.h
-
- uninstall:
- $(RMTREE) $(includedir)/rudiments
Index: devel/rudiments/files/patch-man_Makefile
===================================================================
--- devel/rudiments/files/patch-man_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- man/Makefile.orig 2015-01-13 22:38:32 UTC
-+++ man/Makefile
-@@ -3,10 +3,10 @@ top_builddir = ..
- include ../config.mk
-
- install:
-- $(MKINSTALLDIRS) $(mandir)
-- $(MKINSTALLDIRS) $(mandir)/man1
-- $(CP) rudiments-config.1 $(mandir)/man1
-- $(CHMOD) 644 $(mandir)/man1/rudiments-config.1
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
-+ $(CP) rudiments-config.1 $(DESTDIR)$(mandir)/man1
-+ $(CHMOD) 644 $(DESTDIR)$(mandir)/man1/rudiments-config.1
-
- uninstall:
-- $(RM) $(mandir)/man1/rudiments-config.1
-+ $(RM) $(DESTDIR)$(mandir)/man1/rudiments-config.1
Index: devel/rudiments/files/patch-src_Makefile.in
===================================================================
--- devel/rudiments/files/patch-src_Makefile.in
+++ devel/rudiments/files/patch-src_Makefile.in
@@ -1,4 +1,4 @@
---- src/Makefile.in.orig 2015-02-06 03:20:27 UTC
+--- src/Makefile.in.orig 2016-02-06 03:58:09 UTC
+++ src/Makefile.in
@@ -11,7 +11,7 @@ LOBJS = @LOBJS@
.SUFFIXES: .lo
@@ -9,7 +9,7 @@
.cpp.obj:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $<
-@@ -22,26 +22,26 @@ clean:
+@@ -22,7 +22,7 @@ clean:
$(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest
librudiments.$(LIBEXT): $(SRCS) $(LOBJS)
@@ -18,32 +18,3 @@
install: $(INSTALLLIB)
- installdll:
-- $(MKINSTALLDIRS) $(bindir)
-- $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(bindir)
-- $(MKINSTALLDIRS) $(libdir)
-- $(LTINSTALL) $(CP) librudiments.lib $(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+ $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(bindir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(LTINSTALL) $(CP) librudiments.lib $(DESTDIR)$(libdir)
-
- installlib:
-- $(MKINSTALLDIRS) $(libdir)
-- $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(libdir)
-- $(LTFINISH) $(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(LTINSTALL) $(CP) librudiments.$(LIBEXT) $(DESTDIR)$(libdir)
-+ $(LTFINISH) $(DESTDIR)$(libdir)
-
- uninstall: $(UNINSTALLLIB)
-
- uninstalldll:
-- $(LTUNINSTALL) $(RM) $(bindir)/librudiments.$(LIBEXT)
-- $(LTUNINSTALL) $(RM) $(libdir)/librudiments.lib
-+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(bindir)/librudiments.$(LIBEXT)
-+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.lib
-
- uninstalllib:
-- $(LTUNINSTALL) $(RM) $(libdir)/librudiments.$(LIBEXT)
-+ $(LTUNINSTALL) $(RM) $(DESTDIR)$(libdir)/librudiments.$(LIBEXT)
Index: devel/simavr/Makefile
===================================================================
--- devel/simavr/Makefile
+++ devel/simavr/Makefile
@@ -20,7 +20,8 @@
USE_GITHUB= yes
GH_ACCOUNT= buserror
-USES= gmake pkgconfig
+USES= gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
ALL_TARGET= build-simavr
MAKE_ARGS= "RELEASE=1 PREFIX=${PREFIX} DESTDIR=${STAGEDIR}${PREFIX}"
Index: devel/simavr/files/patch-simavr_Makefile
===================================================================
--- devel/simavr/files/patch-simavr_Makefile
+++ devel/simavr/files/patch-simavr_Makefile
@@ -1,4 +1,4 @@
---- simavr/Makefile.orig 2016-01-19 09:41:55 UTC
+--- simavr/Makefile.orig 2016-10-03 12:42:39 UTC
+++ simavr/Makefile
@@ -73,12 +73,9 @@ ${OBJ}/libsimavr.so : ${OBJ}/libsimavr.
ln -sf libsimavr.so.1 $@
@@ -14,19 +14,11 @@
${target} : ${OBJ}/${target}.elf
-@@ -103,15 +100,13 @@ install : all
- $(INSTALL) -m644 sim/avr/*.h $(DESTDIR)/include/simavr/avr/
- $(MKDIR) $(DESTDIR)/lib
- $(INSTALL) ${OBJ}/libsimavr.a $(DESTDIR)/lib/
-- $(MKDIR) $(DESTDIR)/lib/pkgconfig/
-+ $(MKDIR) $(DESTDIR)/libdata/pkgconfig/
+@@ -108,10 +105,8 @@ install : all
+ simavr-avr.pc >$(DESTDIR)/libdata/pkgconfig/simavr-avr.pc
sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
-- simavr-avr.pc >$(DESTDIR)/lib/pkgconfig/simavr-avr.pc
-+ simavr-avr.pc >$(DESTDIR)/libdata/pkgconfig/simavr-avr.pc
- sed -e "s|PREFIX|${PREFIX}|g" -e "s|VERSION|${SIMAVR_VERSION}|g" \
-- simavr.pc >$(DESTDIR)/lib/pkgconfig/simavr.pc
+ simavr.pc >$(DESTDIR)/libdata/pkgconfig/simavr.pc
-ifeq (${shell uname}, Linux)
-+ simavr.pc >$(DESTDIR)/libdata/pkgconfig/simavr.pc
$(INSTALL) ${OBJ}/libsimavr.so.1 $(DESTDIR)/lib/
ln -sf libsimavr.so.1 $(DESTDIR)/lib/libsimavr.so
-endif
Index: devel/sparsehash/Makefile
===================================================================
--- devel/sparsehash/Makefile
+++ devel/sparsehash/Makefile
@@ -11,6 +11,7 @@
LICENSE= BSD3CLAUSE
+USES= pathfix
USE_GITHUB= yes
GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
@@ -18,11 +19,6 @@
OPTIONS_DEFINE= DOCS
-post-patch:
- ${REINPLACE_CMD} -e \
- 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
post-patch-DOCS-on:
${REINPLACE_CMD} -e \
's|^docdir = .*|docdir = ${DOCSDIR}|' \
Index: devel/tex-kpathsea/Makefile
===================================================================
--- devel/tex-kpathsea/Makefile
+++ devel/tex-kpathsea/Makefile
@@ -12,7 +12,7 @@
MAINTAINER= hrs@FreeBSD.org
COMMENT= Path searching library for TeX
-USES= libtool tar:xz
+USES= libtool pathfix tar:xz
USE_LDCONFIG= yes
USE_TEX= yes
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
Index: devel/tex-libtexlua/Makefile
===================================================================
--- devel/tex-libtexlua/Makefile
+++ devel/tex-libtexlua/Makefile
@@ -14,7 +14,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKDIR}/LICENSE.MIT
-USES= tar:xz libtool pkgconfig
+USES= tar:xz libtool pathfix pkgconfig
USE_LDCONFIG= yes
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux libs/lua52
Index: devel/tex-libtexlua/files/patch-Makefile.in
===================================================================
--- devel/tex-libtexlua/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-02-16 14:32:53 UTC
-+++ Makefile.in
-@@ -675,7 +675,7 @@ lua52include_HEADERS = \
- $(LUA52_TREE)/src/lua.hpp \
- $(LUA52_TREE)/src/lualib.h
-
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
- pkgconfig_DATA = texlua52.pc
- @build_TRUE@dist_check_SCRIPTS = lua52.test luaerror.test
- @build_TRUE@TESTS = lua52.test luaerror.test
Index: devel/tex-libtexluajit/Makefile
===================================================================
--- devel/tex-libtexluajit/Makefile
+++ devel/tex-libtexluajit/Makefile
@@ -16,7 +16,7 @@
BROKEN_powerpc64= Does not build
-USES= tar:xz libtool pkgconfig
+USES= tar:xz libtool pathfix pkgconfig
USE_LDCONFIG= yes
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux libs/luajit
Index: devel/tex-libtexluajit/files/patch-Makefile.in
===================================================================
--- devel/tex-libtexluajit/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-02-16 14:32:53 UTC
-+++ Makefile.in
-@@ -728,7 +728,7 @@ luajitinclude_HEADERS = \
- $(LUAJIT_TREE)/src/lua.hpp \
- $(LUAJIT_TREE)/src/lualib.h
-
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
- pkgconfig_DATA = texluajit.pc
- @build_TRUE@dist_check_SCRIPTS = luajit.test luajiterr.test
- @build_TRUE@TESTS = luajit.test luajiterr.test
Index: devel/tex-synctex/Makefile
===================================================================
--- devel/tex-synctex/Makefile
+++ devel/tex-synctex/Makefile
@@ -16,7 +16,7 @@
LICENSE_FILE= ${WRKSRC}/synctexdir/README.txt
CONFLICTS= tex-web2c-20150521
-USES= libtool pkgconfig tar:xz
+USES= libtool pathfix pkgconfig tar:xz
USE_TEX= kpathsea
USE_LDCONFIG= yes
EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
Index: devel/tex-synctex/files/patch-Makefile.in
===================================================================
--- devel/tex-synctex/files/patch-Makefile.in
+++ devel/tex-synctex/files/patch-Makefile.in
@@ -29,12 +29,3 @@
proglib = lib/lib.a
EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
-@@ -3557,7 +3557,7 @@
-
- nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
- syncincludedir = ${includedir}/synctex
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- @SYNCTEX_TRUE@syncinclude_HEADERS = \
- @SYNCTEX_TRUE@ synctexdir/synctex_parser.h \
- @SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h
Index: devel/tex-web2c/Makefile
===================================================================
--- devel/tex-web2c/Makefile
+++ devel/tex-web2c/Makefile
@@ -17,7 +17,7 @@
libzzip.so:devel/zziplib \
libmpfr.so:math/mpfr
-USES= pkgconfig libtool tar:xz
+USES= pathfix pkgconfig libtool tar:xz
USE_TEX= kpathsea ptexenc
USE_XORG= pixman
USE_GNOME= cairo
Index: devel/tex-web2c/files/patch-Makefile.in
===================================================================
--- devel/tex-web2c/files/patch-Makefile.in
+++ devel/tex-web2c/files/patch-Makefile.in
@@ -15,12 +15,3 @@
nodist_man_MANS =
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
-@@ -3557,7 +3557,7 @@
-
- nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
- syncincludedir = ${includedir}/synctex
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- @SYNCTEX_TRUE@syncinclude_HEADERS = \
- @SYNCTEX_TRUE@ synctexdir/synctex_parser.h \
- @SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h
Index: devel/thrift-c_glib/Makefile
===================================================================
--- devel/thrift-c_glib/Makefile
+++ devel/thrift-c_glib/Makefile
@@ -20,7 +20,7 @@
DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
-USES= autoreconf pkgconfig gmake libtool
+USES= autoreconf pathfix pkgconfig gmake libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
@@ -43,7 +43,4 @@
--without-ruby \
--without-go
-post-patch:
- @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am
-
.include <bsd.port.mk>
Index: devel/thrift-cpp/Makefile
===================================================================
--- devel/thrift-cpp/Makefile
+++ devel/thrift-cpp/Makefile
@@ -19,7 +19,7 @@
libevent.so:devel/libevent2
USES= autoreconf pkgconfig gmake compiler:c++11-lang \
- libtool ssl
+ libtool pathfix ssl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
@@ -60,9 +60,6 @@
USE_CXXSTD= c++11
.endif
-post-patch:
- @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
Index: devel/unibilium/Makefile
===================================================================
--- devel/unibilium/Makefile
+++ devel/unibilium/Makefile
@@ -15,14 +15,12 @@
USE_GITHUB= yes
GH_ACCOUNT= mauke
-USES= gmake libtool:build perl5 pkgconfig
+USES= gmake libtool:build pathfix perl5 pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
USE_PERL5= build
USE_LDCONFIG= yes
MAKE_ARGS= MANDIR=${MANPREFIX}/man
-post-patch:
- ${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libunibilium.so
Index: devel/valgrind-devel/Makefile
===================================================================
--- devel/valgrind-devel/Makefile
+++ devel/valgrind-devel/Makefile
@@ -44,7 +44,6 @@
OPTIONS_SUB= yes
USES= pathfix pkgconfig gmake perl5 shebangfix autoreconf
-PATHFIX_MAKEFILEIN= Makefile.am
USE_PERL5= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: devel/valgrind/Makefile
===================================================================
--- devel/valgrind/Makefile
+++ devel/valgrind/Makefile
@@ -42,7 +42,6 @@
OPTIONS_SUB= yes
USES= pathfix pkgconfig gmake perl5 shebangfix autoreconf
-PATHFIX_MAKEFILEIN= Makefile.am
USE_PERL5= build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: dns/bundy/Makefile
===================================================================
--- dns/bundy/Makefile
+++ dns/bundy/Makefile
@@ -36,7 +36,6 @@
USES= compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var \
--without-werror \
Index: dns/getdns/Makefile
===================================================================
--- dns/getdns/Makefile
+++ dns/getdns/Makefile
@@ -21,7 +21,7 @@
libldns.so:dns/ldns \
libunbound.so:dns/unbound
-USES= libtool
+USES= libtool pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libidn=${LOCALBASE} --docdir=${DOCSDIR} \
@@ -53,8 +53,6 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
${REINPLACE_CMD} -Ee 's,^(sharedoc = ).*,\1${WRKDIR}/doc,' \
-e '/echo .\*\*\*/d' ${WRKSRC}/Makefile.in
Index: dns/libpsl/Makefile
===================================================================
--- dns/libpsl/Makefile
+++ dns/libpsl/Makefile
@@ -29,7 +29,6 @@
--with-psl-testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
USES= autoreconf libtool pathfix pkgconfig python:build shebangfix
Index: emulators/open-vm-tools/Makefile
===================================================================
--- emulators/open-vm-tools/Makefile
+++ emulators/open-vm-tools/Makefile
@@ -42,7 +42,7 @@
WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
GNU_CONFIGURE= yes
-USES= pkgconfig kmod libtool
+USES= pathfix pkgconfig kmod libtool
USE_GNOME= glib20
USE_LDCONFIG= yes
CPPFLAGS+= -Wno-deprecated-declarations
Index: emulators/open-vm-tools/files/patch-libguestlib-Makefile
===================================================================
--- emulators/open-vm-tools/files/patch-libguestlib-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./libguestlib/Makefile.am.orig 2010-04-28 03:17:28.000000000 +0900
-+++ ./libguestlib/Makefile.am 2010-11-11 22:21:38.000000000 +0900
-@@ -41,7 +41,7 @@
-
- EXTRA_DIST = vmguestlib.pc.in
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = vmguestlib.pc
-
- $(pkgconfig_DATA): $(top_builddir)/config.status
---- ./libguestlib/Makefile.in.orig 2010-04-28 03:18:19.000000000 +0900
-+++ ./libguestlib/Makefile.in 2010-11-11 22:22:04.000000000 +0900
-@@ -298,7 +298,7 @@
- $(top_srcdir)/lib/include/vmSessionId.h \
- $(top_srcdir)/lib/include/vm_basic_types.h
- EXTRA_DIST = vmguestlib.pc.in
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = vmguestlib.pc
- all: all-am
-
Index: ftp/curl/Makefile
===================================================================
--- ftp/curl/Makefile
+++ ftp/curl/Makefile
@@ -158,7 +158,7 @@
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
.if !defined(BUILDING_HIPHOP)
Index: ftp/curl/files/patch-configure
===================================================================
--- ftp/curl/files/patch-configure
+++ ftp/curl/files/patch-configure
@@ -70,16 +70,6 @@
if test "$want_optimize" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
-@@ -21417,7 +21425,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
- PKGTEST="no"
- PREFIX_OPENSSL=$OPT_SSL
-
-- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
-+ # Use the FreeBSD location of the pkgconf libdir
-+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
- { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
- $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
- if test -f "$OPENSSL_PCDIR/openssl.pc"; then
@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; }
;;
off)
Index: ftp/curlpp/Makefile
===================================================================
--- ftp/curlpp/Makefile
+++ ftp/curlpp/Makefile
@@ -20,7 +20,6 @@
CONFIGURE_ARGS= --disable-ewarning
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
USES= autoreconf libtool localbase pathfix
Index: games/liblcf/Makefile
===================================================================
--- games/liblcf/Makefile
+++ games/liblcf/Makefile
@@ -18,7 +18,6 @@
GH_ACCOUNT= EasyRPG
USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
Index: games/poker-engine/Makefile
===================================================================
--- games/poker-engine/Makefile
+++ games/poker-engine/Makefile
@@ -22,14 +22,9 @@
${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt
-USES= gettext gmake pkgconfig python:2
+USES= gettext gmake pathfix pkgconfig python:2
GNU_CONFIGURE= yes
-post-patch:
- @${REINPLACE_CMD} -e \
- 's|{datadir}/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
-
test:
@cd ${WRKSRC} && ${MAKE_CMD} check
Index: games/py-poker-eval/Makefile
===================================================================
--- games/py-poker-eval/Makefile
+++ games/py-poker-eval/Makefile
@@ -17,7 +17,7 @@
LIB_DEPENDS= libpoker-eval.so:games/poker-eval
-USES= autoreconf libtool pkgconfig python:2
+USES= autoreconf libtool pathfix pkgconfig python:2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= PYTHON=""
Index: games/py-poker-eval/files/patch-Makefile.am
===================================================================
--- games/py-poker-eval/files/patch-Makefile.am
+++ games/py-poker-eval/files/patch-Makefile.am
@@ -15,12 +15,3 @@
if PYTHON_2_6
py2_6exec_LTLIBRARIES = _pokereval_2_6.la
_pokereval_2_6_la_SOURCES = pypokereval.c
-@@ -64,7 +72,7 @@
- _pokereval_2_3_la_CFLAGS = ${PYTHON2_3_CFLAGS} ${POKER_EVAL_CFLAGS} -DPYTHON_VERSION=\"2_3\" -D'VERSION_NAME(w)=w\#\#2_3'
- endif
-
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = pypoker-eval.pc
-
- EXTRA_DIST = config/python.m4 config/ccpython.m4 \
Index: games/qqwing/Makefile
===================================================================
--- games/qqwing/Makefile
+++ games/qqwing/Makefile
@@ -17,7 +17,6 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_OUTSOURCE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
AUTORECONF_WRKSRC= ${WRKSRC}/build
CONFIGURE_CMD= ${AUTORECONF_WRKSRC}/configure
INSTALL_TARGET= install-strip
Index: graphics/Coin/Makefile
===================================================================
--- graphics/Coin/Makefile
+++ graphics/Coin/Makefile
@@ -14,7 +14,7 @@
LIB_DEPENDS= libsimage.so:graphics/simage
-USES= openal:al libtool
+USES= openal:al libtool pathfix
USE_GL= yes
USE_XORG= ice sm x11 xext xt
GNU_CONFIGURE= yes
Index: graphics/Coin/files/patch-Makefile.in
===================================================================
--- graphics/Coin/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2010-03-02 13:20:09 UTC
-+++ Makefile.in
-@@ -1399,7 +1399,7 @@ BOOST_HEADER_FILES = \
- include/boost/version.hpp \
- include/boost/visit_each.hpp
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
- pkgconfig_DATA = Coin.pc
- BUILT_SOURCES = \
- include/Inventor/C/basic.h \
Index: graphics/GraphicsMagick/Makefile
===================================================================
--- graphics/GraphicsMagick/Makefile
+++ graphics/GraphicsMagick/Makefile
@@ -24,7 +24,7 @@
INSTALL_TARGET= install-strip
TEST_TARGET= check
USE_LDCONFIG= yes
-USES= libtool localbase tar:bzip2
+USES= libtool localbase pathfix tar:bzip2
PORTDATA= *
PORTDOCS= *
Index: graphics/GraphicsMagick/files/patch-Makefile.in
===================================================================
--- graphics/GraphicsMagick/files/patch-Makefile.in
+++ graphics/GraphicsMagick/files/patch-Makefile.in
@@ -9,12 +9,3 @@
MogrifyDelegate = @MogrifyDelegate@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -4381,7 +4381,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
-
- # Pkgconfig directory
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-
- # Files to install in Pkgconfig directory
- pkgconfig_DATA = \
Index: graphics/agg/Makefile
===================================================================
--- graphics/agg/Makefile
+++ graphics/agg/Makefile
@@ -30,8 +30,4 @@
BROKEN_sparc64= Does not compile
-post-patch:
- @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
-
.include <bsd.port.mk>
Index: graphics/cal3d/Makefile
===================================================================
--- graphics/cal3d/Makefile
+++ graphics/cal3d/Makefile
@@ -20,7 +20,6 @@
GNU_CONFIGURE= yes
USES= autoreconf libtool pathfix pkgconfig tar:bzip2
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Index: graphics/freeglut/Makefile
===================================================================
--- graphics/freeglut/Makefile
+++ graphics/freeglut/Makefile
@@ -12,7 +12,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake
+USES= cmake pathfix
USE_LDCONFIG= yes
USE_XORG= ice x11 xi xrandr
USE_GL= gl glu
Index: graphics/freeglut/files/patch-CMakeLists.txt
===================================================================
--- graphics/freeglut/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig 2015-02-18 04:59:57 UTC
-+++ CMakeLists.txt
-@@ -522,6 +522,6 @@ IF(FREEGLUT_GLES)
- SET(PC_FILENAME "freeglut-gles.pc")
- ENDIF()
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY)
--INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME})
-+INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/ RENAME ${PC_FILENAME})
- # TODO: change the library and .pc name when building for GLES,
- # e.g. -lglut-GLES
Index: graphics/leptonica/Makefile
===================================================================
--- graphics/leptonica/Makefile
+++ graphics/leptonica/Makefile
@@ -18,7 +18,7 @@
CONFLICTS= leptonlib-[0-9]*
-USES= jpeg libtool
+USES= jpeg libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
Index: graphics/leptonica/files/patch-Makefile.in
===================================================================
--- graphics/leptonica/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-04-26 20:30:38 UTC
-+++ Makefile.in
-@@ -270,7 +270,7 @@ top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = foreign
- EXTRA_DIST = config README.html leptonica-license.txt moller52.jpg version-notes.html make-for-auto make-for-local autobuild
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = lept.pc
- SUBDIRS = src prog
- all: config_auto.h
Index: graphics/libepoxy/Makefile
===================================================================
--- graphics/libepoxy/Makefile
+++ graphics/libepoxy/Makefile
@@ -19,6 +19,5 @@
USE_GL= egl glesv2
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
.include <bsd.port.mk>
Index: graphics/libpano13/Makefile
===================================================================
--- graphics/libpano13/Makefile
+++ graphics/libpano13/Makefile
@@ -18,7 +18,7 @@
USE_GNOME= gtk20 glib20 pango atk
-USES= autoreconf jpeg libtool
+USES= autoreconf jpeg libtool pathfix
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
Index: graphics/libpano13/files/patch-Makefile.am
===================================================================
--- graphics/libpano13/files/patch-Makefile.am
+++ graphics/libpano13/files/patch-Makefile.am
@@ -27,12 +27,3 @@
libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
-@@ -108,7 +118,7 @@
- noinst_HEADERS = $(INTERNAL_HDR) $(SYS_HDR) $(MAC_HDR)
-
- # Pkg-config script.
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
- pkgconfig_DATA = libpano13.pc
- DISTCLEANFILES = $(pkgconfig_DATA)
-
Index: graphics/libpgf/Makefile
===================================================================
--- graphics/libpgf/Makefile
+++ graphics/libpgf/Makefile
@@ -12,7 +12,7 @@
LICENSE= LGPL21
-USES= autoreconf dos2unix libtool zip
+USES= autoreconf dos2unix libtool pathfix zip
USE_LDCONFIG= yes
DOS2UNIX_FILES= configure.ac
Index: graphics/libpgf/files/patch-Makefile.am
===================================================================
--- graphics/libpgf/files/patch-Makefile.am
+++ graphics/libpgf/files/patch-Makefile.am
@@ -13,14 +13,3 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-@@ -22,8 +22,8 @@ RPMRELEASE=$(PACKAGE_RELEASE)
- ACLOCAL_AMFLAGS = -I m4
-
- install-data-local:: $(PACKAGE).pc
-- $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
-- $(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(libdir)/pkgconfig/$(PACKAGE).pc
-+ $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/pkgconfig
-+ $(INSTALL) -m 644 $(PACKAGE).pc $(DESTDIR)$(prefix)/libdata/pkgconfig/$(PACKAGE).pc
-
-
- .PHONY: ChangeLog
Index: graphics/libreatlas/Makefile
===================================================================
--- graphics/libreatlas/Makefile
+++ graphics/libreatlas/Makefile
@@ -31,7 +31,7 @@
libfontconfig.so:x11-fonts/fontconfig
GNU_CONFIGURE= yes
-USES= gettext gmake iconv jpeg pkgconfig
+USES= gettext gmake iconv jpeg pathfix pkgconfig
USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender xxf86vm
USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango
@@ -49,7 +49,5 @@
post-patch:
@${REINPLACE_CMD} -e 's|wx-config|$${WX_CONFIG}|' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
.include <bsd.port.mk>
Index: graphics/libspiro/Makefile
===================================================================
--- graphics/libspiro/Makefile
+++ graphics/libspiro/Makefile
@@ -15,7 +15,7 @@
USE_GITHUB= yes
GH_ACCOUNT= fontforge
-USES= gmake libtool autoreconf
+USES= autoreconf gmake libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
Index: graphics/libspiro/files/patch-Makefile.am
===================================================================
--- graphics/libspiro/files/patch-Makefile.am
+++ graphics/libspiro/files/patch-Makefile.am
@@ -1,16 +1,13 @@
---- Makefile.am.orig 2015-07-02 13:50:20 UTC
+--- Makefile.am.orig 2016-10-03 14:37:13 UTC
+++ Makefile.am
-@@ -1,8 +1,8 @@
+@@ -1,6 +1,6 @@
# Makefile.am - Top level automakefile for libspiro
-SUBDIRS = . tests
+SUBDIRS = .
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = ${PREFIX}/libdata/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = libspiro.pc
-
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -13,7 +13,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-und
LIBTOOL_DEPS = @LIBTOOL_DEPS@
Index: graphics/ming/Makefile
===================================================================
--- graphics/ming/Makefile
+++ graphics/ming/Makefile
@@ -29,7 +29,6 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
USES= autoreconf bison gmake libtool localbase pathfix shebangfix
Index: graphics/opengtl/Makefile
===================================================================
--- graphics/opengtl/Makefile
+++ graphics/opengtl/Makefile
@@ -18,7 +18,7 @@
LIB_DEPENDS= libpng.so:graphics/png \
libLLVM-3.3.so:devel/llvm33
-USES= cmake perl5 tar:bzip2
+USES= cmake pathfix perl5 tar:bzip2
USE_LDCONFIG= yes
CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config33
@@ -38,10 +38,5 @@
pre-configure:
${REINPLACE_CMD} -e 's|set(OPENGTL_LIB_SOVERSION.*|set(OPENGTL_LIB_SOVERSION "0")|' \
${PATCH_WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${PATCH_WRKSRC}/OpenCTL/OpenCTL/CMakeLists.txt \
- ${PATCH_WRKSRC}/OpenGTL/GTLCore/CMakeLists.txt \
- ${PATCH_WRKSRC}/OpenGTL/GTLImageIO/CMakeLists.txt \
- ${PATCH_WRKSRC}/OpenShiva/OpenShiva/CMakeLists.txt
.include <bsd.port.mk>
Index: graphics/pfstools/Makefile
===================================================================
--- graphics/pfstools/Makefile
+++ graphics/pfstools/Makefile
@@ -17,7 +17,7 @@
PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_SUB+= PFS_BASE=${PREFIX}
-USES= gmake pkgconfig libtool
+USES= gmake libtool pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_TARGET= ${PFS_BUILD}
CONFIGURE_ARGS+= --disable-jpeghdr --disable-matlab \
Index: graphics/pfstools/files/patch-src-pfs-Makefile.in
===================================================================
--- graphics/pfstools/files/patch-src-pfs-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pfs/Makefile.in.orig 2011-10-27 08:40:30 UTC
-+++ src/pfs/Makefile.in
-@@ -259,7 +259,7 @@ libpfs_1_2_la_SOURCES = pfs.cpp pfsutils
- library_includedir = $(includedir)/pfs-1.2
- library_include_HEADERS = pfs.h array2d.h
- #INCLUDES =
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = pfs.pc
- all: all-am
-
Index: graphics/qtgtl/Makefile
===================================================================
--- graphics/qtgtl/Makefile
+++ graphics/qtgtl/Makefile
@@ -14,7 +14,7 @@
LIB_DEPENDS= libGTLCore.so:graphics/opengtl
USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build
-USES= cmake:outsource pkgconfig tar:bzip2
+USES= cmake:outsource pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
DESCR= ${.CURDIR:H:H}/graphics/opengtl/pkg-descr
@@ -26,9 +26,6 @@
pre-configure:
@${REINPLACE_CMD} -e 's,set(QTGTL_LIB_SOVERSION.*,set(QTGTL_LIB_SOVERSION "0"),' \
${PATCH_WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e 's,$${LIB_INSTALL_DIR}/pkgconfig,${PREFIX}/libdata/pkgconfig,g' \
- ${PATCH_WRKSRC}/QtGTL/CMakeLists.txt \
- ${PATCH_WRKSRC}/QtShiva/CMakeLists.txt
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
Index: graphics/s2tc/Makefile
===================================================================
--- graphics/s2tc/Makefile
+++ graphics/s2tc/Makefile
@@ -24,7 +24,6 @@
GH_TAGNAME= f6ec862
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN=Makefile.am
CPPFLAGS+= -I${LOCALBASE}/include
Index: graphics/sdl_gfx/Makefile
===================================================================
--- graphics/sdl_gfx/Makefile
+++ graphics/sdl_gfx/Makefile
@@ -14,7 +14,6 @@
LICENSE= ZLIB
USES= autoreconf gmake libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
USE_SDL= sdl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include
Index: graphics/sekrit-twc-zimg/Makefile
===================================================================
--- graphics/sekrit-twc-zimg/Makefile
+++ graphics/sekrit-twc-zimg/Makefile
@@ -21,7 +21,6 @@
USES= autoreconf compiler:c++11-lib gmake libtool pathfix
EXTRACT_AFTER_ARGS= --exclude test/extra
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
Index: graphics/tesseract/Makefile
===================================================================
--- graphics/tesseract/Makefile
+++ graphics/tesseract/Makefile
@@ -13,7 +13,7 @@
LIB_DEPENDS= liblept.so:graphics/leptonica
-USES= localbase libtool
+USES= localbase libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -39,9 +39,6 @@
post-patch:
@${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
post-build-TOOLS-on:
@cd ${WRKSRC} && ${MAKE} training
Index: graphics/tiff/Makefile
===================================================================
--- graphics/tiff/Makefile
+++ graphics/tiff/Makefile
@@ -16,7 +16,7 @@
LIB_DEPENDS= libjbig.so:graphics/jbigkit
-USES= cpe jpeg libtool
+USES= cpe jpeg libtool pathfix
CPE_PRODUCT= libtiff
CPE_VERSION= ${DISTVERSION:C/[a-z]+//}
CPE_UPDATE= ${DISTVERSION:C/[0-9.]+//}
Index: graphics/tiff/files/patch-Makefile.in
===================================================================
--- graphics/tiff/files/patch-Makefile.in
+++ graphics/tiff/files/patch-Makefile.in
@@ -1,14 +1,5 @@
--- Makefile.in.orig 2015-09-12 19:48:44 UTC
+++ Makefile.in
-@@ -436,7 +436,7 @@ EXTRA_DIST = \
-
- dist_doc_DATA = $(docfiles)
- SUBDIRS = port libtiff tools build contrib test man html
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libtiff-4.pc
-
- # Special rules to assist with Coverity submissions.
@@ -494,19 +494,6 @@ distclean-libtool:
-rm -f libtool config.lt
install-dist_docDATA: $(dist_doc_DATA)
Index: graphics/tiffgt/Makefile
===================================================================
--- graphics/tiffgt/Makefile
+++ graphics/tiffgt/Makefile
@@ -16,7 +16,7 @@
LIB_DEPENDS= libjbig.so:graphics/jbigkit \
libtiff.so:graphics/tiff
-USES= cpe jpeg libtool
+USES= cpe jpeg libtool pathfix
CPE_PRODUCT= libtiff
CPE_VERSION= ${DISTVERSION:C/[a-z]+//}
CPE_UPDATE= ${DISTVERSION:C/[0-9.]+//}
Index: graphics/tiffgt/files/patch-Makefile.in
===================================================================
--- graphics/tiffgt/files/patch-Makefile.in
+++ graphics/tiffgt/files/patch-Makefile.in
@@ -1,14 +1,5 @@
--- Makefile.in.orig 2015-06-21 19:07:53 UTC
+++ Makefile.in
-@@ -434,7 +434,7 @@ EXTRA_DIST = \
-
- dist_doc_DATA = $(docfiles)
- SUBDIRS = port libtiff tools build contrib test man html
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libtiff-4.pc
- all: all-recursive
-
@@ -485,19 +485,6 @@ distclean-libtool:
-rm -f libtool config.lt
install-dist_docDATA: $(dist_doc_DATA)
Index: graphics/waffle/Makefile
===================================================================
--- graphics/waffle/Makefile
+++ graphics/waffle/Makefile
@@ -11,7 +11,7 @@
LICENSE= BSD2CLAUSE
-USES= cmake:outsource compiler:c11 localbase ninja pkgconfig tar:xz
+USES= cmake:outsource compiler:c11 localbase ninja pathfix pkgconfig tar:xz
USE_GL= egl gl
USE_LDCONFIG= yes
USE_XORG= x11 xcb
Index: graphics/waffle/files/patch-CMakeLists.txt
===================================================================
--- graphics/waffle/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2015-01-22 20:00:17 UTC
-+++ CMakeLists.txt
-@@ -136,7 +136,7 @@ configure_file(waffle.pc.in ${waffle_lib
-
- install(
- FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig
- COMPONENT pkgconfig
- )
-
Index: graphics/zathura/Makefile
===================================================================
--- graphics/zathura/Makefile
+++ graphics/zathura/Makefile
@@ -20,7 +20,8 @@
BUILD_DEPENDS+= rst2html:textproc/py-docutils
USE_GNOME= glib20 gtk30 gdkpixbuf2
-USES= compiler:c11 gmake pkgconfig
+USES= compiler:c11 gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
MAKE_ENV= SFLAGS="${STRIP}" \
RSTTOMAN=${LOCALBASE}/bin/rst2man \
ZLIB_INC= \
@@ -39,7 +40,6 @@
post-patch: .SILENT
${REINPLACE_CMD} -e 's|man[15]|man/&|g' \
- -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
${WRKSRC}/config.mk
Index: graphics/zbar/Makefile
===================================================================
--- graphics/zbar/Makefile
+++ graphics/zbar/Makefile
@@ -14,7 +14,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= iconv jpeg libtool gmake pkgconfig
+USES= iconv jpeg libtool gmake pathfix pkgconfig
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --with-jpeg=yes
@@ -52,10 +52,6 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-post-patch:
- @${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
post-patch-DOCS-off:
@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
${WRKSRC}/Makefile.in
Index: irc/ctrlproxy/Makefile
===================================================================
--- irc/ctrlproxy/Makefile
+++ irc/ctrlproxy/Makefile
@@ -16,7 +16,8 @@
USE_GNOME= glib20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USES= pkgconfig gmake
+USES= gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: irc/ctrlproxy/files/patch-Makefile
===================================================================
--- irc/ctrlproxy/files/patch-Makefile
+++ irc/ctrlproxy/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig Sun Apr 15 14:17:58 2007
-+++ Makefile Sat Jun 16 12:00:33 2007
-@@ -108,7 +108,7 @@
- ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in
+--- Makefile.orig 2008-12-06 17:36:33 UTC
++++ Makefile
+@@ -145,7 +145,7 @@ endif
+ ctrlproxy.pc Makefile.settings config.h: configure Makefile.settings.in ctrlproxy.pc.in
./$<
-install: all install-dirs install-bin install-header install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
@@ -9,7 +9,7 @@
install-dirs:
$(INSTALL) -d $(DESTDIR)$(modulesdir)
-@@ -133,7 +133,6 @@
+@@ -177,7 +177,6 @@ doc::
install-doc:: doc
$(INSTALL) -d $(DESTDIR)$(docdir)
@@ -17,14 +17,3 @@
uninstall-doc:
$(MAKE) -C doc uninstall
-@@ -156,8 +154,8 @@
- $(INSTALL) -m 0644 config.admin $(DESTDIR)$(DEFAULT_CONFIG_DIR)/networks/admin
-
- install-pkgconfig:
-- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-- $(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(libdir)/pkgconfig
-+ $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
-+ $(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
-
- uninstall-pkgconfig:
- -rm -f $(DESTDIR)$(libdir)/pkgconfig/ctrlproxy.pc
Index: irc/znc/Makefile
===================================================================
--- irc/znc/Makefile
+++ irc/znc/Makefile
@@ -16,7 +16,7 @@
GNU_CONFIGURE= yes
USE_RC_SUBR= znc
-USES= compiler:c++11-lib cpe gmake iconv pkgconfig
+USES= compiler:c++11-lib cpe gmake iconv pathfix pkgconfig
MAKE_ENV= V=1
PORTDOCS= README.md
@@ -66,9 +66,6 @@
post-patch:
@${REINPLACE_CMD} -e \
- 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e \
's#/usr/local#${LOCALBASE}#' ${WRKSRC}/configure
post-install-DOCS-on:
Index: korean/libhangul/Makefile
===================================================================
--- korean/libhangul/Makefile
+++ korean/libhangul/Makefile
@@ -19,7 +19,6 @@
USE_GITHUB= yes
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
TEST_TARGET= test
TEST_WRKSRC= ${WRKSRC}/test
USE_LDCONFIG= yes
Index: lang/cjs/Makefile
===================================================================
--- lang/cjs/Makefile
+++ lang/cjs/Makefile
@@ -21,7 +21,6 @@
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
Index: lang/gcc/Makefile
===================================================================
--- lang/gcc/Makefile
+++ lang/gcc/Makefile
@@ -32,7 +32,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -128,7 +128,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc/files/java-patch-hier
===================================================================
--- lang/gcc/files/java-patch-hier
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in (revision 117734)
-+++ libjava/Makefile.in (working copy)
-@@ -712,7 +712,7 @@
- $(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
Index: lang/gcc46/Makefile
===================================================================
--- lang/gcc46/Makefile
+++ lang/gcc46/Makefile
@@ -33,7 +33,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64
-USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -96,7 +96,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc46/files/java-patch-hier
===================================================================
--- lang/gcc46/files/java-patch-hier
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in (revision 117734)
-+++ libjava/Makefile.in (working copy)
-@@ -712,7 +712,7 @@
- $(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
Index: lang/gcc47/Makefile
===================================================================
--- lang/gcc47/Makefile
+++ lang/gcc47/Makefile
@@ -33,7 +33,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64
-USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -104,7 +104,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc47/files/java-patch-hier
===================================================================
--- lang/gcc47/files/java-patch-hier
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in (revision 117734)
-+++ libjava/Makefile.in (working copy)
-@@ -712,7 +712,7 @@
- $(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
Index: lang/gcc48/Makefile
===================================================================
--- lang/gcc48/Makefile
+++ lang/gcc48/Makefile
@@ -34,7 +34,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64
-USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -118,7 +118,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc48/files/java-patch-hier
===================================================================
--- lang/gcc48/files/java-patch-hier
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in (revision 117734)
-+++ libjava/Makefile.in (working copy)
-@@ -712,7 +712,7 @@
- $(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
- @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
Index: lang/gcc49/Makefile
===================================================================
--- lang/gcc49/Makefile
+++ lang/gcc49/Makefile
@@ -32,7 +32,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -132,7 +132,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc49/files/java-patch-hier
===================================================================
--- lang/gcc49/files/java-patch-hier
+++ /dev/null
@@ -1,12 +0,0 @@
---- UTC
---- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
-+++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
-@@ -941,7 +941,7 @@
- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(toolexeclibdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
- $(am__append_5)
Index: lang/gcc5-devel/Makefile
===================================================================
--- lang/gcc5-devel/Makefile
+++ lang/gcc5-devel/Makefile
@@ -34,7 +34,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -135,7 +135,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc5-devel/files/java-patch-hier
===================================================================
--- lang/gcc5-devel/files/java-patch-hier
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
-+++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
-@@ -941,7 +941,7 @@
- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(toolexeclibdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
- $(am__append_5)
Index: lang/gcc5/Makefile
===================================================================
--- lang/gcc5/Makefile
+++ lang/gcc5/Makefile
@@ -34,7 +34,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -135,7 +135,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc5/files/java-patch-hier
===================================================================
--- lang/gcc5/files/java-patch-hier
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
-+++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
-@@ -941,7 +941,7 @@
- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(toolexeclibdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
- $(am__append_5)
Index: lang/gcc6-devel/Makefile
===================================================================
--- lang/gcc6-devel/Makefile
+++ lang/gcc6-devel/Makefile
@@ -36,7 +36,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -138,7 +138,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc6-devel/files/java-patch-hier
===================================================================
--- lang/gcc6-devel/files/java-patch-hier
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
-+++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
-@@ -941,7 +941,7 @@
- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(toolexeclibdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
- $(am__append_5)
Index: lang/gcc6/Makefile
===================================================================
--- lang/gcc6/Makefile
+++ lang/gcc6/Makefile
@@ -36,7 +36,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -139,7 +139,6 @@
BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \
zip:archivers/zip
RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45
-EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
LANGUAGES:= ${LANGUAGES},java
INFO+= gcc${SUFFIX}/cp-tools \
Index: lang/gcc6/files/java-patch-hier
===================================================================
--- lang/gcc6/files/java-patch-hier
+++ /dev/null
@@ -1,11 +0,0 @@
---- libjava/Makefile.in 2013-05-26 22:33:07.000000000 +0000
-+++ libjava/Makefile.in 2013-05-31 21:19:23.000000000 +0000
-@@ -941,7 +941,7 @@
- @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA =
- @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
- dbexec_LTLIBRARIES = libjvm.la
--pkgconfigdir = $(toolexeclibdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
- $(am__append_5)
Index: lang/gcc7-devel/Makefile
===================================================================
--- lang/gcc7-devel/Makefile
+++ lang/gcc7-devel/Makefile
@@ -34,7 +34,7 @@
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
-USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USES= compiler cpe gmake iconv libtool makeinfo pathfix perl5 tar:bzip2
USE_BINUTILS= yes
USE_PERL5= build
SSP_UNSAFE= yes
Index: lang/python27/Makefile
===================================================================
--- lang/python27/Makefile
+++ lang/python27/Makefile
@@ -12,7 +12,8 @@
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -28,7 +29,6 @@
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
PLIST_SUB= ABI=${ABIFLAGS} \
Index: lang/python33/Makefile
===================================================================
--- lang/python33/Makefile
+++ lang/python33/Makefile
@@ -16,7 +16,8 @@
DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5
EXPIRATION_DATE= 2017-09-01
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -28,7 +29,6 @@
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
TEST_TARGET= buildbottest
Index: lang/python34/Makefile
===================================================================
--- lang/python34/Makefile
+++ lang/python34/Makefile
@@ -13,7 +13,8 @@
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -30,7 +31,6 @@
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
SUB_FILES= pkg-message
Index: lang/python35/Makefile
===================================================================
--- lang/python35/Makefile
+++ lang/python35/Makefile
@@ -14,7 +14,8 @@
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -37,7 +38,6 @@
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
SUB_FILES= pkg-message
Index: lang/qore/Makefile
===================================================================
--- lang/qore/Makefile
+++ lang/qore/Makefile
@@ -42,6 +42,5 @@
post-configure:
${REINPLACE_CMD} -e 's|; make|; $${MAKE}|g' ${WRKSRC}/Makefile.in
- ${REINPLACE_CMD} -e 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#g' ${WRKSRC}/Makefile.in
.include <bsd.port.post.mk>
Index: lang/smalltalk/Makefile
===================================================================
--- lang/smalltalk/Makefile
+++ lang/smalltalk/Makefile
@@ -23,7 +23,7 @@
PGSQL_USES= pgsql
SDL_USE= SDL=image,mixer,sdl,sound,ttf
-USES= execinfo gmake iconv libtool localbase makeinfo pkgconfig \
+USES= execinfo gmake iconv libtool localbase makeinfo pathfix pkgconfig \
shebangfix sqlite tar:xz
USE_GNOME= pango
USE_XORG= ice xi xmu
@@ -56,8 +56,6 @@
${WRKSRC}/libgst/prims.inl
@${REINPLACE_CMD} -e '/^ac_include/s/\\$$/#include <wctype.h> \\/' \
${WRKSRC}/snprintfv/configure
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
post-build:
@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \
Index: mail/dspam/Makefile
===================================================================
--- mail/dspam/Makefile
+++ mail/dspam/Makefile
@@ -76,7 +76,7 @@
SETUID_DESC= Run as root:mail with setuid (insecure)
MAKE_JOBS_UNSAFE= yes
-USES= perl5 libtool shebangfix
+USES= perl5 libtool pathfix shebangfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -512,13 +512,6 @@
.endif
post-install:
-########
-# stupid hack until I figure out where/how to patch
- @${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
- ${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
- ${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true
-
.if ${PORT_OPTIONS:MEXAMPLES}
.if ${PORT_OPTIONS:MMYSQL}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
Index: mail/evolution-mapi/Makefile
===================================================================
--- mail/evolution-mapi/Makefile
+++ mail/evolution-mapi/Makefile
@@ -17,7 +17,7 @@
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool pkgconfig tar:xz
+USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
USE_GNOME= intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -28,8 +28,6 @@
INSTALL_TARGET= install-strip
post-patch:
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/src/libexchangemapi/Makefile.in
@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-e 's|$$(prefix)/$$(DATADIRNAME)/|$$(prefix)/share/|g' \
${WRKSRC}/configure
Index: mail/libmapi/Makefile
===================================================================
--- mail/libmapi/Makefile
+++ mail/libmapi/Makefile
@@ -29,6 +29,7 @@
USE_MYSQL= yes
USES= autoreconf:build bison compiler:c++11-lib gmake pathfix \
pkgconfig python shebangfix sqlite
+PATHFIX_MAKEFILEIN= Makefile
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -44,7 +45,6 @@
setup/openchange_neworganization \
setup/openchange_newuser \
setup/openchange_provision
-PATHFIX_MAKEFILEIN= Makefile.am
OPTIONS_SUB= yes
OPTIONS_DEFINE= BOOST DOXYGEN
@@ -71,8 +71,7 @@
# --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
post-patch:
- @${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g; \
- s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,g" \
+ @${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g" \
${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|g' \
${WRKSRC}/configure.ac
Index: math/R/Makefile
===================================================================
--- math/R/Makefile
+++ math/R/Makefile
@@ -35,7 +35,7 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
ONLY_FOR_ARCHS= i386 amd64
-USES= fortran iconv libtool localbase objc:compiler perl5 \
+USES= fortran iconv libtool localbase objc:compiler pathfix perl5 \
readline
USE_PERL5= build
@@ -147,9 +147,6 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\
- ${WRKSRC}/src/nmath/standalone/Makefile.in \
- ${WRKSRC}/src/unix/Makefile.in
@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
${WRKSRC}/configure
Index: math/coinmp/Makefile
===================================================================
--- math/coinmp/Makefile
+++ math/coinmp/Makefile
@@ -18,7 +18,7 @@
CONFLICTS= clp-[0-9]* ogdf-[0-9]*
GNU_CONFIGURE= yes
-USES= libtool pkgconfig tar:tgz
+USES= libtool pathfix pkgconfig tar:tgz
USE_LDCONFIG= yes
CONFIGURE_ARGS+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig
CXXFLAGS+= -ffast-math
@@ -40,8 +40,7 @@
libCgl libCbc libCbcSolver libOsiCbc libCoinMP
post-patch::
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
Index: math/cvc3/Makefile
===================================================================
--- math/cvc3/Makefile
+++ math/cvc3/Makefile
@@ -18,14 +18,14 @@
--with-extra-libs=${LOCALBASE}/lib
CXXFLAGS+= -fPIC
GNU_CONFIGURE= yes
-USES= bison gmake perl5
+USES= bison gmake pathfix perl5
+PATHFIX_MAKEFILEIN= Makefile
USE_GCC= any
USE_LDCONFIG= yes
post-patch:
${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/Makefile.std
${REINPLACE_CMD} -e 's,.*$$(LDCONFIG).*,,' ${WRKSRC}/src/Makefile
- ${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' ${WRKSRC}/src/Makefile
post-install:
${INSTALL_PROGRAM} `readlink ${WRKSRC}/bin/cvc3` ${STAGEDIR}${PREFIX}/bin
Index: math/cvc3/files/patch-src-Makefile
===================================================================
--- math/cvc3/files/patch-src-Makefile
+++ math/cvc3/files/patch-src-Makefile
@@ -32,12 +32,12 @@
endif
- mkdir -p $(bindir)
- $(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(bindir)
-- mkdir -p $(libdir)/pkgconfig
-- $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(libdir)/pkgconfig
+- mkdir -p $(prefix)/libdata/pkgconfig
+- $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(prefix)/libdata/pkgconfig
+ mkdir -p $(DESTDIR)$(bindir)
+ $(INSTALL) $(INSTALL_FLAGS) -m 755 $(CVC_EXE) $(DESTDIR)$(bindir)
-+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-+ $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(libdir)/pkgconfig
++ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
++ $(INSTALL) $(INSTALL_FLAGS) -m 644 cvc3.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
ifndef FILELIST
FILELIST = /dev/null
Index: math/fann/Makefile
===================================================================
--- math/fann/Makefile
+++ math/fann/Makefile
@@ -12,10 +12,7 @@
WRKSRC= ${WRKDIR}/FANN-2.2.0-Source
-USES= cmake zip
+USES= cmake pathfix zip
USE_LDCONFIG= yes
-post-patch:
- ${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/CMakeLists.txt
-
.include <bsd.port.mk>
Index: math/hfst/Makefile
===================================================================
--- math/hfst/Makefile
+++ math/hfst/Makefile
@@ -9,7 +9,7 @@
MAINTAINER= demon@FreeBSD.org
COMMENT= A toolkit for for processing natural language morphologies
-USES= libtool pkgconfig python:2 readline shebangfix
+USES= libtool pathfix pkgconfig python:2 readline shebangfix
USE_GNOME= glib20 libxml2
USE_GCC= yes
GNU_CONFIGURE= yes
Index: math/hfst/files/patch-libhfst-Makefile.in
===================================================================
--- math/hfst/files/patch-libhfst-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libhfst/Makefile.in.orig 2014-07-05 18:38:21.000000000 +0400
-+++ libhfst/Makefile.in 2014-07-05 18:39:40.000000000 +0400
-@@ -287,7 +287,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = hfst.pc
- all: all-recursive
-
Index: math/igraph/Makefile
===================================================================
--- math/igraph/Makefile
+++ math/igraph/Makefile
@@ -14,7 +14,7 @@
LIB_DEPENDS= libgmp.so:math/gmp
GNU_CONFIGURE= yes
-USES= gmake libtool
+USES= gmake libtool pathfix
USE_GNOME= libxml2
CONFIGURE_ARGS+= --enable-gmp
CFLAGS+= -I${LOCALBASE}/include
@@ -22,10 +22,6 @@
CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
-post-patch:
- @${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
Index: math/ipopt/Makefile
===================================================================
--- math/ipopt/Makefile
+++ math/ipopt/Makefile
@@ -16,12 +16,12 @@
LICENSE= EPL
-USES= blaslapack fortran libtool pkgconfig tar:tgz
+USES= blaslapack fortran libtool pathfix pkgconfig tar:tgz
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
-CONFIGURE_ENV+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig \
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${PREFIX}/libdata/pkgconfig \
CXX="${CXX} -B${LOCALBASE}/bin"
CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib"
@@ -33,11 +33,6 @@
DEBUG_CXXFLAGS= -fomit-frame-pointer
-post-patch::
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
- -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g'
-
post-extract:
@(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." )
@(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS});
Index: math/jags/Makefile
===================================================================
--- math/jags/Makefile
+++ math/jags/Makefile
@@ -19,7 +19,7 @@
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= bison compiler:features fortran gmake libtool localbase
+USES= bison compiler:features fortran gmake libtool localbase pathfix
USE_GCC= yes
USE_LDCONFIG= yes
@@ -58,8 +58,6 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/etc/Makefile.in
@${REINPLACE_CMD} \
-e '/@WINDOWS_FALSE@bin_SCRIPTS =/s/jags/mcmc-&/' \
-e '/CLEANFILES =/s/jags/mcmc-&/' \
Index: math/nlopt/Makefile
===================================================================
--- math/nlopt/Makefile
+++ math/nlopt/Makefile
@@ -28,8 +28,6 @@
pkgconfig python:2
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
-
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Index: math/ufc/Makefile
===================================================================
--- math/ufc/Makefile
+++ math/ufc/Makefile
@@ -22,8 +22,6 @@
MMVERSION= 2.2
post-patch:
- ${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
- ${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -i '' -e 's|os.path.join(os.path.sep, "usr")|os.path.normpath("${PREFIX}")|' ${WRKSRC}/src/utils/python/ufc_utils/build.py
.include <bsd.port.mk>
Index: misc/talkfilters/Makefile
===================================================================
--- misc/talkfilters/Makefile
+++ misc/talkfilters/Makefile
@@ -15,7 +15,7 @@
CONFLICTS= jive* chef* filters-*
-USES= libtool
+USES= libtool pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -29,10 +29,6 @@
post-patch:
@${RM} -f ${WRKSRC}/*.info*
- @${REINPLACE_CMD} -e \
- 's|^\(pkgconfigdir\ =\ \).*|\1$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.am \
- ${WRKSRC}/Makefile.in
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalkfilters.so*
Index: multimedia/gstreamer-qt4/Makefile
===================================================================
--- multimedia/gstreamer-qt4/Makefile
+++ multimedia/gstreamer-qt4/Makefile
@@ -17,7 +17,7 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-USES= bison cmake gmake kde:4 pkgconfig tar:bzip2
+USES= bison cmake gmake kde:4 pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
USE_GSTREAMER= yes
USE_GNOME= glib20
@@ -32,8 +32,4 @@
CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
-post-extract:
- @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/CMakeLists.txt
-
.include <bsd.port.mk>
Index: multimedia/gstreamer1-vaapi/Makefile
===================================================================
--- multimedia/gstreamer1-vaapi/Makefile
+++ multimedia/gstreamer1-vaapi/Makefile
@@ -26,9 +26,4 @@
# drm backend needs libudev so disable it for now.
CONFIGURE_ARGS+=--disable-drm
-# manual since pathfix doesn't work.
-post-patch:
- @${REINPLACE_CMD} -e 's|[{]libdir[}]/pkgconfig|{prefix}/libdata/pkgconfig|g' \
- ${WRKSRC}/configure
-
.include <bsd.port.mk>
Index: multimedia/kvazaar/Makefile
===================================================================
--- multimedia/kvazaar/Makefile
+++ multimedia/kvazaar/Makefile
@@ -20,7 +20,6 @@
CONFLICTS_INSTALL?= ${PORTNAME}-devel
USES= autoreconf compiler:c11 libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
TEST_TARGET= check
INSTALL_TARGET= install-strip
Index: multimedia/libass/Makefile
===================================================================
--- multimedia/libass/Makefile
+++ multimedia/libass/Makefile
@@ -19,7 +19,6 @@
USES= autoreconf iconv libtool pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN=Makefile.am
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= HARFBUZZ
Index: multimedia/libav/Makefile
===================================================================
--- multimedia/libav/Makefile
+++ multimedia/libav/Makefile
@@ -15,7 +15,8 @@
libvdpau.so:multimedia/libvdpau \
libhogweed.so:security/nettle
-USES= cpe gmake perl5 pkgconfig tar:xz
+USES= cpe gmake perl5 pathfix pkgconfig tar:xz
+PATHFIX_MAKEFILEIN= library.mak
USE_XORG= x11
HAS_CONFIGURE= yes
USE_PERL5= build
@@ -215,8 +216,6 @@
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
${WRKSRC}/configure \
${WRKSRC}/libavcodec/libgsmdec.c
- @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/library.mak
post-configure-DOCS-off:
@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
Index: multimedia/libav/files/patch-library.mak
===================================================================
--- multimedia/libav/files/patch-library.mak
+++ multimedia/libav/files/patch-library.mak
@@ -6,6 +6,6 @@
-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)-libav.pc
- $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
- $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
+ $(Q)mkdir -p "$(PREFIX)/libdata/pkgconfig"
+ $$(INSTALL) -m 644 $$^ "$(PREFIX)/libdata/pkgconfig"
Index: multimedia/libde265/Makefile
===================================================================
--- multimedia/libde265/Makefile
+++ multimedia/libde265/Makefile
@@ -16,6 +16,4 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-sherlock265 --disable-dec265
-PATHFIX_MAKEFILEIN= Makefile.am
-
.include <bsd.port.mk>
Index: multimedia/libkate/Makefile
===================================================================
--- multimedia/libkate/Makefile
+++ multimedia/libkate/Makefile
@@ -17,7 +17,7 @@
libpng.so:graphics/png
GNU_CONFIGURE= yes
-USES= pkgconfig gmake libtool
+USES= pathfix pkgconfig gmake libtool
USE_LDCONFIG= yes
CFLAGS+= "-I${LOCALBASE}/include"
@@ -51,10 +51,6 @@
.endif
post-patch:
- @${REINPLACE_CMD} -E -e \
- "s|^(katepcdir =).*|\1 ${PREFIX}/libdata/pkgconfig|" \
- ${WRKSRC}/Makefile.in
-
.if ! ${PORT_OPTIONS:MKATEDJ}
@${REINPLACE_CMD} -e \
"s| HAVE_PYTHON_TRUE=$$| HAVE_PYTHON_TRUE='#'|; \
Index: multimedia/libtheora/Makefile
===================================================================
--- multimedia/libtheora/Makefile
+++ multimedia/libtheora/Makefile
@@ -19,7 +19,7 @@
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-USES= libtool tar:bzip2
+USES= libtool pathfix tar:bzip2
USE_LDCONFIG= yes
.include <bsd.port.options.mk>
Index: multimedia/libtheora/files/patch-Makefile.in
===================================================================
--- multimedia/libtheora/files/patch-Makefile.in
+++ multimedia/libtheora/files/patch-Makefile.in
@@ -1,14 +1,5 @@
--- Makefile.in.orig 2009-10-01 18:04:07.000000000 +0000
+++ Makefile.in 2009-12-21 01:17:02.000000000 +0000
-@@ -177,7 +177,7 @@
- theora-uninstalled.pc.in
-
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = theora.pc theoradec.pc theoraenc.pc
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -200,7 +200,7 @@
missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
theoradec-uninstalled.pc.in theoradec.pc.in \
Index: multimedia/mlt/Makefile
===================================================================
--- multimedia/mlt/Makefile
+++ multimedia/mlt/Makefile
@@ -23,6 +23,7 @@
USE_SDL= image
USE_XORG= x11
USES= alias gmake iconv pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-gpl --enable-gpl3 --target-os=FreeBSD
USE_LDCONFIG= yes
@@ -120,8 +121,6 @@
${WRKSRC}/src/framework/Makefile \
${WRKSRC}/src/melt/Makefile \
${WRKSRC}/src/modules/*/Makefile
- @${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
- ${WRKSRC}/Makefile
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${STAGEDIR}${MANPREFIX}/man/man1/melt.1
Index: multimedia/vapoursynth/Makefile
===================================================================
--- multimedia/vapoursynth/Makefile
+++ multimedia/vapoursynth/Makefile
@@ -12,7 +12,6 @@
USE_GITHUB= yes
USES= autoreconf gmake libtool localbase pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
INSTALL_TARGET= install-strip
Index: net-im/libaccounts-glib/Makefile
===================================================================
--- net-im/libaccounts-glib/Makefile
+++ net-im/libaccounts-glib/Makefile
@@ -23,7 +23,6 @@
USES= autoreconf gmake libtool pathfix pkgconfig python sqlite:3
USE_GNOME= pygobject3 introspection libxml2
-PATHFIX_MAKEFILEIN=Makefile.am
# GitLab variables.
GL_ACCOUNT= accounts-sso
Index: net-im/telepathy-farstream/Makefile
===================================================================
--- net-im/telepathy-farstream/Makefile
+++ net-im/telepathy-farstream/Makefile
@@ -23,8 +23,4 @@
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
- ${WRKSRC}/telepathy-farstream/Makefile.in
-
.include <bsd.port.mk>
Index: net-im/tox/Makefile
===================================================================
--- net-im/tox/Makefile
+++ net-im/tox/Makefile
@@ -23,7 +23,6 @@
CONFIGURE_ARGS= --enable-tests
USES= autoreconf compiler:c11 libtool pathfix pkgconfig
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= DAEMON
Index: net-mgmt/ccnet/Makefile
===================================================================
--- net-mgmt/ccnet/Makefile
+++ net-mgmt/ccnet/Makefile
@@ -29,7 +29,6 @@
python:-2.7 shebangfix ssl
USE_LDCONFIG= yes
SHEBANG_FILES= tools/*.py
-PATHFIX_MAKEFILEIN= Makefile.am
CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
GNU_CONFIGURE= yes
Index: net-mgmt/seafile/Makefile
===================================================================
--- net-mgmt/seafile/Makefile
+++ net-mgmt/seafile/Makefile
@@ -40,8 +40,6 @@
USE_LDCONFIG= yes
CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
-PATHFIX_MAKEFILEIN= Makefile.am
-
CONFIGURE_ARGS= --enable-server
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/evhtp
Index: net/GeoIP/Makefile
===================================================================
--- net/GeoIP/Makefile
+++ net/GeoIP/Makefile
@@ -16,7 +16,6 @@
GH_PROJECT= geoip-api-c
USES= autoreconf libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Index: net/geoipupdate/Makefile
===================================================================
--- net/geoipupdate/Makefile
+++ net/geoipupdate/Makefile
@@ -18,7 +18,6 @@
GH_ACCOUNT= maxmind
USES= libtool localbase pathfix autoreconf
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
.include <bsd.port.mk>
Index: net/kea/Makefile
===================================================================
--- net/kea/Makefile
+++ net/kea/Makefile
@@ -14,7 +14,7 @@
LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \
libboost_system.so:devel/boost-libs
-USES= libtool python:3.3+ autoreconf
+USES= autoreconf libtool pathfix python:3.3+
USE_LDCONFIG= yes
USE_OPENSSL= yes
USE_RC_SUBR= ${PORTNAME}
Index: net/kea/files/patch-Makefile.am
===================================================================
--- net/kea/files/patch-Makefile.am
+++ net/kea/files/patch-Makefile.am
@@ -9,12 +9,3 @@
EXTRA_DIST = tools/path_replacer.sh
EXTRA_DIST += tools/mk_cfgrpt.sh
-@@ -114,7 +114,7 @@ EXTRA_DIST += tools/mk_cfgrpt.sh
- #### include external sources in the distributed tarball:
- EXTRA_DIST += ext/coroutine/coroutine.h
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = dns++.pc
-
- CLEANFILES = $(abs_top_builddir)/logger_lockfile
Index: net/libilbc/Makefile
===================================================================
--- net/libilbc/Makefile
+++ net/libilbc/Makefile
@@ -21,7 +21,7 @@
USE_GITHUB= yes
GH_ACCOUNT= TimothyGu
-USES= cmake
+USES= cmake pathfix
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: net/libilbc/files/patch-CMakeLists.txt
===================================================================
--- net/libilbc/files/patch-CMakeLists.txt
+++ net/libilbc/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2014-12-14 19:34:22 UTC
+--- CMakeLists.txt.orig 2016-10-04 12:45:35 UTC
+++ CMakeLists.txt
@@ -50,7 +50,6 @@ else()
endif()
@@ -20,7 +20,7 @@
endif()
###################################################################################################
-@@ -186,18 +186,15 @@ endif()
+@@ -186,12 +186,7 @@ endif()
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "${prefix}")
set(includedir "${prefix}/include")
@@ -33,11 +33,8 @@
+set(libdir "${exec_prefix}/lib")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libilbc.pc
-- DESTINATION ${libdir}/pkgconfig)
-+ DESTINATION ${prefix}/libdata/pkgconfig)
- install(FILES ilbc/interface/ilbc.h
- DESTINATION ${includedir})
- install(TARGETS ilbc
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
+@@ -201,3 +196,5 @@ install(TARGETS ilbc
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${libdir}
RUNTIME DESTINATION bin)
Index: net/librdkafka/Makefile
===================================================================
--- net/librdkafka/Makefile
+++ net/librdkafka/Makefile
@@ -23,7 +23,7 @@
USES= gmake perl5 python shebangfix ssl
SHEBANG_FILES= lds-gen.py
GNU_CONFIGURE= yes
-MAKE_ENV= pkgconfigdir=${PREFIX}/libdata/pkgconfig
+MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
Index: net/librdkafka/files/patch-mklove_Makefile.base
===================================================================
--- net/librdkafka/files/patch-mklove_Makefile.base
+++ /dev/null
@@ -1,11 +0,0 @@
---- mklove/Makefile.base.orig 2016-06-16 02:56:41 UTC
-+++ mklove/Makefile.base
-@@ -54,7 +54,7 @@ docdir?= $(datarootdir)/doc/$(PKGNAME)
- infodir?= $(datarootdir)/info
- libdir?= $(prefix)/lib
- localedir?= $(datarootdir)/locale
--pkgconfigdir?= $(libdir)/pkgconfig
-+pkgconfigdir?= $(prefix)/libdata/pkgconfig
- mandir?= $(datarootdir)/man
- man1dir?= $(mandir)/man1
- man2dir?= $(mandir)/man2
Index: net/libvncserver/Makefile
===================================================================
--- net/libvncserver/Makefile
+++ net/libvncserver/Makefile
@@ -18,7 +18,6 @@
GH_ACCOUNT= LibVNC
USES= autoreconf jpeg libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
Index: net/mobile-broadband-provider-info/Makefile
===================================================================
--- net/mobile-broadband-provider-info/Makefile
+++ net/mobile-broadband-provider-info/Makefile
@@ -12,7 +12,6 @@
USES= autoreconf pathfix tar:xz
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
PLIST_FILES= ${DATADIR}/serviceproviders.2.dtd \
${DATADIR}/serviceproviders.xml \
Index: net/openbsc/Makefile
===================================================================
--- net/openbsc/Makefile
+++ net/openbsc/Makefile
@@ -20,7 +20,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
-USES= autoreconf compiler:c11 gmake pkgconfig
+USES= autoreconf compiler:c11 gmake pathfix pkgconfig
USE_OPENSSL= yes
GNU_CONFIGURE= yes
AUTOMAKE_ARGS= --gnu --add-missing --copy
@@ -44,8 +44,6 @@
SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
post-patch:
- ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
.include <bsd.port.mk>
Index: net/openggsn/Makefile
===================================================================
--- net/openggsn/Makefile
+++ net/openggsn/Makefile
@@ -15,13 +15,11 @@
LIB_DEPENDS= libosmocore.so:devel/libosmocore
GNU_CONFIGURE= yes
-USES= autoreconf gmake libtool pkgconfig
+USES= autoreconf gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
post-patch:
- ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
post-stage:
Index: net/openpgm/Makefile
===================================================================
--- net/openpgm/Makefile
+++ net/openpgm/Makefile
@@ -18,7 +18,6 @@
GNU_CONFIGURE= yes
USES= autoreconf pathfix perl5 libtool python:build
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
WRKSRC_SUBDIR= openpgm/pgm
INSTALL_TARGET= install-strip
Index: net/pacemaker/Makefile
===================================================================
--- net/pacemaker/Makefile
+++ net/pacemaker/Makefile
@@ -43,8 +43,6 @@
--without-heartbeat
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
-
SHEBANG_LANG= sh
sh_OLD_CMD= ${SH}
sh_CMD= ${LOCALBASE}/bin/bash
Index: net/rabbitmq-c-devel/Makefile
===================================================================
--- net/rabbitmq-c-devel/Makefile
+++ net/rabbitmq-c-devel/Makefile
@@ -17,7 +17,7 @@
CONFLICTS= rabbitmq-c-[0-9]*
-USES= cmake python tar:bzip2
+USES= cmake pathfix python tar:bzip2
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= alanxz
@@ -29,9 +29,4 @@
POPT_CFLAGS= -I${LOCALBASE}/include
POPT_LDFLAGS= -L${LOCALBASE}/lib
-post-stage:
- ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/librabbitmq.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/librabbitmq.pc
- ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
-
.include <bsd.port.mk>
Index: net/shadowsocks-libev/Makefile
===================================================================
--- net/shadowsocks-libev/Makefile
+++ net/shadowsocks-libev/Makefile
@@ -16,7 +16,7 @@
GH_ACCOUNT= madeye
GNU_CONFIGURE= yes
-USES= gmake libtool:keepla ssl
+USES= gmake libtool:keepla pathfix ssl
CPPFLAGS+= -I${OPENSSLINC}
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
@@ -26,8 +26,6 @@
USE_RC_SUBR= shadowsocks_libev
post-patch:
- ${REINPLACE_CMD} -e 's|^pkgconfiglibdir.*|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \
${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
Index: polish/gnugadu2/Makefile
===================================================================
--- polish/gnugadu2/Makefile
+++ polish/gnugadu2/Makefile
@@ -16,7 +16,7 @@
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= gettext gmake perl5 pkgconfig tar:bzip2 libtool
+USES= gettext gmake pathfix perl5 pkgconfig tar:bzip2 libtool
USE_GNOME= gtk20
USE_LDCONFIG= yes
USE_XORG= x11 xaw ice xscrnsaver
@@ -80,7 +80,7 @@
post-patch:
@${REINPLACE_CMD} -e 's,=.*},=${PREFIX},' ${WRKSRC}/src/plugins/dbus/org.freedesktop.im.GG.service
- @${REINPLACE_CMD} -e 's, -ldl,, ; s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' ${WRKSRC}/lib/Makefile.in
+ @${REINPLACE_CMD} -e 's, -ldl,,' ${WRKSRC}/lib/Makefile.in
@${REINPLACE_CMD} -e 's,(datadir)/pixmaps,(datadir)/icons/hicolor/48x48/apps,' ${WRKSRC}/pixmaps/Makefile.in
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/plugins/GUI/gtkimhtml.c
Index: polish/libgadu/Makefile
===================================================================
--- polish/libgadu/Makefile
+++ polish/libgadu/Makefile
@@ -20,7 +20,6 @@
GH_ACCOUNT= wojtekka
USES= autoreconf gmake libtool localbase pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --disable-static --with-pthread \
--disable-tests --without-gnutls
Index: print/libijs/Makefile
===================================================================
--- print/libijs/Makefile
+++ print/libijs/Makefile
@@ -13,7 +13,7 @@
LICENSE= MIT
-USES= gmake libtool pkgconfig tar:bzip2
+USES= gmake libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Index: print/libijs/files/patch-Makefile.in
===================================================================
--- print/libijs/files/patch-Makefile.in
+++ print/libijs/files/patch-Makefile.in
@@ -1,14 +1,5 @@
--- Makefile.in.orig Wed Feb 11 20:51:54 2004
+++ Makefile.in Thu Mar 11 13:37:51 2004
-@@ -117,7 +117,7 @@
-
- MAINT_CHARSET = latin1
- m4datadir = $(datadir)/aclocal
--pkgconfigdatadir = $(prefix)/lib/pkgconfig
-+pkgconfigdatadir = $(prefix)/libdata/pkgconfig
-
- lib_LTLIBRARIES = libijs.la
-
@@ -143,12 +143,12 @@
@SYSDEPS_WINDOWS_TRUE@libijs_la_LIBADD = ijs_exec_win.lo $(IJS_DEPLIBS)
@SYSDEPS_WINDOWS_FALSE@libijs_la_LIBADD = ijs_exec_unix.lo $(IJS_DEPLIBS)
Index: print/panda/Makefile
===================================================================
--- print/panda/Makefile
+++ print/panda/Makefile
@@ -25,7 +25,6 @@
INSTALL_TARGET= install-strip
USES= autoreconf bdb dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2
DOS2UNIX_GLOB= *.c
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS EXAMPLES
Index: print/tex-ptexenc/Makefile
===================================================================
--- print/tex-ptexenc/Makefile
+++ print/tex-ptexenc/Makefile
@@ -15,7 +15,7 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USES= iconv libtool pkgconfig tar:xz
+USES= iconv libtool pathfix pkgconfig tar:xz
USE_TEX= kpathsea
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/texk/ptexenc
Index: print/tex-ptexenc/files/patch-Makefile.in
===================================================================
--- print/tex-ptexenc/files/patch-Makefile.in
+++ print/tex-ptexenc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2015-03-12 14:42:02 UTC
+--- Makefile.in.orig 2016-10-04 13:42:08 UTC
+++ Makefile.in
-@@ -396,9 +396,10 @@ libptexenc_la_SOURCES = \
+@@ -396,7 +396,8 @@ libptexenc_la_SOURCES = \
libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
nobase_include_HEADERS = \
ptexenc/ptexenc.h \
@@ -8,8 +8,5 @@
+ ptexenc/unicode.h \
+ ptexenc/unicode-jp.h
--pkgconfigdir = ${libdir}/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = ptexenc.pc
- EXTRA_DIST = COPYRIGHT ChangeLog.jp
-
Index: science/chemical-mime-data/Makefile
===================================================================
--- science/chemical-mime-data/Makefile
+++ science/chemical-mime-data/Makefile
@@ -12,7 +12,7 @@
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2
-USES= gettext-tools gmake pkgconfig tar:bzip2 shared-mime-info
+USES= gettext-tools gmake pathfix pkgconfig tar:bzip2 shared-mime-info
USE_GNOME= gnomemimedata intlhack libxslt:build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-update-database
@@ -22,7 +22,6 @@
post-patch:
@${REINPLACE_CMD} -e 's|*-*-solaris*|*| ; s|rsvg|rsvg-convert|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|(datadir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|-f png $$< |-f png $$< > |' ${WRKSRC}/icons/hicolor/Makefile.in
.include <bsd.port.mk>
Index: security/clamav/Makefile
===================================================================
--- security/clamav/Makefile
+++ security/clamav/Makefile
@@ -56,7 +56,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= cpe gmake libtool ncurses
+USES= cpe gmake libtool ncurses pathfix
INSTALL_TARGET= install-strip
USE_RC_SUBR= clamav-clamd clamav-freshclam
@@ -177,8 +177,6 @@
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
-e 's|LC_REVISION=22|LC_REVISION=24|' \
${WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
- ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} ${SED_CONF} \
${WRKSRC}/etc/clamd.conf.sample \
${WRKSRC}/etc/freshclam.conf.sample \
Index: security/d0_blind_id/Makefile
===================================================================
--- security/d0_blind_id/Makefile
+++ security/d0_blind_id/Makefile
@@ -15,7 +15,7 @@
GH_ACCOUNT= divVerent
GH_TAGNAME= ff1ce7e
-USES= autoreconf libtool ssl
+USES= autoreconf libtool pathfix ssl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-openssl
USE_LDCONFIG= yes
Index: security/d0_blind_id/files/patch-Makefile.am
===================================================================
--- security/d0_blind_id/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.am.orig 2014-03-17 06:18:23.208622713 +0000
-+++ ./Makefile.am 2014-03-17 06:18:59.472680831 +0000
-@@ -33,7 +33,7 @@
- libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
- library_includedir = $(includedir)/d0_blind_id
- library_include_HEADERS = d0_blind_id.h d0.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_HEADERS = d0_blind_id.pc
-
- if ENABLE_RIJNDAEL
Index: security/sssd/Makefile
===================================================================
--- security/sssd/Makefile
+++ security/sssd/Makefile
@@ -55,7 +55,6 @@
USE_OPENLDAP= yes
USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
python:2 shebangfix gssapi:mit
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
CPE_VENDOR= fedoraproject
Index: security/suricata/Makefile
===================================================================
--- security/suricata/Makefile
+++ security/suricata/Makefile
@@ -28,8 +28,6 @@
INSTALL_TARGET= install-strip
TEST_TARGET= check
-PATHFIX_MAKEFILEIN= Makefile.am
-
OPTIONS_DEFINE= GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS
OPTIONS_DEFAULT= HTP_PORT IPFW JSON NETMAP PRELUDE
OPTIONS_SUB= yes
Index: security/yara/Makefile
===================================================================
--- security/yara/Makefile
+++ security/yara/Makefile
@@ -18,7 +18,6 @@
INSTALL_TARGET= install-strip
USES= alias autoreconf libtool pathfix ssl
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CPPFLAGS+= -isystem ${OPENSSLINC}
LIBS+= -L${OPENSSLLIB}
Index: security/ykpers/Makefile
===================================================================
--- security/ykpers/Makefile
+++ security/ykpers/Makefile
@@ -14,7 +14,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= libtool pkgconfig
+USES= libtool pathfix pkgconfig
PLIST_FILES= bin/ykchalresp \
bin/ykinfo \
@@ -42,10 +42,6 @@
LDFLAGS+= -L/usr/lib
-post-patch:
- @${REINPLACE_CMD} -e 's|^pkgconfigdir = .*|pkgconfigdir = /usr/local/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
-
regression-test: build
@(cd ${WRKSRC}; ${MAKE} check)
Index: shells/bash-completion/Makefile
===================================================================
--- shells/bash-completion/Makefile
+++ shells/bash-completion/Makefile
@@ -17,7 +17,8 @@
USE_AUTOTOOLS= aclocal automake
GNU_CONFIGURE= yes
-USES= gmake tar:bzip2
+USES= gmake pathfix tar:bzip2
+PATHFIX_MAKEFILEIN= Makefile.am
SUB_FILES= pkg-message
SUB_LIST+= RUNFILE=${DATADIR}/bash_completion.sh
Index: shells/bash-completion/files/patch-Makefile.am
===================================================================
--- shells/bash-completion/files/patch-Makefile.am
+++ shells/bash-completion/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am.orig 2013-04-05 09:43:56.000000000 +0000
+--- Makefile.am.orig 2016-10-04 13:52:42 UTC
+++ Makefile.am
-@@ -5,10 +5,10 @@ pkgdata_DATA = bash_completion
+@@ -5,7 +5,7 @@ pkgdata_DATA = bash_completion
# Empty, but here just to get the compat dir created with install
compat_DATA =
@@ -8,11 +8,7 @@
+profiledir = $(prefix)/share/bash-completion
profile_DATA = bash_completion.sh
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = bash-completion.pc
-
- bash_completion.sh: bash_completion.sh.in Makefile
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
@@ -20,8 +20,10 @@ EXTRA_DIST = CHANGES $(sysconf_DATA) $(p
.dir-locals.el
Index: sysutils/afflib/Makefile
===================================================================
--- sysutils/afflib/Makefile
+++ sysutils/afflib/Makefile
@@ -21,7 +21,6 @@
USE_LDCONFIG= yes
USE_OPENSSL= yes
USES= autoreconf fuse libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-s3=yes
INSTALL_TARGET= install-strip
Index: sysutils/cinnamon-control-center/files/patch-shell_Makefile.am
===================================================================
--- sysutils/cinnamon-control-center/files/patch-shell_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/Makefile.orig.am 2013-03-01 11:03:35.043140465 +0100
-+++ shell/Makefile.am 2013-03-01 11:03:42.973113146 +0100
-@@ -67,7 +67,7 @@
-
- libcinnamon_control_center_includedir = $(includedir)/cinnamon-control-center-1/libcinnamon-control-center
-
--pkgconfigdir=$(libdir)/pkgconfig
-+pkgconfigdir=$(prefix)/libdata/pkgconfig
- pkgconfig_DATA=libcinnamon-control-center.pc
-
- AM_CPPFLAGS = \
Index: sysutils/cinnamon-settings-daemon/Makefile
===================================================================
--- sysutils/cinnamon-settings-daemon/Makefile
+++ sysutils/cinnamon-settings-daemon/Makefile
@@ -35,7 +35,6 @@
GH_ACCOUNT= linuxmint
USE_XORG= xxf86misc
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gudev \
Index: sysutils/dateutils/Makefile
===================================================================
--- sysutils/dateutils/Makefile
+++ sysutils/dateutils/Makefile
@@ -12,15 +12,11 @@
BUILD_DEPENDS= help2man:misc/help2man
-USES= tar:xz
+USES= pathfix tar:xz
GNU_CONFIGURE= yes
INFO= dateutils
OPTIONS_DEFINE= DOCS
-post-patch:
- @${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
Index: sysutils/usbutils/Makefile
===================================================================
--- sysutils/usbutils/Makefile
+++ sysutils/usbutils/Makefile
@@ -15,7 +15,7 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake pkgconfig
+USES= gmake pathfix pkgconfig
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: sysutils/usbutils/files/patch-Makefile.am
===================================================================
--- sysutils/usbutils/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2010-07-13 21:30:02.000000000 +0200
-+++ Makefile.am 2010-07-13 21:30:21.000000000 +0200
-@@ -56,7 +56,7 @@ lsusb.8: $(srcdir)/lsusb.8.in
- usb-devices.1: $(srcdir)/usb-devices.1.in
- sed 's|VERSION|$(VERSION)|g' $< >$@
-
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = usbutils.pc
-
- usbutils.pc: $(srcdir)/usbutils.pc.in
Index: sysutils/usbutils/files/patch-Makefile.in
===================================================================
--- sysutils/usbutils/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2010-07-13 21:50:47.000000000 +0200
-+++ Makefile.in 2010-07-13 21:51:39.000000000 +0200
-@@ -223,7 +223,7 @@ EXTRA_DIST = \
- usb-devices \
- usbutils.pc.in
-
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = usbutils.pc
- DISTCLEANFILES = \
- usb.ids.gz \
Index: textproc/apertium/Makefile
===================================================================
--- textproc/apertium/Makefile
+++ textproc/apertium/Makefile
@@ -23,7 +23,6 @@
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: textproc/augeas/Makefile
===================================================================
--- textproc/augeas/Makefile
+++ textproc/augeas/Makefile
@@ -15,7 +15,7 @@
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 @@
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}:' \
Index: textproc/btparse/Makefile
===================================================================
--- textproc/btparse/Makefile
+++ textproc/btparse/Makefile
@@ -13,7 +13,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= perl5 libtool
+USES= perl5 libtool pathfix
USE_PERL5= build
.include <bsd.port.mk>
Index: textproc/btparse/files/patch-Makefile.in
===================================================================
--- 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
Index: textproc/hyperestraier/Makefile
===================================================================
--- textproc/hyperestraier/Makefile
+++ textproc/hyperestraier/Makefile
@@ -18,7 +18,7 @@
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_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} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
Index: textproc/ibus-table/Makefile
===================================================================
--- textproc/ibus-table/Makefile
+++ textproc/ibus-table/Makefile
@@ -17,7 +17,7 @@
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 @@
.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>
Index: textproc/iksemel/Makefile
===================================================================
--- textproc/iksemel/Makefile
+++ textproc/iksemel/Makefile
@@ -19,7 +19,6 @@
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
Index: textproc/libcue/Makefile
===================================================================
--- textproc/libcue/Makefile
+++ textproc/libcue/Makefile
@@ -18,6 +18,6 @@
GH_ACCOUNT= lipnitsk
USE_LDCONFIG= yes
-USES= bison cmake:outsource
+USES= bison cmake:outsource pathfix
.include <bsd.port.mk>
Index: textproc/libcue/files/patch-CMakeLists.txt
===================================================================
--- 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
Index: textproc/libfo/files/patch-Makefile.am
===================================================================
--- textproc/libfo/files/patch-Makefile.am
+++ 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@
Index: textproc/libguess/Makefile
===================================================================
--- textproc/libguess/Makefile
+++ textproc/libguess/Makefile
@@ -12,13 +12,10 @@
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>
Index: textproc/liblrdf/Makefile
===================================================================
--- textproc/liblrdf/Makefile
+++ textproc/liblrdf/Makefile
@@ -24,7 +24,6 @@
USE_GNOME= libxml2 libxslt
USE_LDCONFIG= yes
USE_OPENSSL= yes
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
CFLAGS+= -I${OPENSSLINC}
Index: textproc/libucl/Makefile
===================================================================
--- textproc/libucl/Makefile
+++ textproc/libucl/Makefile
@@ -44,7 +44,6 @@
GH_ACCOUNT= vstakhov
-PATHFIX_MAKEFILEIN= Makefile.am
CONFLICTS_INSTALL= ucl
INSTALL_TARGET= install-strip
Index: textproc/m17n-im-config/Makefile
===================================================================
--- textproc/m17n-im-config/Makefile
+++ textproc/m17n-im-config/Makefile
@@ -16,7 +16,7 @@
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 @@
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>
Index: textproc/ots/Makefile
===================================================================
--- textproc/ots/Makefile
+++ textproc/ots/Makefile
@@ -16,7 +16,6 @@
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
Index: textproc/tokyodystopia/Makefile
===================================================================
--- textproc/tokyodystopia/Makefile
+++ textproc/tokyodystopia/Makefile
@@ -14,7 +14,7 @@
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 @@
@${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>
Index: textproc/turboxsl/Makefile
===================================================================
--- textproc/turboxsl/Makefile
+++ textproc/turboxsl/Makefile
@@ -16,7 +16,7 @@
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
Index: textproc/turboxsl/files/patch-Makefile.am
===================================================================
--- 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
-
Index: textproc/uim/Makefile
===================================================================
--- textproc/uim/Makefile
+++ textproc/uim/Makefile
@@ -16,7 +16,7 @@
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
Index: textproc/uim/files/patch-Makefile.in
===================================================================
--- 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
Index: textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
===================================================================
--- 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
-
Index: www/libhtp-suricata/Makefile
===================================================================
--- www/libhtp-suricata/Makefile
+++ www/libhtp-suricata/Makefile
@@ -18,7 +18,6 @@
CONFLICTS_INSTALL= libhtp-[0-9]*
-PATHFIX_MAKEFILEIN= Makefile.am
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Index: www/mod_webauth/Makefile
===================================================================
--- www/mod_webauth/Makefile
+++ www/mod_webauth/Makefile
@@ -13,7 +13,7 @@
LIB_DEPENDS= libcurl.so:ftp/curl \
libsasl2.so:security/cyrus-sasl2
-USES= libtool pkgconfig ssl
+USES= libtool pathfix pkgconfig ssl
USE_APACHE= 22+
USE_OPENLDAP= yes
USE_LDCONFIG= yes
@@ -25,8 +25,6 @@
INSTALL_TARGET= install-strip
post-patch:
- @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am
@${REINPLACE_CMD} -e '/typedef int sig_atomic_t/d' \
${WRKSRC}/portable/system.h
Index: www/nghttp2/Makefile
===================================================================
--- www/nghttp2/Makefile
+++ www/nghttp2/Makefile
@@ -28,7 +28,6 @@
ZLIB_LIBS="-L${LIBDIR} -lz"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
USE_CXXSTD= c++11
USE_LDCONFIG= yes
USES= autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig ssl
Index: www/trafficserver/Makefile
===================================================================
--- www/trafficserver/Makefile
+++ www/trafficserver/Makefile
@@ -18,7 +18,7 @@
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= cpe execinfo gmake libtool perl5 pkgconfig sqlite ssl tar:bzip2 tcl
+USES= cpe execinfo gmake libtool pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl
CPE_VENDOR= apache
CPE_PRODUCT= traffic_server
USE_PERL5= build run
Index: www/trafficserver/files/patch-tools_Makefile.in
===================================================================
--- www/trafficserver/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig 2015-06-30 04:11:56 UTC
-+++ tools/Makefile.in
-@@ -614,7 +614,7 @@ valuesh = @valuesh@
- waith = @waith@
- zlibh = @zlibh@
- bin_SCRIPTS = tsxs tspush
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = trafficserver.pc
- AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
- AM_CPPFLAGS = $(iocore_include_dirs) \
Index: www/varnish4/Makefile
===================================================================
--- www/varnish4/Makefile
+++ www/varnish4/Makefile
@@ -17,7 +17,7 @@
CONFLICTS= varnish-2.* varnish-3.*
BROKEN_arm= does not configure
-USES= autoreconf cpe gmake libedit libtool pkgconfig python:2,build \
+USES= autoreconf cpe gmake libedit libtool pathfix pkgconfig python:2,build \
readline shebangfix
SHEBANG_FILES= lib/libvcc/vmodtool.py
CPE_VENDOR= varnish-cache
@@ -39,8 +39,6 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.am
.if defined(BAD_TESTS)
${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
.endif
Index: www/webkit-gtk2/Makefile
===================================================================
--- www/webkit-gtk2/Makefile
+++ www/webkit-gtk2/Makefile
@@ -29,7 +29,8 @@
USE_GSTREAMER1= yes
USE_XORG= xt xdamage xcomposite
USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
- perl5 pkgconfig shebangfix sqlite tar:xz
+ pathfix perl5 pkgconfig shebangfix sqlite tar:xz
+PATHFIX_MAKEFILEIN= GNUmakefile.in
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS=yes
USE_GNOME= cairo gtk20 introspection:build libxslt
@@ -100,8 +101,6 @@
# Since ruby 2.2 there is no ruby symlink
@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \
Index: www/webkit-gtk3/Makefile
===================================================================
--- www/webkit-gtk3/Makefile
+++ www/webkit-gtk3/Makefile
@@ -29,7 +29,8 @@
USE_GSTREAMER1= yes
USE_XORG= xt xdamage xcomposite
USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
- perl5 pkgconfig shebangfix sqlite tar:xz
+ pathfix perl5 pkgconfig shebangfix sqlite tar:xz
+PATHFIX_MAKEFILEIN= GNUmakefile.in
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS=yes
USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt
@@ -107,8 +108,6 @@
# Since ruby 2.2 there is no ruby symlink
@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \
Index: www/webkit-sharp/Makefile
===================================================================
--- www/webkit-sharp/Makefile
+++ www/webkit-sharp/Makefile
@@ -19,6 +19,5 @@
GNU_CONFIGURE= yes
USES= autoreconf gmake mono pathfix pkgconfig
USE_GNOME= gtksharp20
-PATHFIX_MAKEFILEIN= Makefile.am
.include <bsd.port.mk>
Index: www/yaws/Makefile
===================================================================
--- www/yaws/Makefile
+++ www/yaws/Makefile
@@ -29,7 +29,6 @@
CONFIGURE_ARGS= --localstatedir=/var
CONFIGURE_ENV= wwwdir=${WWWDIR} yawsdir=${APPDIR}
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN=Makefile.am
.include <bsd.port.options.mk>
Index: x11-drivers/xf86-input-joystick/Makefile
===================================================================
--- x11-drivers/xf86-input-joystick/Makefile
+++ x11-drivers/xf86-input-joystick/Makefile
@@ -10,8 +10,6 @@
XORG_CAT= driver
-post-patch:
- @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
+USES= pathfix
.include <bsd.port.mk>
Index: x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am
===================================================================
--- x11-fm/nemo/files/patch-libnemo-extensions_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnemo-extension/Makefile.orig.am 2013-03-02 09:00:45.222570308 +0100
-+++ libnemo-extension/Makefile.am 2013-03-02 09:02:01.279567955 +0100
-@@ -52,7 +52,7 @@
- nemo-menu.c \
- $(NULL)
-
--pkgconfigdir=$(libdir)/pkgconfig
-+pkgconfigdir=$(prefix)/libdata/pkgconfig
- pkgconfig_DATA=libnemo-extension.pc
-
- EXTRA_DIST = \
Index: x11-toolkits/gai/Makefile
===================================================================
--- x11-toolkits/gai/Makefile
+++ x11-toolkits/gai/Makefile
@@ -15,7 +15,7 @@
LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
-USES= gettext-tools pkgconfig tar:bzip2
+USES= gettext-tools pathfix pkgconfig tar:bzip2
USE_GL= gl
USE_SDL= sdl
USE_GNOME= libgnomeui
Index: x11-toolkits/gai/files/patch-gai_Makefile.in
===================================================================
--- x11-toolkits/gai/files/patch-gai_Makefile.in
+++ x11-toolkits/gai/files/patch-gai_Makefile.in
@@ -1,5 +1,5 @@
---- gai/Makefile.in.orig Thu Oct 27 15:00:22 2005
-+++ gai/Makefile.in Thu Oct 27 15:02:47 2005
+--- gai/Makefile.in.orig 2016-10-04 15:54:42 UTC
++++ gai/Makefile.in
@@ -1,9 +1,9 @@
# Makefile for the General Applet Interface Library
@@ -12,7 +12,7 @@
LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@
CC = @CC@
-@@ -23,13 +23,13 @@
+@@ -23,13 +23,13 @@ libgai@LIB_END@: $(OBJS)
install: libgai@LIB_END@
mkdir -p $(DESTDIR)$(PREFIX)/include/gai
@@ -23,9 +23,8 @@
+ $(BSD_INSTALL_PROGRAM) libgai@LIB_END@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@
ln -sf libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@
ln -sf libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_END@
-- mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-- cp ../gai.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
+ mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
+- cp ../gai.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ $(BSD_INSTALL_DATA) ../gai.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
uninstall:
rm -f $(DESTDIR)$(PREFIX)/include/gai/gai.h
Index: x11-toolkits/girara/Makefile
===================================================================
--- x11-toolkits/girara/Makefile
+++ x11-toolkits/girara/Makefile
@@ -10,7 +10,8 @@
COMMENT= GTK3 Interface Library for Zathura PDF Viewer
USE_GNOME= glib20 gtk30
-USES= compiler:c11 gmake pkgconfig
+USES= compiler:c11 gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN= Makefile
USE_LDCONFIG= yes
LIBDIR= ${PREFIX}/lib
MAKE_ENV+= SFLAGS=${STRIP}
@@ -20,10 +21,6 @@
OPTIONS_SUB= yes
NLS_USES= gettext
-post-patch: .SILENT
- ${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
- ${WRKSRC}/Makefile
-
post-patch-NLS-off: .SILENT
${REINPLACE_CMD} -e '/-C po/d'\
${WRKSRC}/Makefile
Index: x11-wm/muffin/Makefile
===================================================================
--- x11-wm/muffin/Makefile
+++ x11-wm/muffin/Makefile
@@ -31,7 +31,6 @@
CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=unused-function
CFLAGS+= -I${LOCALBASE}/include -Wno-error=unused-function
LDFLAGS+= -L${LOCALBASE}/lib
-PATHFIX_MAKEFILEIN= Makefile.am
CONFIGURE_ENV= LIBS="-lexecinfo"
CONFIGURE_ARGS= --enable-compile-warnings=maximum
MAKE_ARGS= V=1
Index: x11/cinnamon-desktop/Makefile
===================================================================
--- x11/cinnamon-desktop/Makefile
+++ x11/cinnamon-desktop/Makefile
@@ -26,7 +26,6 @@
python_OLD_CMD= /usr/bin/python2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
Index: x11/cinnamon-menus/Makefile
===================================================================
--- x11/cinnamon-menus/Makefile
+++ x11/cinnamon-menus/Makefile
@@ -22,7 +22,6 @@
GH_ACCOUNT= linuxmint
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
Index: x11/cinnamon-screensaver/Makefile
===================================================================
--- x11/cinnamon-screensaver/Makefile
+++ x11/cinnamon-screensaver/Makefile
@@ -24,7 +24,6 @@
USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver
USE_GNOME= gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS= -I${LOCALBASE}/include -Wno-error=format-nonliteral
LDFLAGS+= -L${LOCALBASE}/lib
Index: x11/cinnamon-session/Makefile
===================================================================
--- x11/cinnamon-session/Makefile
+++ x11/cinnamon-session/Makefile
@@ -27,7 +27,6 @@
USE_GL= gl
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
CONFIGURE_ARGS= --disable-docbook-docs
CPPFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
CFLAGS+= -I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
Index: x11/keybinder-gtk3/Makefile
===================================================================
--- x11/keybinder-gtk3/Makefile
+++ x11/keybinder-gtk3/Makefile
@@ -18,7 +18,6 @@
GH_ACCOUNT= engla
USES= autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
USE_GNOME= gtk30 introspection:build
USE_XORG= x11 xext xrender
GNU_CONFIGURE= yes
Index: x11/keybinder/Makefile
===================================================================
--- x11/keybinder/Makefile
+++ x11/keybinder/Makefile
@@ -17,7 +17,6 @@
GH_ACCOUNT= engla
USES= autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
USE_GNOME= gtk20 introspection:build
USE_XORG= x11 xext xrender
GNU_CONFIGURE= yes
Index: x11/libSM/Makefile
===================================================================
--- x11/libSM/Makefile
+++ x11/libSM/Makefile
@@ -12,6 +12,7 @@
LICENSE= MIT
+USES= pathfix
XORG_CAT= lib
USE_XORG= ice xproto:both xtrans
Index: x11/libSM/files/patch-Makefile.am
===================================================================
--- x11/libSM/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Makefile.am.orig 2009-02-23 19:42:34.000000000 +0300
-+++ ./Makefile.am 2009-02-23 19:43:19.000000000 +0300
-@@ -1,6 +1,6 @@
- SUBDIRS=src
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = sm.pc
-
- EXTRA_DIST=sm.pc.in

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 7:16 PM (6 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15616871
Default Alt Text
D8093.id21248.diff (205 KB)

Event Timeline