Page MenuHomeFreeBSD

D8093.id20874.diff
No OneTemporary

D8093.id20874.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
@@ -37,10 +41,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/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: 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/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/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/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 gmake libtool pkgconfig python:build shebangfix
+USES= compiler:c++11-lib 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
@@ -30,7 +30,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/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/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/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/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/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/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/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/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/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/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/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
@@ -18,7 +18,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/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}|' \

File Metadata

Mime Type
text/plain
Expires
Thu, May 21, 10:46 AM (2 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33387496
Default Alt Text
D8093.id20874.diff (56 KB)

Event Timeline