summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/GeoIP/Makefile1
-rw-r--r--net/geoipupdate/Makefile1
-rw-r--r--net/kea/Makefile2
-rw-r--r--net/kea/files/patch-Makefile.am9
-rw-r--r--net/libilbc/Makefile2
-rw-r--r--net/libilbc/files/patch-CMakeLists.txt11
-rw-r--r--net/librdkafka/Makefile2
-rw-r--r--net/librdkafka/files/patch-mklove_Makefile.base11
-rw-r--r--net/libvncserver/Makefile1
-rw-r--r--net/mobile-broadband-provider-info/Makefile1
-rw-r--r--net/openbsc/Makefile4
-rw-r--r--net/openggsn/Makefile4
-rw-r--r--net/openpgm/Makefile1
-rw-r--r--net/pacemaker/Makefile2
-rw-r--r--net/rabbitmq-c-devel/Makefile7
-rw-r--r--net/shadowsocks-libev/Makefile4
16 files changed, 11 insertions, 52 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index c53e2f67ee06..07612d798041 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -16,7 +16,6 @@ GH_ACCOUNT= maxmind
GH_PROJECT= geoip-api-c
USES= autoreconf libtool pathfix
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index 420da521a32f..97aaa9d151a9 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -18,7 +18,6 @@ USE_GITHUB= yes
GH_ACCOUNT= maxmind
USES= libtool localbase pathfix autoreconf
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/net/kea/Makefile b/net/kea/Makefile
index a0c734b7cc38..9762ad7f2516 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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}
diff --git a/net/kea/files/patch-Makefile.am b/net/kea/files/patch-Makefile.am
index bcab6703e2d2..cb0af6bf85b9 100644
--- a/net/kea/files/patch-Makefile.am
+++ b/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
diff --git a/net/libilbc/Makefile b/net/libilbc/Makefile
index e64a6c5bc384..2ca256d1c23b 100644
--- a/net/libilbc/Makefile
+++ b/net/libilbc/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= ilbc-r[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= TimothyGu
-USES= cmake
+USES= cmake pathfix
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/net/libilbc/files/patch-CMakeLists.txt b/net/libilbc/files/patch-CMakeLists.txt
index 533a8fe96169..5716e79e8c10 100644
--- a/net/libilbc/files/patch-CMakeLists.txt
+++ b/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)
diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
index 322eb93e4641..9fa1bfb58eb1 100644
--- a/net/librdkafka/Makefile
+++ b/net/librdkafka/Makefile
@@ -23,7 +23,7 @@ GH_ACCOUNT= edenhill
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
diff --git a/net/librdkafka/files/patch-mklove_Makefile.base b/net/librdkafka/files/patch-mklove_Makefile.base
deleted file mode 100644
index 4cb7fc9adf7f..000000000000
--- a/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
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index 9c76c8f04d22..4ca273e0cf71 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -18,7 +18,6 @@ USE_GITHUB= yes
GH_ACCOUNT= LibVNC
USES= autoreconf jpeg libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN= Makefile.am
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/mobile-broadband-provider-info/Makefile b/net/mobile-broadband-provider-info/Makefile
index 294f0ddb09ca..b61a55738389 100644
--- a/net/mobile-broadband-provider-info/Makefile
+++ b/net/mobile-broadband-provider-info/Makefile
@@ -12,7 +12,6 @@ LICENSE= PD
USES= autoreconf pathfix tar:xz
GNU_CONFIGURE= yes
-PATHFIX_MAKEFILEIN= Makefile.am
PLIST_FILES= ${DATADIR}/serviceproviders.2.dtd \
${DATADIR}/serviceproviders.xml \
diff --git a/net/openbsc/Makefile b/net/openbsc/Makefile
index 6dea19ce8b55..0cdf432d29bf 100644
--- a/net/openbsc/Makefile
+++ b/net/openbsc/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libdbi.so:databases/libdbi \
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 @@ NAT_RUN_DEPENDS= ${LOCALBASE}/lib/libsccp.a:devel/libosmo-sccp
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>
diff --git a/net/openggsn/Makefile b/net/openggsn/Makefile
index c712f5702ae4..6c59c25a61c2 100644
--- a/net/openggsn/Makefile
+++ b/net/openggsn/Makefile
@@ -15,13 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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:
diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
index 7b42a4adb055..c971266d61b2 100644
--- a/net/openpgm/Makefile
+++ b/net/openpgm/Makefile
@@ -18,7 +18,6 @@ GH_ACCOUNT= steve-o
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
diff --git a/net/pacemaker/Makefile b/net/pacemaker/Makefile
index 92788f5cb936..06d113720473 100644
--- a/net/pacemaker/Makefile
+++ b/net/pacemaker/Makefile
@@ -43,8 +43,6 @@ CONFIGURE_ARGS= --disable-fatal-warnings \
--without-heartbeat
INSTALL_TARGET= install-strip
-PATHFIX_MAKEFILEIN= Makefile.am
-
SHEBANG_LANG= sh
sh_OLD_CMD= ${SH}
sh_CMD= ${LOCALBASE}/bin/bash
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 08862734381a..09d88e9aa392 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson
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_LIB_DEPENDS= libpopt.so:devel/popt
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>
diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index a1d0e95844f4..eb26f40a4bca 100644
--- a/net/shadowsocks-libev/Makefile
+++ b/net/shadowsocks-libev/Makefile
@@ -16,7 +16,7 @@ USE_GITHUB= yes
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 @@ CFLAGS+= -fstack-protector
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