ports/187468: [PATCH] use libexecinfo in base instead of ports.
Yasuhiro KIMURA
yasu at utahime.org
Wed Mar 12 00:30:02 UTC 2014
>Number: 187468
>Category: ports
>Synopsis: [PATCH] use libexecinfo in base instead of ports.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 12 00:30:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro KIMURA
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD xxxx 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260673: Thu Jan 23 22:36:39 JST 2014 xxxx amd64
>Description:
On version which has libexecinfo in base, use it instead of devel/libexecinfo.
Cc-ed to portmgr since this changes multiple ports and needs commit in sync.
Test build result on redports is available at following URL.
https://redports.org/buildarchive/20140311024108-35513/
>How-To-Repeat:
>Fix:
--- patch-libexecinfo begins here ---
Index: audio/clementine-player/Makefile
===================================================================
--- audio/clementine-player/Makefile (revision 347827)
+++ audio/clementine-player/Makefile (working copy)
@@ -13,11 +13,10 @@
LICENSE= GPLv3
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libtag.so:${PORTSDIR}/audio/taglib \
+LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \
libchromaprint.so:${PORTSDIR}/audio/chromaprint \
libprotobuf.so:${PORTSDIR}/devel/protobuf \
- libqca.so:${PORTSDIR}/devel/qca \
+ libqca.so:${PORTSDIR}/devel/qca \
libqjson.so:${PORTSDIR}/devel/qjson \
libfftw3.so:${PORTSDIR}/math/fftw3
@@ -64,8 +63,12 @@
OPTIONS_DEFAULT= AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \
LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MDROPBOX}
CMAKE_ARGS+= -DENABLE_DROPBOX=ON
.else
@@ -150,4 +153,4 @@
CMAKE_ARGS+= -DENABLE_WIIMOTEDEV=OFF
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: audio/deadbeef/Makefile
===================================================================
--- audio/deadbeef/Makefile (revision 347827)
+++ audio/deadbeef/Makefile (working copy)
@@ -14,8 +14,7 @@
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
- libmad.so:${PORTSDIR}/audio/libmad \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libmad.so:${PORTSDIR}/audio/libmad
GNU_CONFIGURE= yes
USES= gmake pkgconfig gettext iconv shebangfix
@@ -64,8 +63,12 @@
CONVERTER_DESC= Build converter
VFS_ZIP_DESC= ZIP support
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MPULSEAUDIO}
PLIST_SUB+= PULSE=""
LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio
@@ -370,4 +373,4 @@
BROKEN= Does not build on powerpc-9: fails to compile
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: audio/pulseaudio/Makefile
===================================================================
--- audio/pulseaudio/Makefile (revision 347827)
+++ audio/pulseaudio/Makefile (working copy)
@@ -21,7 +21,6 @@
libspeexdsp.so:${PORTSDIR}/audio/speex \
libdbus-1.so:${PORTSDIR}/devel/dbus \
libgdbm.so:${PORTSDIR}/databases/gdbm \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libck-connector.so:${PORTSDIR}/sysutils/consolekit
USE_GNOME= gnomehack glib20 intltool ltverhack
@@ -68,6 +67,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack
PLIST_SUB+= JACK=""
Index: biology/seqtools/Makefile
===================================================================
--- biology/seqtools/Makefile (revision 347827)
+++ biology/seqtools/Makefile (working copy)
@@ -12,8 +12,7 @@
LICENSE= GPLv3
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
USES= pkgconfig
GNU_CONFIGURE= yes
@@ -23,4 +22,10 @@
LDFLAGS= -L${LOCALBASE}/lib -lexecinfo -lcurl -lm
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: biology/ugene/Makefile
===================================================================
--- biology/ugene/Makefile (revision 347827)
+++ biology/ugene/Makefile (working copy)
@@ -15,9 +15,6 @@
LICENSE= GPLv2
-.if !exists(/usr/include/execinfo.h)
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-.endif
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USES= qmake
@@ -40,6 +37,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# Required for Google Test code
.if ${OSVERSION} > 1000054
CXXFLAGS+= -std=c++11
Index: cad/qcad/Makefile
===================================================================
--- cad/qcad/Makefile (revision 347827)
+++ cad/qcad/Makefile (working copy)
@@ -16,7 +16,6 @@
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
CONFLICTS= texlive-base-*
@@ -50,6 +49,12 @@
QSCRIPTS= bbox dwg2bmp dwg2pdf dwg2svg
SUB_FILES= ${QSCRIPTS}
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
pre-configure:
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
${WRKSRC}/src/core/RSettings.cpp
@@ -74,4 +79,4 @@
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: chinese/fcitx/Makefile
===================================================================
--- chinese/fcitx/Makefile (revision 347827)
+++ chinese/fcitx/Makefile (working copy)
@@ -17,8 +17,7 @@
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libdbus-1.so:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
libicuuc.so:${PORTSDIR}/devel/icu
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
@@ -44,8 +43,12 @@
OPENCC_DESC= Enable OpenCC for Chinese Transform
TPUNC_DESC= Use traditional quotation marks
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON
.if ${PORT_OPTIONS:MGTK2}
@@ -104,4 +107,4 @@
${FILESDIR}/getline-src_lib_fcitx-utils_utils.h
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: comms/fldigi/Makefile
===================================================================
--- comms/fldigi/Makefile (revision 347827)
+++ comms/fldigi/Makefile (working copy)
@@ -17,8 +17,7 @@
asciidoc:${PORTSDIR}/textproc/asciidoc\
docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\
xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libsamplerate.so:${PORTSDIR}/audio/libsamplerate\
+LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate\
libboost_system.so:${PORTSDIR}/devel/boost-libs\
libfltk.so:${PORTSDIR}/x11-toolkits/fltk
USE_CXXSTD= gnu++0x
@@ -44,6 +43,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "sparc64"
BROKEN= Fails to install
.endif
Index: databases/akonadi/Makefile
===================================================================
--- databases/akonadi/Makefile (revision 347827)
+++ databases/akonadi/Makefile (working copy)
@@ -16,7 +16,6 @@
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs
# Let process generate meaningful backtrace on core dump.
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_KDE4= kdehier kdeprefix automoc4 soprano
@@ -49,6 +48,12 @@
OPTIONS_DEFAULT= MYSQL
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \
${PATCH_WRKSRC}/CMakeLists.txt
@@ -66,4 +71,4 @@
-e '/find_package(SharedMimeInfo/ d' \
${PATCH_WRKSRC}/CMakeLists.txt
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: databases/libmemcached/Makefile
===================================================================
--- databases/libmemcached/Makefile (revision 347827)
+++ databases/libmemcached/Makefile (working copy)
@@ -9,19 +9,24 @@
MAINTAINER= m.tsatsenko at gmail.com
COMMENT= C and C++ client library to the memcached server
-LIB_DEPENDS?= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS?= libevent-1.4.so:${PORTSDIR}/devel/libevent
USES= gmake pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-memcached
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
CXXFLAGS+= -D__STDC_CONSTANT_MACROS
NO_STAGE= yes
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+.else
+CONFIGURE_ENV+= LDFLAGS="-lexecinfo"
+.endif
+
.if exists(${LOCALBASE}/lib/libsasl.so.3)
LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
.endif
@@ -152,4 +157,4 @@
@${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: databases/mongodb/Makefile
===================================================================
--- databases/mongodb/Makefile (revision 347827)
+++ databases/mongodb/Makefile (working copy)
@@ -15,8 +15,7 @@
LICENSE= AGPLv3 APACHE20
LICENSE_COMB= multi
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libpcre.so:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
libsnappy.so:${PORTSDIR}/archivers/snappy
# boost 1.52 from ports make mongod segfaulting with many tests
# LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs
@@ -44,6 +43,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MSM}
MAKE_ARGS+= --usesm --use-system-sm
LIB_DEPENDS+= libjs.so:${PORTSDIR}/lang/spidermonkey17
Index: databases/redis/Makefile
===================================================================
--- databases/redis/Makefile (revision 347827)
+++ databases/redis/Makefile (working copy)
@@ -11,8 +11,6 @@
LICENSE= BSD
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
OPTIONS_DEFINE= TESTS
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
@@ -24,6 +22,13 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
+.else
+LDFLAGS+= ${PTHREAD_LIBS} -lm -lexecinfo
+.endif
+
.if ${PORT_OPTIONS:MLUA}
USE_LUA?= 5.1
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua
@@ -43,7 +48,6 @@
.endif
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
CONFLICTS?= redis-devel-2.*
Index: databases/redis-devel/Makefile
===================================================================
--- databases/redis-devel/Makefile (revision 347827)
+++ databases/redis-devel/Makefile (working copy)
@@ -14,8 +14,6 @@
LICENSE= BSD
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
OPTIONS_DEFINE= TESTS
OPTIONS_RADIO= EXTLUA
OPTIONS_RADIO_EXTLUA= LUA LUAJIT
@@ -29,6 +27,13 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
+.else
+LDFLAGS+= ${PTHREAD_LIBS} -lm -lexecinfo
+.endif
+
.if ${PORT_OPTIONS:MLUA}
USE_LUA?= 5.1
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua
@@ -48,7 +53,6 @@
.endif
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
CONFLICTS?= redis-2.*
Index: databases/rubygem-bdb1/Makefile
===================================================================
--- databases/rubygem-bdb1/Makefile (revision 347827)
+++ databases/rubygem-bdb1/Makefile (working copy)
@@ -8,10 +8,14 @@
MAINTAINER= ruby at FreeBSD.org
COMMENT= Ruby interface to Berkeley DB revision 1.8x with full feature support
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: deskutils/pinot/Makefile
===================================================================
--- deskutils/pinot/Makefile (revision 347827)
+++ deskutils/pinot/Makefile (working copy)
@@ -21,7 +21,6 @@
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libxml\+\+-2.6.so:${PORTSDIR}/textproc/libxml++26 \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libexif.so:${PORTSDIR}/graphics/libexif \
libexiv2.so:${PORTSDIR}/graphics/exiv2 \
libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
@@ -75,6 +74,12 @@
SHR2FIX= Core/pinot-search.1 README
UL2FIX= Utils/xdgmime/xdgmime.c
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-extract:
# remove pre-generated messages catalogs
${FIND} ${WRKSRC}/po -name "*.gmo" -delete
@@ -104,4 +109,4 @@
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: devel/clanlib/Makefile
===================================================================
--- devel/clanlib/Makefile (revision 347827)
+++ devel/clanlib/Makefile (working copy)
@@ -20,8 +20,7 @@
libmikmod.so:${PORTSDIR}/audio/libmikmod \
libvorbis.so:${PORTSDIR}/audio/libvorbis \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libpcre.so:${PORTSDIR}/devel/pcre \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libpcre.so:${PORTSDIR}/devel/pcre
USE_GCC= yes
USE_XORG= x11
@@ -52,6 +51,12 @@
PLIST_SUB+= VER=${PORTVERSION:R} \
SHORT_VER=${PORTVERSION:R:R}${PORTVERSION:R:E}
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|LIBS="-lsqlite3 -ldl"|LIBS="-lsqlite3"|g' \
${WRKSRC}/configure
@@ -62,4 +67,4 @@
@${REINPLACE_CMD} -e '47 s|#ifndef __FreeBSD__|#if !defined(__FreeBSD__)|g' \
${WRKSRC}/Sources/Core/System/system.cpp
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: devel/gearmand/Makefile
===================================================================
--- devel/gearmand/Makefile (revision 347827)
+++ devel/gearmand/Makefile (working copy)
@@ -10,11 +10,9 @@
COMMENT= Gearman C Server and Library
BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \
- libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \
${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
LIB_DEPENDS= event:${PORTSDIR}/devel/libevent \
- uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
- execinfo:${PORTSDIR}/devel/libexecinfo
+ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.*
@@ -47,6 +45,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# Workaround for missing sigignore that wasn't introduced until
# FreeBSD 8.0
.if ${OSVERSION} < 800041
Index: devel/gearmand-devel/Makefile
===================================================================
--- devel/gearmand-devel/Makefile (revision 347827)
+++ devel/gearmand-devel/Makefile (working copy)
@@ -10,11 +10,9 @@
COMMENT= Gearman C Server and Library
BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \
- libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \
${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
LIB_DEPENDS= event:${PORTSDIR}/devel/libevent \
- uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
- execinfo:${PORTSDIR}/devel/libexecinfo
+ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
CONFLICTS= p5-Gearman-Server-1.* gearmand-1.0.*
@@ -49,6 +47,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# Workaround for missing sigignore that wasn't introduced until
# FreeBSD 8.0
.if ${OSVERSION} < 800041
Index: devel/glog/Makefile
===================================================================
--- devel/glog/Makefile (revision 347827)
+++ devel/glog/Makefile (working copy)
@@ -9,8 +9,7 @@
MAINTAINER= clsung at FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
- gflags:${PORTSDIR}/devel/gflags
+LIB_DEPENDS= gflags:${PORTSDIR}/devel/gflags
GNU_CONFIGURE= yes
USES= pathfix
@@ -18,10 +17,16 @@
PROJECTHOST= google-glog
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.else
+LDFLAGS+= -lexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|^docdir.*|docdir = ${DOCSDIR}|' ${WRKSRC}/Makefile.in
.if ! ${PORT_OPTIONS:MDOCS}
Index: devel/google-perftools/Makefile
===================================================================
--- devel/google-perftools/Makefile (revision 347827)
+++ devel/google-perftools/Makefile (working copy)
@@ -21,9 +21,6 @@
WRKSRC= ${WRKDIR}/gperftools-${PORTVERSION}
DOCSDIR= ${PREFIX}/share/doc/gperftools
-BUILD_DEPENDS+= ${LOCALBASE}/include/execinfo.h:${PORTSDIR}/devel/libexecinfo
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= compiler
@@ -35,6 +32,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC)
# clang cannot disable builtins individually
CXXFLAGS+= -fno-builtin
Index: devel/libexecinfo/Makefile
===================================================================
--- devel/libexecinfo/Makefile (revision 347827)
+++ devel/libexecinfo/Makefile (working copy)
@@ -23,8 +23,14 @@
CFLAGS_amd64= -fno-omit-frame-pointer
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1000052
+IGNORE= already imported to base system
+.endif
+
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: devel/llvm32/Makefile
===================================================================
--- devel/llvm32/Makefile (revision 347827)
+++ devel/llvm32/Makefile (working copy)
@@ -11,8 +11,6 @@
MAINTAINER= brooks at FreeBSD.org
COMMENT= The LLVM Compiler Infrastructure
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-
LLVM_SUFFIX= ${PORTVERSION:S/.//g}
LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
@@ -143,6 +141,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "arm"
BROKEN= Does not compile on arm
.elif ${ARCH} == "sparc64"
Index: devel/llvm33/Makefile
===================================================================
--- devel/llvm33/Makefile (revision 347827)
+++ devel/llvm33/Makefile (working copy)
@@ -11,8 +11,6 @@
MAINTAINER= brooks at FreeBSD.org
COMMENT= Low Level Virtual Machine
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-
LLVM_SUFFIX= ${PORTVERSION:S/.//g}
LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
@@ -135,6 +133,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "arm"
BROKEN= Does not compile on arm
.elif ${ARCH} == "sparc64"
Index: devel/llvm34/Makefile
===================================================================
--- devel/llvm34/Makefile (revision 347827)
+++ devel/llvm34/Makefile (working copy)
@@ -10,8 +10,6 @@
MAINTAINER= brooks at FreeBSD.org
COMMENT= Low Level Virtual Machine
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-
LLVM_SUFFIX= ${PORTVERSION:S/.//g:C/r.//}
LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
@@ -135,6 +133,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
CONFIGURE_ARGS+= --enable-pic --with-pic
.endif
Index: dns/dnscrypt-proxy/Makefile
===================================================================
--- dns/dnscrypt-proxy/Makefile (revision 347827)
+++ dns/dnscrypt-proxy/Makefile (working copy)
@@ -10,8 +10,7 @@
MAINTAINER= freebsd at dns-lab.com
COMMENT= Boost privacy and security of DNS
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS= libsodium.so:${PORTSDIR}/security/libsodium
GNU_CONFIGURE= yes
USES= gmake
@@ -26,6 +25,12 @@
OPTIONS_DEFINE= DOCS
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
@@ -32,4 +37,4 @@
${INSTALL_MAN} ${WRKSRC}/man/dnscrypt-proxy.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/man/hostip.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: emulators/dolphin-emu/Makefile
===================================================================
--- emulators/dolphin-emu/Makefile (revision 347827)
+++ emulators/dolphin-emu/Makefile (working copy)
@@ -14,8 +14,7 @@
LICENSE= GPLv2
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libfreetype.so:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
liblzo2.so:${PORTSDIR}/archivers/lzo2 \
libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
libsfml-network.so:${PORTSDIR}/devel/sfml \
@@ -27,7 +26,7 @@
WX_UNICODE= yes
USE_GL= gl glew glu
-USES= dos2unix cmake iconv openal pkgconfig
+USES= dos2unix cmake compiler:c++11-lib iconv openal pkgconfig
DOS2UNIX_REGEX= .*\.(h|c|cpp)
# Disable ALSA (emulated) and ao (buggy)
@@ -67,6 +66,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# XXX Temporary workaround for ports/184540
.if ${PORT_OPTIONS:MDEBUG}
INSTALL_TARGET= install
Index: games/0ad/Makefile
===================================================================
--- games/0ad/Makefile (revision 347827)
+++ games/0ad/Makefile (working copy)
@@ -15,7 +15,6 @@
zip:${PORTSDIR}/archivers/zip \
cmake:${PORTSDIR}/devel/cmake
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libpng15.so:${PORTSDIR}/graphics/png \
libogg.so:${PORTSDIR}/audio/libogg \
libvorbis.so:${PORTSDIR}/audio/libvorbis \
@@ -43,6 +42,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${OSVERSION} < 900014
FAVORITE_COMPILER= gcc
.endif
Index: games/adgali/Makefile
===================================================================
--- games/adgali/Makefile (revision 347827)
+++ games/adgali/Makefile (working copy)
@@ -16,9 +16,6 @@
libpng15.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff \
libfreetype.so:${PORTSDIR}/print/freetype2
-.if !exists(/usr/include/execinfo.h)
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-.endif
USES= gmake
USE_AUTOTOOLS= libtool
@@ -30,7 +27,15 @@
CONFIGURE_ARGS= --enable-compile-optim=no
CPPFLAGS+= -I${LOCALBASE}/include
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.else
+LDFLAGS+= -lexecinfo
+.endif
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -37,4 +42,4 @@
(cd ${WRKSRC}/doc/html && ${FIND} . | ${CPIO} -pdm -L -R \
${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR})
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: games/dangerdeep/Makefile
===================================================================
--- games/dangerdeep/Makefile (revision 347827)
+++ games/dangerdeep/Makefile (working copy)
@@ -12,8 +12,7 @@
COMMENT= Open source World War II German submarine simulation
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
-LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \
- execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/dangerdeep-data
MAKE_ENV= X11BASE=${LOCALBASE}
@@ -32,6 +31,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if defined(PACKAGE_BUILDING)
SCONS_ARGS+= usex86sse=-1 # disable MMX/SSE on the build cluster
.endif
Index: games/eduke32/Makefile
===================================================================
--- games/eduke32/Makefile (revision 347827)
+++ games/eduke32/Makefile (working copy)
@@ -15,8 +15,6 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/GNU.TXT
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
-
USES= gmake
USE_CSTD= gnu89
USE_BZIP2= yes
@@ -38,6 +36,10 @@
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "i386"
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
Index: games/freedroidrpg/Makefile
===================================================================
--- games/freedroidrpg/Makefile (revision 347827)
+++ games/freedroidrpg/Makefile (working copy)
@@ -27,7 +27,9 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBACKTRACE}
+.if ${OSVERSION} < 1000052
LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
CONFIGURE_ARGS+=--enable-backtrace
STRIP= #
.else
Index: games/frobtads/Makefile
===================================================================
--- games/frobtads/Makefile (revision 347827)
+++ games/frobtads/Makefile (working copy)
@@ -11,8 +11,7 @@
MAINTAINER= kaiwang27 at gmail.com
COMMENT= TADS interpreter and the compilers for both TADS 2 and 3
-LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
CONFLICTS= tads-2.*
@@ -24,7 +23,13 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
pre-configure:
(cd ${WRKSRC}; ${SH} bootstrap)
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: games/r1q2/Makefile
===================================================================
--- games/r1q2/Makefile (revision 347827)
+++ games/r1q2/Makefile (working copy)
@@ -11,8 +11,6 @@
MAINTAINER= danfe at FreeBSD.org
COMMENT= Enhanced Quake II client/server focusing on stability
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= sets the FPU rounding mode and precision (not available in fenv.h)
@@ -38,6 +36,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MCLIENT}
ALL_TARGET+= client
PLIST_SUB+= CLIENT=""
Index: games/sdlquake2/Makefile
===================================================================
--- games/sdlquake2/Makefile (revision 347827)
+++ games/sdlquake2/Makefile (working copy)
@@ -10,8 +10,6 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Combination of R1Q2 and R1GL with SDL code from Quake2Forge
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USE_BZIP2= yes
USES= gmake
@@ -42,6 +40,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
do-install:
@${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
.if ${PORT_OPTIONS:MCLIENT}
Index: games/spring/Makefile
===================================================================
--- games/spring/Makefile (revision 347827)
+++ games/spring/Makefile (working copy)
@@ -18,8 +18,7 @@
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libIL.so:${PORTSDIR}/graphics/devil \
libogg.so:${PORTSDIR}/audio/libogg \
- libvorbis.so:${PORTSDIR}/audio/libvorbis \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libvorbis.so:${PORTSDIR}/audio/libvorbis
BUILD_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
# XXX: it should be possible to build it on i386, investigate
@@ -67,6 +66,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if defined(WITH_SYNC_DEBUG)
CFLAGS= # empty
CXXFLAGS= # empty
@@ -87,9 +90,15 @@
${WRKSRC}/rts/System/Sync/FPUCheck.cpp
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/rts/build/cmake/*.cmake
+.if ${OSVERSION} < 1000052
@${REINPLACE_CMD} -e 's|execinfo|${LOCALBASE}/lib/libexecinfo.so|' \
${WRKSRC}/rts/CMakeLists.txt \
${WRKSRC}/rts/builds/dedicated/CMakeLists.txt
+.else
+ @${REINPLACE_CMD} -e 's|execinfo|/usr/lib/libexecinfo.so|' \
+ ${WRKSRC}/rts/CMakeLists.txt \
+ ${WRKSRC}/rts/builds/dedicated/CMakeLists.txt
+.endif
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/rts/System/Platform/Misc.cpp
@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}&|' \
Index: games/super_methane_brothers/Makefile
===================================================================
--- games/super_methane_brothers/Makefile (revision 347827)
+++ games/super_methane_brothers/Makefile (working copy)
@@ -14,8 +14,7 @@
LICENSE= GPLv2
-LIB_DEPENDS= clan23Core:${PORTSDIR}/devel/clanlib \
- execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= clan23Core:${PORTSDIR}/devel/clanlib
USES= gmake pkgconfig
USE_GCC= yes
@@ -24,7 +23,6 @@
MAKE_JOBS_UNSAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
PORTDOCS= *
PLIST_FILES= bin/methane
@@ -35,6 +33,13 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.else
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e \
's|-2.2|-2.3|g ; \
Index: games/tbe/Makefile
===================================================================
--- games/tbe/Makefile (revision 347827)
+++ games/tbe/Makefile (working copy)
@@ -11,7 +11,6 @@
COMMENT= The Butterfly Effect
BUILD_DEPENDS= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
USES= qmake gmake
USE_QT4= corelib gui moc_build rcc_build svg uic_build xml
@@ -33,6 +32,12 @@
@${REINPLACE_CMD} -e '/ensure that no-one tries to build/,$$d' \
${WRKSRC}/tbe.pro
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
pre-configure:
# This is supposedly done by the ./configure script
@cd ${WRKSRC}/3rdParty && ${GMAKE}
@@ -42,4 +47,4 @@
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
cd ${WRKSRC} && ${PAX} -rw images levels ${STAGEDIR}${DATADIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: games/ufoai/Makefile
===================================================================
--- games/ufoai/Makefile (revision 347827)
+++ games/ufoai/Makefile (working copy)
@@ -16,7 +16,6 @@
jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
curl:${PORTSDIR}/ftp/curl \
- execinfo:${PORTSDIR}/devel/libexecinfo \
theora.0:${PORTSDIR}/multimedia/libtheora \
xvidcore.4:${PORTSDIR}/multimedia/xvid \
mxml:${PORTSDIR}/textproc/mxml
@@ -49,6 +48,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if $(PORT_OPTIONS:MSERVER)
CONFIGURE_ARGS+= --enable-ufoded
UFO_FILES+= ufoded
Index: games/widelands/Makefile
===================================================================
--- games/widelands/Makefile (revision 347827)
+++ games/widelands/Makefile (working copy)
@@ -13,8 +13,7 @@
COMMENT= Realtime strategy game inspired by Settlers II
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
- libGLEW.so:${PORTSDIR}/graphics/glew \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libGLEW.so:${PORTSDIR}/graphics/glew
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
USE_BZIP2= yes
@@ -37,8 +36,14 @@
"Game;StrategyGame;" \
false
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/cmake/Modules/*.cmake
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: graphics/fotoxx/Makefile
===================================================================
--- graphics/fotoxx/Makefile (revision 347827)
+++ graphics/fotoxx/Makefile (working copy)
@@ -12,7 +12,6 @@
LICENSE= GPLv3
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
ufraw-batch:${PORTSDIR}/graphics/ufraw \
exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
@@ -44,6 +43,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# These hacks are required because the nginx server at the primary
# master site and most of our fetch(1) versions do not get along well.
# This code can be removed once r261263 has been merged from
Index: graphics/k3d/Makefile
===================================================================
--- graphics/k3d/Makefile (revision 347827)
+++ graphics/k3d/Makefile (working copy)
@@ -17,7 +17,6 @@
BUILD_DEPENDS= ${LOCALBASE}/include/gmm/gmm.h:${PORTSDIR}/math/gmm++
LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff \
@@ -57,6 +56,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:M3DS}
LIB_DEPENDS+= lib3ds-1.so:${PORTSDIR}/graphics/lib3ds
PLIST_SUB+= 3DS=""
Index: graphics/picpuz/Makefile
===================================================================
--- graphics/picpuz/Makefile (revision 347827)
+++ graphics/picpuz/Makefile (working copy)
@@ -16,7 +16,6 @@
ALL_TARGET= #
#RUN_DEPENDS+= xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
DESKTOP_ENTRIES="Picpuz" \
"Jigsaw Puzzle" \
"${PREFIX}/share/pixmaps/picpuz.png" \
@@ -28,4 +27,10 @@
(cd ${STAGEDIR}${PREFIX}/share/pixmaps && \
${LN} -s ${DATADIR}/icons/picpuz.png .)
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: graphics/qgis/Makefile
===================================================================
--- graphics/qgis/Makefile (revision 347827)
+++ graphics/qgis/Makefile (working copy)
@@ -17,8 +17,7 @@
libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
libgdal.so:${PORTSDIR}/graphics/gdal \
libspatialite.so:${PORTSDIR}/databases/spatialite \
- libspatialindex.so:${PORTSDIR}/devel/spatialindex \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libspatialindex.so:${PORTSDIR}/devel/spatialindex
BUILD_DEPENDS= txt2tags:${PORTSDIR}/textproc/txt2tags
@@ -44,6 +43,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MGRASS}
CMAKE_ARGS+= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.3
RUN_DEPENDS+= ${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
Index: irc/quassel/Makefile
===================================================================
--- irc/quassel/Makefile (revision 347827)
+++ irc/quassel/Makefile (working copy)
@@ -10,8 +10,6 @@
MAINTAINER= makc at FreeBSD.org
COMMENT= Qt 4 based distributed IRC client
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USE_BZIP2= yes
USES= cmake:outsource
USE_QT4= corelib network script sql \
@@ -34,6 +32,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MNLS}
USE_QT4+= linguist_build
.endif
Index: irc/weechat/Makefile
===================================================================
--- irc/weechat/Makefile (revision 347827)
+++ irc/weechat/Makefile (working copy)
@@ -150,8 +150,10 @@
.endif
.if ${PORT_OPTIONS:MBACKTRACE}
+.if ${OSVERSION} < 1000052
LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif
+.endif
.if ${PORT_OPTIONS:MICON}
PLIST_SUB+= ICON=""
Index: irc/weechat-devel/Makefile
===================================================================
--- irc/weechat-devel/Makefile (revision 347827)
+++ irc/weechat-devel/Makefile (working copy)
@@ -160,8 +160,10 @@
.endif
.if ${PORT_OPTIONS:MBACKTRACE}
-LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif
+.endif
.if ${PORT_OPTIONS:MICON}
PLIST_SUB+= ICON=""
Index: lang/hiphop-php/Makefile
===================================================================
--- lang/hiphop-php/Makefile (revision 347827)
+++ lang/hiphop-php/Makefile (working copy)
@@ -34,7 +34,6 @@
LIB_DEPENDS= libicudata.so:${PORTSDIR}/devel/icu \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libtbb.so:${PORTSDIR}/devel/tbb \
libgd.so:${PORTSDIR}/graphics/gd \
libmcrypt.so:${PORTSDIR}/security/libmcrypt \
@@ -100,6 +99,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
_CFLAGS= ${CFLAGS} -DHAVE_POSIX_FALLOCATE=1
_CXXFLAGS= ${CXXFLAGS} -D_GLIBCXX_USE_C99 -DHAVE_POSIX_FALLOCATE=1
Index: lang/ruby19/Makefile
===================================================================
--- lang/ruby19/Makefile (revision 347827)
+++ lang/ruby19/Makefile (working copy)
@@ -17,8 +17,7 @@
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
@@ -55,6 +54,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# PORTEPOCH/PORTREVISION hack
.if ${PORTEPOCH} != 0
Index: lang/ruby20/Makefile
===================================================================
--- lang/ruby20/Makefile (revision 347827)
+++ lang/ruby20/Makefile (working copy)
@@ -17,8 +17,7 @@
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
@@ -53,6 +52,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# PORTEPOCH/PORTREVISION hack
.if ${PORTEPOCH} != 0
Index: lang/ruby21/Makefile
===================================================================
--- lang/ruby21/Makefile (revision 347827)
+++ lang/ruby21/Makefile (working copy)
@@ -17,8 +17,7 @@
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
@@ -53,6 +52,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# PORTEPOCH/PORTREVISION hack
.if ${PORTEPOCH} != 0
Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile (revision 347827)
+++ lang/rust/Makefile (working copy)
@@ -54,7 +54,9 @@
PLIST_SUB+= RUSTPKG="@comment "
.endif
-LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
MAKE_ARGS+= CC=${CC} CXX=${CXX} ARCH=x86_64
CONFIGURE_ARGS+= --disable-valgrind --disable-docs
Index: lang/smalltalk/Makefile
===================================================================
--- lang/smalltalk/Makefile (revision 347827)
+++ lang/smalltalk/Makefile (working copy)
@@ -13,7 +13,6 @@
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
gawk:${PORTSDIR}/lang/gawk
LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libcairo.so:${PORTSDIR}/graphics/cairo
OPTIONS_DEFINE= TK PGSQL SDL
@@ -57,6 +56,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "sparc64"
BROKEN= Fails to install on sparc64
.endif
Index: lang/v8/Makefile
===================================================================
--- lang/v8/Makefile (revision 347827)
+++ lang/v8/Makefile (working copy)
@@ -12,7 +12,6 @@
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
CONFLICTS= v8-3.24.*
@@ -26,6 +25,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${COMPILER_TYPE} == clang
MAKE_ENV+= LINK=clang++
CFLAGS+= -Wno-unused-private-field
Index: lang/v8-devel/Makefile
===================================================================
--- lang/v8-devel/Makefile (revision 347827)
+++ lang/v8-devel/Makefile (working copy)
@@ -14,8 +14,7 @@
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu
CONFLICTS= v8-3.19.*
@@ -31,6 +30,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${COMPILER_TYPE} == clang
MAKE_ENV+= LINK=clang++ AR=/usr/bin/ar
MAKE_ARGS+= clang=on
Index: mail/claws-mail/Makefile
===================================================================
--- mail/claws-mail/Makefile (revision 347827)
+++ mail/claws-mail/Makefile (working copy)
@@ -6,8 +6,7 @@
COMMENT= Lightweight and featureful GTK+ based e-mail and news client
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libetpan.so:${PORTSDIR}/mail/libetpan \
+LIB_DEPENDS= libetpan.so:${PORTSDIR}/mail/libetpan \
libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
@@ -60,6 +59,12 @@
.include "Makefile.claws"
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g' \
${WRKSRC}/configure
@@ -89,4 +94,4 @@
thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
${STAGEDIR}${DATADIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: multimedia/audacious/Makefile
===================================================================
--- multimedia/audacious/Makefile (revision 347827)
+++ multimedia/audacious/Makefile (working copy)
@@ -42,9 +42,11 @@
PLIST_SUB+= WITH_DBUS="@comment "
.endif
+.if ${OSVERSION} < 1000052
.if ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
.endif
+.endif
.if ${PORT_OPTIONS:MGNOME}
USE_GNOME+= gconf2
@@ -78,6 +80,7 @@
post-patch:
@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
${WRKSRC}/Makefile
+.if ${OSVERSION} < 1000052
.if ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
${WRKSRC}/src/audacious/Makefile
@@ -84,6 +87,12 @@
@${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \
${WRKSRC}/audacious.pc.in
.endif
+.else
+ @${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -lexecinfo|' \
+ ${WRKSRC}/src/audacious/Makefile
+ @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \
+ ${WRKSRC}/audacious.pc.in
+.endif
post-install:
.if defined(WITH_GNOME)
Index: multimedia/tvheadend/Makefile
===================================================================
--- multimedia/tvheadend/Makefile (revision 347827)
+++ multimedia/tvheadend/Makefile (working copy)
@@ -17,8 +17,7 @@
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
USES= pkgconfig gmake
USE_PYTHON= yes
@@ -49,6 +48,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${OSVERSION} < 900000
.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "mips64"
CFLAGS+= -D__WORDSIZE=64
Index: multimedia/vdr-plugin-markad/Makefile
===================================================================
--- multimedia/vdr-plugin-markad/Makefile (revision 347827)
+++ multimedia/vdr-plugin-markad/Makefile (working copy)
@@ -11,8 +11,7 @@
MAINTAINER= nox at FreeBSD.org
COMMENT= Video Disk Recorder - MarkAd plugin
-LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
USES= pkgconfig
PATCH_STRIP= -p1
@@ -29,6 +28,12 @@
.include "${.CURDIR}/../vdr/Makefile.plugins"
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# for libexecinfo: (so that __builtin_frame_address() finds the top
# of the stack)
.if ${ARCH} == "amd64"
@@ -46,4 +51,4 @@
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: multimedia/xine/Makefile
===================================================================
--- multimedia/xine/Makefile (revision 347827)
+++ multimedia/xine/Makefile (working copy)
@@ -12,8 +12,7 @@
LICENSE= GPLv2
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libjpeg.so:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png \
libxine.so:${PORTSDIR}/multimedia/libxine
@@ -64,6 +63,12 @@
AALIB_CONFIGURE_ON= --with-aalib
AALIB_CONFIGURE_OFF= --without-aalib --disable-aalibtest
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e \
'/THREAD_LIBS/s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
@@ -80,4 +85,4 @@
@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xitk
${INSTALL_DATA} ${WRKSRC}/src/xitk/xine-toolkit/README ${STAGEDIR}${PREFIX}/share/doc/xitk
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: net/asterisk/Makefile
===================================================================
--- net/asterisk/Makefile (revision 347827)
+++ net/asterisk/Makefile (working copy)
@@ -15,8 +15,7 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
- newt.52:${PORTSDIR}/devel/newt \
- execinfo:${PORTSDIR}/devel/libexecinfo
+ newt.52:${PORTSDIR}/devel/newt
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
@@ -77,6 +76,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PREFIX} == ${LOCALBASE}
VARDIR=/var
.else
Index: net/asterisk11/Makefile
===================================================================
--- net/asterisk11/Makefile (revision 347827)
+++ net/asterisk11/Makefile (working copy)
@@ -12,7 +12,6 @@
LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.52:${PORTSDIR}/devel/newt \
- execinfo:${PORTSDIR}/devel/libexecinfo \
sqlite3:${PORTSDIR}/databases/sqlite3 \
uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
@@ -75,6 +74,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PREFIX} == ${LOCALBASE}
VARDIR=/var
.else
Index: net/crtmpserver/Makefile
===================================================================
--- net/crtmpserver/Makefile (revision 347827)
+++ net/crtmpserver/Makefile (working copy)
@@ -12,8 +12,6 @@
LICENSE= GPLv3
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
USES= cmake:outsource lua
@@ -25,6 +23,12 @@
USE_RC_SUBR= crtmpserver
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e "s,/usr/local/include/lua51,${LUA_INCDIR},g" \
-e "s,lua$$,lua-${LUA_VER},g" \
@@ -38,4 +42,4 @@
@${MKDIR} ${STAGEDIR}${PREFIX}/var/log/crtmpserver
@${MKDIR} ${STAGEDIR}${PREFIX}/var/crtmpserver/media
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: net/mpich2/Makefile
===================================================================
--- net/mpich2/Makefile (revision 347827)
+++ net/mpich2/Makefile (working copy)
@@ -18,7 +18,6 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
GNU_CONFIGURE= yes
@@ -65,6 +64,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MDEBUG}
MAKE_ENV+= VERBOSE=1
.endif
Index: net/openmpi/Makefile
===================================================================
--- net/openmpi/Makefile (revision 347827)
+++ net/openmpi/Makefile (working copy)
@@ -12,8 +12,7 @@
MAINTAINER= danilo at FreeBSD.org
COMMENT= High Performance Message Passing Library
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libhwloc.so:${PORTSDIR}/devel/hwloc \
+LIB_DEPENDS= libhwloc.so:${PORTSDIR}/devel/hwloc \
libltdl.so:${PORTSDIR}/devel/libltdl
CONFLICTS= openmpi-devel-1.7.*
@@ -78,6 +77,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64
.endif
Index: net/openmpi-devel/Makefile
===================================================================
--- net/openmpi-devel/Makefile (revision 347827)
+++ net/openmpi-devel/Makefile (working copy)
@@ -11,8 +11,7 @@
MAINTAINER= danilo at FreeBSD.org
COMMENT= High Performance Message Passing Library
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libhwloc.so:${PORTSDIR}/devel/hwloc \
+LIB_DEPENDS= libhwloc.so:${PORTSDIR}/devel/hwloc \
libltdl.so:${PORTSDIR}/devel/libltdl
CONFLICTS= openmpi-1.6.*
@@ -74,4 +73,10 @@
VT_CONFIGURE_OFF= --enable-contrib-no-build=vt --disable-vt
VT_USE= JAVA=yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: net/samba36/Makefile
===================================================================
--- net/samba36/Makefile (revision 347827)
+++ net/samba36/Makefile (working copy)
@@ -79,8 +79,6 @@
CONFIGURE_ENV+= ac_cv_header_sys_mount_h=yes
# XXX: readdir test fails on ZFS, bringing unusable replacement code
CONFIGURE_ENV+= libreplace_cv_READDIR_NEEDED=no
-# Let process generate meaningful backtrace on a core dump
-LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
# tdb
BUILD_DEPENDS+= tdb>=1.2.6:${PORTSDIR}/databases/tdb
RUN_DEPENDS+= tdb>=1.2.6:${PORTSDIR}/databases/tdb
@@ -353,6 +351,11 @@
.include <bsd.port.pre.mk>
+# Let process generate meaningful backtrace on a core dump
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%SAMBA_CONFIG%%|${SAMBA_CONFIG}|g' \
${WRKSRC}/Makefile.in
Index: net/samba4/Makefile
===================================================================
--- net/samba4/Makefile (revision 347827)
+++ net/samba4/Makefile (working copy)
@@ -79,9 +79,6 @@
# XXX: Unconditional dependencies which can't be switched off(if present in the system)
# popt
LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt
-# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
-# backtrace
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
# inotify
LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify
# SASL
@@ -154,6 +151,12 @@
.include <bsd.port.options.mk>
+# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
+# backtrace
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# !SAMBA4_SUBPORT
.endif
Index: net/samba41/Makefile
===================================================================
--- net/samba41/Makefile (revision 347827)
+++ net/samba41/Makefile (working copy)
@@ -74,9 +74,6 @@
# XXX: Unconditional dependencies which can't be switched off(if present in the system)
# popt
LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt
-# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
-# backtrace
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
# inotify
LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify
# SASL
@@ -145,6 +142,12 @@
.include <bsd.port.options.mk>
+# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?)
+# backtrace
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
CONFIGURE_ARGS+= \
--with-pam \
--with-iconv \
Index: net-im/telepathy-idle/Makefile
===================================================================
--- net-im/telepathy-idle/Makefile (revision 347827)
+++ net-im/telepathy-idle/Makefile (working copy)
@@ -10,8 +10,7 @@
COMMENT= IRC Connection Manager for Telepathy Framework
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
- dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
GNU_CONFIGURE= yes
@@ -35,9 +34,15 @@
# linker flags for OPENSSL, overriding pkg-config
NO_STAGE= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|strnlen(\([^,]*\), [^)]*)|strlen(\1)|' \
${WRKSRC}/src/idle-connection.c \
${WRKSRC}/src/idle-parser.c
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: net-mgmt/zabbix2-server/Makefile
===================================================================
--- net-mgmt/zabbix2-server/Makefile (revision 347827)
+++ net-mgmt/zabbix2-server/Makefile (working copy)
@@ -61,8 +61,7 @@
--datadir=${ETCDIR}
.if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
- execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
SUB_FILES= pkg-message
@@ -92,6 +91,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MMYSQL}
ZABBIX_REQUIRE= " mysql"
USE_MYSQL= yes
Index: net-mgmt/zabbix22-server/Makefile
===================================================================
--- net-mgmt/zabbix22-server/Makefile (revision 347827)
+++ net-mgmt/zabbix22-server/Makefile (working copy)
@@ -63,8 +63,7 @@
--with-iconv=${ICONV_PREFIX}
.if ${ZABBIX_BUILD} != "agent"
-LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
- execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
SUB_FILES= pkg-message
@@ -95,6 +94,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MMYSQL}
ZABBIX_REQUIRE= " mysql"
USE_MYSQL= yes
Index: net-p2p/eiskaltdcpp-qt/Makefile
===================================================================
--- net-p2p/eiskaltdcpp-qt/Makefile (revision 347827)
+++ net-p2p/eiskaltdcpp-qt/Makefile (working copy)
@@ -15,8 +15,7 @@
RUN_DEPENDS= ${LOCALBASE}/share/eiskaltdcpp/keep_me:${PORTSDIR}/net-p2p/eiskaltdcpp-data
-LIB_DEPENDS+= eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib \
- execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS+= eiskaltdcpp:${PORTSDIR}/net-p2p/eiskaltdcpp-lib
BUILD_DEPENDS+= chrpath:${PORTSDIR}/devel/chrpath
CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF
@@ -55,6 +54,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MASPELL}
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
CMAKE_ARGS+= -DUSE_ASPELL:BOOL=on
Index: net-p2p/qbittorrent/Makefile
===================================================================
--- net-p2p/qbittorrent/Makefile (revision 347827)
+++ net-p2p/qbittorrent/Makefile (working copy)
@@ -13,8 +13,7 @@
LICENSE= GPLv2
# ABI versions specified on purpose for libtorrent-rasterbar
-LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
USES= pkgconfig
USE_QT4= corelib network qmake_build linguist_build moc_build \
@@ -38,6 +37,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MDBUS}
USE_QT4+= dbus
.endif
Index: polish/ekg/Makefile
===================================================================
--- polish/ekg/Makefile (revision 347827)
+++ polish/ekg/Makefile (working copy)
@@ -11,8 +11,7 @@
MAINTAINER= pawel at FreeBSD.org
COMMENT= Text-mode Gadu-Gadu client
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libgadu.so:${PORTSDIR}/polish/libgadu
+LIB_DEPENDS= libgadu.so:${PORTSDIR}/polish/libgadu
GNU_CONFIGURE= yes
USES= gmake pathfix pkgconfig
@@ -33,7 +32,13 @@
OPENSSL_CONFIGURE_OFF= --without-openssl
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ekg
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: ports-mgmt/packagekit/Makefile
===================================================================
--- ports-mgmt/packagekit/Makefile (revision 347827)
+++ ports-mgmt/packagekit/Makefile (working copy)
@@ -13,8 +13,7 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \
${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
- dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
ck-connector:${PORTSDIR}/sysutils/consolekit
RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \
@@ -28,7 +27,6 @@
USE_PYTHON_BUILD= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
CONFIGURE_ARGS+=--with-security-framework=polkit \
--localstatedir=/var \
--disable-gtk-doc \
@@ -50,6 +48,13 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.else
+LDFLAGS+= -lexecinfo
+.endif
+
. if ${PORT_OPTIONS:MMANPAGES}
BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
xsltproc:${PORTSDIR}/textproc/libxslt \
Index: print/scribus/Makefile
===================================================================
--- print/scribus/Makefile (revision 347827)
+++ print/scribus/Makefile (working copy)
@@ -22,7 +22,6 @@
libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
libcairo.so:${PORTSDIR}/graphics/cairo \
libhyphen.so:${PORTSDIR}/textproc/hyphen \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
@@ -42,7 +41,13 @@
MANCOMPRESSED= no
NO_STAGE= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-install:
${LN} ${DATADIR}/icons/scribus.png ${PREFIX}/share/pixmaps/
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: print/scribus-devel/Makefile
===================================================================
--- print/scribus-devel/Makefile (revision 347827)
+++ print/scribus-devel/Makefile (working copy)
@@ -24,7 +24,6 @@
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libaspell.so:${PORTSDIR}/textproc/aspell \
libcairo.so:${PORTSDIR}/graphics/cairo \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libpoppler.so:${PORTSDIR}/graphics/poppler \
libosg.so:${PORTSDIR}/graphics/osg
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
@@ -52,6 +51,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-install:
${LN} ${DATADIR}/icons/scribus.png ${PREFIX}/share/pixmaps/
-update-desktop-database
Index: science/mpqc/Makefile
===================================================================
--- science/mpqc/Makefile (revision 347827)
+++ science/mpqc/Makefile (working copy)
@@ -46,8 +46,10 @@
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif
+.endif
.if defined(WITH_ICC)
CC= ${LOCALBASE}/intel_cc_80/bin/icc
Index: security/strongswan/Makefile
===================================================================
--- security/strongswan/Makefile (revision 347827)
+++ security/strongswan/Makefile (working copy)
@@ -11,8 +11,6 @@
MAINTAINER= strongswan at nanoteq.com
COMMENT= Open Source IKEv2 IPsec-based VPN solution
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USE_BZIP2= yes
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
@@ -83,6 +81,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MEAPSIMFILE} || ${PORT_OPTIONS:MEAPAKA3GPP2}
PLIST_SUB+= SIMAKA=""
.else
Index: sysutils/dunst/Makefile
===================================================================
--- sysutils/dunst/Makefile (revision 347827)
+++ sysutils/dunst/Makefile (working copy)
@@ -13,7 +13,6 @@
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libdbus-1.so:${PORTSDIR}/devel/dbus \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libnotify.so:${PORTSDIR}/devel/libnotify \
libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango \
@@ -36,4 +35,10 @@
share/dbus-1/services/org.knopwob.dunst.service
PLIST_DIRS= share/dunst
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: sysutils/fusefs-ext4fuse/Makefile
===================================================================
--- sysutils/fusefs-ext4fuse/Makefile (revision 347827)
+++ sysutils/fusefs-ext4fuse/Makefile (working copy)
@@ -12,8 +12,6 @@
LICENSE= GPLv2
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USES= fuse pkgconfig gmake
USE_GITHUB= yes
GH_ACCOUNT= gerard
@@ -27,7 +25,13 @@
PLIST_FILES= bin/ext4fuse
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/fusefs-rar2fs/Makefile
===================================================================
--- sysutils/fusefs-rar2fs/Makefile (revision 347827)
+++ sysutils/fusefs-rar2fs/Makefile (working copy)
@@ -14,8 +14,7 @@
LICENSE= GPLv3
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libunrar.so:${PORTSDIR}/archivers/libunrar4
+LIB_DEPENDS= libunrar.so:${PORTSDIR}/archivers/libunrar4
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-fuse-lib=${LOCALBASE}/lib \
@@ -26,6 +25,12 @@
PLIST_FILES= bin/${PORTNAME} man/man1/rar2fs.1.gz
USES= fuse gmake
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} 's/-lstdc++/-lexecinfo/' ${WRKSRC}/Makefile.in
@@ -33,4 +38,4 @@
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/rar2fs.1 ${STAGEDIR}${PREFIX}/man/man1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/gnome-power-manager/Makefile
===================================================================
--- sysutils/gnome-power-manager/Makefile (revision 347827)
+++ sysutils/gnome-power-manager/Makefile (working copy)
@@ -15,7 +15,6 @@
LIB_DEPENDS= upower-glib.1:${PORTSDIR}/sysutils/upower \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
notify.4:${PORTSDIR}/devel/libnotify \
- execinfo:${PORTSDIR}/devel/libexecinfo \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit
@@ -44,6 +43,12 @@
.endif
NO_STAGE= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \
${WRKSRC}/configure
@@ -52,4 +57,4 @@
s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/htop/Makefile
===================================================================
--- sysutils/htop/Makefile (revision 347827)
+++ sysutils/htop/Makefile (working copy)
@@ -9,8 +9,6 @@
MAINTAINER= gaod at hychen.org
COMMENT= A better top(1) - interactive process viewer
-LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
-
OPTIONS_DEFINE= LSOF
OPTIONS_DEFAULT= LSOF
@@ -34,6 +32,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MLSOF}
RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
.endif
Index: sysutils/mate-power-manager/Makefile
===================================================================
--- sysutils/mate-power-manager/Makefile (revision 347827)
+++ sysutils/mate-power-manager/Makefile (working copy)
@@ -15,7 +15,6 @@
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
libupower-glib.so:${PORTSDIR}/sysutils/upower \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libnotify.so:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit
@@ -41,9 +40,15 @@
GLIB_SCHEMAS= org.mate.power-manager.gschema.xml
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e "s|docbook2man|docbook2man_disabled|g" \
${WRKSRC}/configure.ac
@${CHMOD} +x ${WRKSRC}/autogen.sh
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sysutils/openipmi/Makefile
===================================================================
--- sysutils/openipmi/Makefile (revision 347827)
+++ sysutils/openipmi/Makefile (working copy)
@@ -115,8 +115,10 @@
.endif
.if ${PORT_OPTIONS:MTRACE}
-LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif
+.endif
.if ${PORT_OPTIONS:MGDBM}
LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
Index: sysutils/ori/Makefile
===================================================================
--- sysutils/ori/Makefile (revision 347827)
+++ sysutils/ori/Makefile (working copy)
@@ -11,8 +11,7 @@
COMMENT= Ori Distributed File System
LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 \
- libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libboost_date_time.so:${PORTSDIR}/devel/boost-libs
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -30,6 +29,12 @@
man/man1/orifs.1.gz \
man/man1/orisync.1.gz
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
do-install:
@${ECHO_MSG} "===> Installing binaries..."
${INSTALL_PROGRAM} ${WRKSRC}/build/ori/ori ${STAGEDIR}${PREFIX}/bin/
@@ -42,4 +47,4 @@
${INSTALL_MAN} ${WRKSRC}/docs/orifs.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/docs/orisync.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: textproc/goldendict/Makefile
===================================================================
--- textproc/goldendict/Makefile (revision 347827)
+++ textproc/goldendict/Makefile (working copy)
@@ -14,7 +14,6 @@
LICENSE= GPLv3
LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libvorbis.so:${PORTSDIR}/audio/libvorbis
USE_BZIP2= yes
@@ -27,6 +26,12 @@
linguist_build moc_build rcc_build script_build uic_build
INSTALLS_ICONS= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} 's:/usr:${PREFIX}:' ${WRKSRC}/redist/goldendict.desktop
@@ -35,4 +40,4 @@
${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${STAGEDIR}${DATADIR}/locale
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: textproc/zorba/Makefile
===================================================================
--- textproc/zorba/Makefile (revision 347827)
+++ textproc/zorba/Makefile (working copy)
@@ -13,8 +13,7 @@
LICENSE= APACHE20
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
+LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
libicudata.so:${PORTSDIR}/devel/icu \
libcurl.so:${PORTSDIR}/ftp/curl \
libtidy.so:${PORTSDIR}/www/tidy-lib \
@@ -44,12 +43,16 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MPHP}
USE_PHP= tokenizer
USE_PHP_BUILD= yes
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_PHP5:BOOL=true \
- -DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
+ -DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
PLIST_SUB+= WITH_PHP="" \
PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}"
.else
@@ -86,7 +89,7 @@
CATEGORIES+= java
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_JAVA:BOOL=true \
- -DJAVA_LIBDIR:PATH=${JAVALIBDIR}
+ -DJAVA_LIBDIR:PATH=${JAVALIBDIR}
PLIST_SUB+= WITH_JAVA=""
.else
CMAKE_ARGS+= -DWITH_JAVA:BOOL=false
Index: www/elinks/Makefile
===================================================================
--- www/elinks/Makefile (revision 347827)
+++ www/elinks/Makefile (working copy)
@@ -201,11 +201,11 @@
#
# Elinks will try to use it if exists
#
-.if exists(/usr/include/execinfo.h)
-LDFLAGS+= -lexecinfo
-.elif exists(${LOCALBASE}/include/execinfo.h)
+.if ${OSVERSION} < 1000052
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
+.else
+LDFLAGS+= -lexecinfo
.endif
.include <bsd.port.mk>
Index: www/links-hacked/Makefile
===================================================================
--- www/links-hacked/Makefile (revision 347827)
+++ www/links-hacked/Makefile (working copy)
@@ -10,8 +10,7 @@
MAINTAINER= peter at vereshagin.org
COMMENT= Hacked version of a Links WWW browser
-LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo \
- gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
CONFLICTS= links-[0-9]*
@@ -35,6 +34,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MDIRECTFB}
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
Index: www/mod_backtrace/Makefile
===================================================================
--- www/mod_backtrace/Makefile (revision 347827)
+++ www/mod_backtrace/Makefile (working copy)
@@ -16,8 +16,6 @@
LICENSE= APACHE20
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
MANUAL_PACKAGE_BUILD= yes
USE_APACHE= 22+
@@ -24,11 +22,17 @@
AP_FAST_BUILD= yes
AP_GENPLIST= yes
AP_EXTRAS+= -lexecinfo
-AP_LIB+= ${LOCALBASE}/lib
SHORTMODNAME= backtrace
WRKSRC= ${WRKDIR}
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+AP_LIB+= ${LOCALBASE}/lib
+.endif
+
pre-everything::
@${ECHO_MSG} "*********************** PLEASE NOTE! ***********************"
@${ECHO_MSG} "Apache httpd must be built with the --enable-exception-hook"
@@ -39,4 +43,4 @@
@${MKDIR} ${WRKSRC}
${CP} ${DISTDIR}/${PORTNAME}.c ${WRKSRC}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: www/mod_pagespeed/Makefile
===================================================================
--- www/mod_pagespeed/Makefile (revision 347827)
+++ www/mod_pagespeed/Makefile (working copy)
@@ -24,8 +24,7 @@
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libicutu.so:${PORTSDIR}/devel/icu \
- libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libopencv_legacy.so:${PORTSDIR}/graphics/opencv
USES= gmake pkgconfig
USE_XZ= yes
@@ -63,6 +62,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
# testing
#USE_GCC= yes
#.if ${OSVERSION} > 1000000
Index: www/node/Makefile
===================================================================
--- www/node/Makefile (revision 347827)
+++ www/node/Makefile (working copy)
@@ -12,8 +12,6 @@
LICENSE= MIT
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
USE_PYTHON= 2
@@ -26,6 +24,12 @@
PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
REINPLACE_ARGS= -i ''
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e '1 s|${SETENV} python|${PYTHON_CMD}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e "s|'python',|'${PYTHON_CMD}',|" \
@@ -44,4 +48,4 @@
@${ECHO_MSG} "Note: If you need npm (Node Package Manager), please install www/npm."
@${ECHO_MSG}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: www/node-devel/Makefile
===================================================================
--- www/node-devel/Makefile (revision 347827)
+++ www/node-devel/Makefile (working copy)
@@ -13,8 +13,6 @@
LICENSE= MIT
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-
USES= gmake
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -38,6 +36,12 @@
GYP_DEFINES+= gcc_version=${CXX:S/g++//}
.endif
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/tools/gyp/v8.gyp
@@ -56,4 +60,4 @@
@${ECHO_MSG} "Note: If you need npm (Node Package Manager), please install www/npm."
@${ECHO_MSG}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: www/qupzilla/Makefile
===================================================================
--- www/qupzilla/Makefile (revision 347827)
+++ www/qupzilla/Makefile (working copy)
@@ -11,8 +11,7 @@
LICENSE= GPLv3
-LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
USES= desktop-file-utils pkgconfig qmake
USE_QT4= gui moc_build rcc_build uic_build webkit \
@@ -21,6 +20,12 @@
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
${WRKSRC}/tests/autotests/qztoolstest.cpp \
@@ -30,4 +35,4 @@
${WRKSRC}/src/defines.pri \
${WRKSRC}/src/lib/plugins/plugins.cpp
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: www/trafficserver/Makefile
===================================================================
--- www/trafficserver/Makefile (revision 347827)
+++ www/trafficserver/Makefile (working copy)
@@ -12,8 +12,7 @@
LICENSE= APACHE20
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libpcre.so:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
libxml2.so:${PORTSDIR}/textproc/libxml2 \
libboost_system.so:${PORTSDIR}/devel/boost-libs \
libcurl.so:${PORTSDIR}/ftp/curl \
@@ -66,6 +65,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MRECLAIM}
CONFIGURE_ARGS+= --enable-reclaimable-freelist --enable-freelist
.elif ${PORT_OPTIONS:MFREELISTS}
Index: x11/gdm/Makefile
===================================================================
--- x11/gdm/Makefile (revision 347827)
+++ x11/gdm/Makefile (working copy)
@@ -13,10 +13,9 @@
COMMENT= GNOME 2 version of xdm display manager
BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
- ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= ck-connector:${PORTSDIR}/sysutils/consolekit \
polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
- execinfo:${PORTSDIR}/devel/libexecinfo \
upower-glib:${PORTSDIR}/sysutils/upower \
xklavier:${PORTSDIR}/x11/libxklavier \
canberra-gtk:${PORTSDIR}/audio/libcanberra
@@ -62,6 +61,10 @@
NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MKEYRING}
LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring
SUB_LIST+= PAM_KEYRING=
Index: x11/gnome-session/Makefile
===================================================================
--- x11/gnome-session/Makefile (revision 347827)
+++ x11/gnome-session/Makefile (working copy)
@@ -18,10 +18,9 @@
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
notify.4:${PORTSDIR}/devel/libnotify \
- execinfo:${PORTSDIR}/devel/libexecinfo \
upower-glib.1:${PORTSDIR}/sysutils/upower
RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
- ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
+ ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
INSTALLS_ICONS= yes
@@ -40,4 +39,10 @@
GCONF_SCHEMAS= gnome-session.schemas
NO_STAGE= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: x11/mate-session-manager/Makefile
===================================================================
--- x11/mate-session-manager/Makefile (revision 347827)
+++ x11/mate-session-manager/Makefile (working copy)
@@ -11,8 +11,7 @@
COMMENT= Session component for the MATE desktop
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
- libupower-glib.so:${PORTSDIR}/sysutils/upower \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libupower-glib.so:${PORTSDIR}/sysutils/upower
RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
@@ -33,4 +32,10 @@
GLIB_SCHEMAS= org.mate.session.gschema.xml
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.include <bsd.port.post.mk>
Index: x11-wm/afterstep-stable/Makefile
===================================================================
--- x11-wm/afterstep-stable/Makefile (revision 347827)
+++ x11-wm/afterstep-stable/Makefile (working copy)
@@ -12,7 +12,6 @@
COMMENT= A stable version of the AfterStep window manager
LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
- execinfo:${PORTSDIR}/devel/libexecinfo \
fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
freetype:${PORTSDIR}/print/freetype2 \
gif:${PORTSDIR}/graphics/giflib \
@@ -60,6 +59,10 @@
NO_STAGE= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if exists(${PREFIX}/share/gnome/wm-properties)
PLIST_SUB+= GNOME=""
.else
Index: x11-wm/awesome/Makefile
===================================================================
--- x11-wm/awesome/Makefile (revision 347827)
+++ x11-wm/awesome/Makefile (working copy)
@@ -30,8 +30,7 @@
libxcb-util.so:${PORTSDIR}/x11/xcb-util \
libxcb-cursor.so:${PORTSDIR}/x11/xcb-util-cursor \
libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
- libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+ libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
USE_XZ= yes
USES= cmake iconv pkgconfig lua
@@ -53,6 +52,10 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \
!exists(${LOCALBASE}/libdata/pkgconfig/cairo-xcb.pc))
IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
Index: x11-wm/enlightenment/Makefile
===================================================================
--- x11-wm/enlightenment/Makefile (revision 347827)
+++ x11-wm/enlightenment/Makefile (working copy)
@@ -13,8 +13,7 @@
LICENSE= BSD
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+LIB_DEPENDS= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
DIST_SUBDIR= e17
USE_BZIP2= yes
@@ -36,6 +35,10 @@
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
.if ${PORT_OPTIONS:MILLUME}
CONFIGURE_ARGS+=--enable-illume2
PLIST_SUB+= ILLUME=""
--- patch-libexecinfo ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list