Date: Fri, 22 Sep 2017 10:48:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450353 - in head: cad/klayout/files databases/libmemcached databases/mariadb100-server databases/mariadb101-server databases/mariadb102-server databases/mariadb55-server databases/redi... Message-ID: <201709221048.v8MAmwPw092205@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Sep 22 10:48:57 2017 New Revision: 450353 URL: https://svnweb.freebsd.org/changeset/ports/450353 Log: Cleanup after removal of libexecinfo from ports. PR: 220271 Submitted by: mat (review), Yasuhiro KIMURA (PR) Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D11488 Modified: head/cad/klayout/files/patch-config-Makefile.conf (contents, props changed) head/databases/libmemcached/Makefile (contents, props changed) head/databases/mariadb100-server/Makefile (contents, props changed) head/databases/mariadb101-server/Makefile (contents, props changed) head/databases/mariadb102-server/Makefile (contents, props changed) head/databases/mariadb55-server/Makefile (contents, props changed) head/databases/redis-devel/Makefile (contents, props changed) head/databases/redis/Makefile (contents, props changed) head/databases/twemproxy/Makefile (contents, props changed) head/databases/virtuoso/Makefile (contents, props changed) head/devel/gearmand-devel/Makefile (contents, props changed) head/devel/gearmand/Makefile (contents, props changed) head/devel/google-perftools/Makefile (contents, props changed) head/devel/libosmocore/Makefile (contents, props changed) head/games/adgali/Makefile (contents, props changed) head/games/spring/Makefile (contents, props changed) head/games/super_methane_brothers/Makefile (contents, props changed) head/games/ufoai/Makefile (contents, props changed) head/lang/rubinius/Makefile (contents, props changed) head/multimedia/audacious-gtk3/Makefile (contents, props changed) head/multimedia/audacious/Makefile (contents, props changed) head/multimedia/avidemux/Makefile.common (contents, props changed) head/multimedia/tvheadend/Makefile (contents, props changed) head/net/mpich2/Makefile (contents, props changed) head/polish/ekg/Makefile (contents, props changed) head/ports-mgmt/packagekit/Makefile (contents, props changed) head/sysutils/boxbackup/Makefile (contents, props changed) head/sysutils/htop/Makefile (contents, props changed) head/textproc/zorba/Makefile (contents, props changed) head/textproc/zorba/files/patch-CMakeLists.txt (contents, props changed) head/www/links-hacked/Makefile (contents, props changed) head/www/mod_spdy/Makefile (contents, props changed) head/www/mod_spdy/files/patch-base.gypi (contents, props changed) head/x11-wm/afterstep-stable/Makefile (contents, props changed) head/x11-wm/afterstep-stable/files/patch-configure (contents, props changed) head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure (contents, props changed) head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in (contents, props changed) head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure (contents, props changed) Modified: head/cad/klayout/files/patch-config-Makefile.conf ============================================================================== --- head/cad/klayout/files/patch-config-Makefile.conf Fri Sep 22 10:48:45 2017 (r450352) +++ head/cad/klayout/files/patch-config-Makefile.conf Fri Sep 22 10:48:57 2017 (r450353) @@ -34,7 +34,7 @@ +LOPT=${LDFLAGS} -g -Wl,-E -o +LOPT_SO=${LDFLAGS} -g -shared -o + -+LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz -L$(LOCALBASE)/lib -lexecinfo ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz -lexecinfo + +.PHONY: install +install: Modified: head/databases/libmemcached/Makefile ============================================================================== --- head/databases/libmemcached/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/libmemcached/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --without-memcached \ --without-sphinx-build \ --enable-libmemcachedprotocol -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -lexecinfo CXXFLAGS+= -D__STDC_CONSTANT_MACROS -pthread OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/mariadb100-server/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -59,7 +59,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ -DWITH_LIBEDIT=0 \ -DWITH_SSL=${OPENSSLBASE} \ -DWITH_LIBWRAP=1 \ - -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/mariadb101-server/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -90,7 +90,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ - -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/mariadb102-server/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -93,7 +93,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ - -DEXECINFO_ROOT="${LOCALBASE}" \ -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/mariadb55-server/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -46,7 +46,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=yes \ - -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/redis-devel/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -58,8 +58,7 @@ LDFLAGS+= -Wl,-E USES+= tcl:build .endif -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lm -lexecinfo +LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-3.* Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/redis/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -47,8 +47,7 @@ LDFLAGS+= -Wl,-E USES+= tcl:build .endif -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lm -lexecinfo +LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-devel-3.* Modified: head/databases/twemproxy/Makefile ============================================================================== --- head/databases/twemproxy/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/twemproxy/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -16,8 +16,7 @@ GH_ACCOUNT= twitter USES= autoreconf libtool -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo PLIST_FILES= sbin/nutcracker \ man/man8/nutcracker.8.gz \ Modified: head/databases/virtuoso/Makefile ============================================================================== --- head/databases/virtuoso/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/databases/virtuoso/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -41,8 +41,8 @@ CONFIGURE_ARGS= --with-readline\ --with-layout=freebsd\ --datadir="${PREFIX}"\ --localstatedir="${PREFIX}" -CPPFLAGS+= -std=gnu89 ${IODBC_CPPFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +CPPFLAGS+= -std=gnu89 ${IODBC_CPPFLAGS} +LDFLAGS+= -lexecinfo MAKE_ENV= PATH=${LOCALBASE}/bin:${PATH}\ ISQL=isql-vt USE_RC_SUBR= virtuoso Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/devel/gearmand-devel/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -32,8 +32,7 @@ SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE} \ --localstatedir=/var/db/${PORTNAME} --enable-static -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo OPTIONS_DEFINE= DRIZZLE MEMCACHED PGSQL SQLITE MYSQL HIREDIS TOKYOCAB OPTIONS_DEFAULT=SQLITE Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/devel/gearmand/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -31,8 +31,7 @@ SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE} \ --localstatedir=/var/db/${PORTNAME} --enable-static -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo OPTIONS_DEFINE= DRIZZLE MEMCACHED PGSQL SQLITE MYSQL HIREDIS TOKYOCAB OPTIONS_DEFAULT=SQLITE Modified: head/devel/google-perftools/Makefile ============================================================================== --- head/devel/google-perftools/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/devel/google-perftools/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -28,8 +28,7 @@ USES= compiler gmake libtool USE_LDCONFIG= yes TEST_TARGET= check -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -lexecinfo OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT=PAGE8K ALIGN16 Modified: head/devel/libosmocore/Makefile ============================================================================== --- head/devel/libosmocore/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/devel/libosmocore/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -16,7 +16,7 @@ LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite USES= alias autoreconf gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * Modified: head/games/adgali/Makefile ============================================================================== --- head/games/adgali/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/games/adgali/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -25,8 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-compile-optim=no INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo OPTIONS_DEFINE= DOCS Modified: head/games/spring/Makefile ============================================================================== --- head/games/spring/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/games/spring/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -44,12 +44,6 @@ CMAKE_ARGS= -DDATADIR:STRING="share/${PORTNAME}" \ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} -.if exists(/usr/lib/libexecinfo.so) -LEI_PREFIX= /usr -.else -LEI_PREFIX= ${LOCALBASE} -.endif - # Do not exctract bundled copies of header files for 3rd-party packages: EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude ${WRKSRC:T}/include @@ -101,7 +95,7 @@ post-patch: ${WRKSRC}/rts/System/Sync/FPUCheck.cpp @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/rts/build/cmake/*.cmake - @${REINPLACE_CMD} -e 's|execinfo|${LEI_PREFIX}/lib/libexecinfo.so|' \ + @${REINPLACE_CMD} -e 's|execinfo|/usr/lib/libexecinfo.so|' \ ${WRKSRC}/rts/CMakeLists.txt \ ${WRKSRC}/rts/builds/dedicated/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ Modified: head/games/super_methane_brothers/Makefile ============================================================================== --- head/games/super_methane_brothers/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/games/super_methane_brothers/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -19,8 +19,7 @@ USES= gmake pkgconfig tar:tgz MAKE_ENV= METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LIBS}" MAKE_JOBS_UNSAFE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -lexecinfo DATADIR= ${PREFIX}/share/methane Modified: head/games/ufoai/Makefile ============================================================================== --- head/games/ufoai/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/games/ufoai/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -29,9 +29,7 @@ USES= compiler:c++11-lang gettext gmake jpeg openal:s python:build tar:bzip2 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --enable-release --target-os=freebsd -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lexecinfo -CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -lexecinfo DATADIR= share/${PORTNAME} SUB_FILES= pkg-message Modified: head/lang/rubinius/Makefile ============================================================================== --- head/lang/rubinius/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/lang/rubinius/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -90,10 +90,6 @@ LLVM40_VARS= LLVM_CONFIG=llvm-config40 \ .include <bsd.port.pre.mk> -.if !exists(/usr/lib/libexecinfo.so) -CONFIGURE_ARGS+= --with-opt-dir "${LOCALBASE}" -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .elif ${ARCH} == "amd64" Modified: head/multimedia/audacious-gtk3/Makefile ============================================================================== --- head/multimedia/audacious-gtk3/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/multimedia/audacious-gtk3/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -49,10 +49,10 @@ EXECINFO_DESC= Build with libexecinfo support .include <bsd.port.options.mk> post-patch: -.if ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so) - @${REINPLACE_CMD} 's|-lm |-lm -L${LOCALBASE}/lib -lexecinfo |' \ +.if ${PORT_OPTIONS:MEXECINFO} + @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile - @${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \ + @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ ${WRKSRC}/audacious.pc.in .endif ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ Modified: head/multimedia/audacious/Makefile ============================================================================== --- head/multimedia/audacious/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/multimedia/audacious/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -44,10 +44,10 @@ EXECINFO_DESC= Build with libexecinfo support .include <bsd.port.options.mk> post-patch: -.if ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so) - @${REINPLACE_CMD} 's|-lm |-lm -L${LOCALBASE}/lib -lexecinfo |' \ +.if ${PORT_OPTIONS:MEXECINFO} + @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile - @${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \ + @${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \ ${WRKSRC}/audacious.pc.in .endif ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Fri Sep 22 10:48:45 2017 (r450352) +++ head/multimedia/avidemux/Makefile.common Fri Sep 22 10:48:57 2017 (r450353) @@ -76,13 +76,8 @@ CFLAGS+= -fno-omit-frame-pointer #MAKE_ENV+= ARCH=x86_64 #CONFIGURE_ENV+= ARCH=x86_64 .endif -.if !exists(/usr/lib/libexecinfo.so) -CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=${LOCALBASE}/include -CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=${LOCALBASE}/lib/libexecinfo.so -.else CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=/usr/include CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo -.endif # We haven't ALSA(Never) & Aften(Yet) on FreeBSD CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/multimedia/tvheadend/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -48,8 +48,8 @@ SUB_LIST+= TVHUSER="${TVHUSER}" \ CONFIGURE_ENV+= PLATFORM=freebsd CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-hdhomerun_static \ --disable-bintray_cache --disable-ffmpeg_static --disable-pie -CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz +CFLAGS+= -Wno-conversion -Wno-int-to-pointer-cast +LDFLAGS+= -lexecinfo -lssl -lcrypto -lz OPTIONS_DEFINE= AVAHI DVBCSA HDHOMERUN INOTIFY TRANSCODING XMLTV OPTIONS_DEFAULT=DVBCSA HDHOMERUN INOTIFY Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/net/mpich2/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -49,7 +49,7 @@ CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \ .if ${FFLAGS} == "-O" FFLAGS= -O2 .endif -LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lpthread -lexecinfo MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} NOCCACHE= yes Modified: head/polish/ekg/Makefile ============================================================================== --- head/polish/ekg/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/polish/ekg/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -21,8 +21,7 @@ CONFIGURE_ARGS= --without-libungif \ --without-libjpeg \ --disable-ui-gtk -CFLAGS+= -I/usr/include -I${LOCALBASE}/include -LDFLAGS+= -lncurses -L${LOCALBASE}/lib -lexecinfo -pthread +LDFLAGS+= -lncurses -lexecinfo -pthread OPTIONS_DEFINE= ASPELL OPENSSL OPTIONS_DEFAULT= OPENSSL Modified: head/ports-mgmt/packagekit/Makefile ============================================================================== --- head/ports-mgmt/packagekit/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/ports-mgmt/packagekit/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -28,8 +28,7 @@ SHEBANG_FILES= backends/test/helpers/search-name.sh \ USE_GNOME= glib20 intltool introspection USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -lexecinfo CONFIGURE_ARGS+=--with-security-framework=polkit \ --localstatedir=/var \ --disable-static \ Modified: head/sysutils/boxbackup/Makefile ============================================================================== --- head/sysutils/boxbackup/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/sysutils/boxbackup/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -20,11 +20,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf aclocal autoheader ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4 CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} - -.if exists(/usr/lib/libexecinfo.so) -LDFLAGS+= -lexecinfo -.endif +LDFLAGS+= -L${OPENSSLLIB} -lexecinfo MAKE_JOBS_UNSAFE=yes Modified: head/sysutils/htop/Makefile ============================================================================== --- head/sysutils/htop/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/sysutils/htop/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -13,8 +13,7 @@ LICENSE= GPLv2 RUN_DEPENDS= lsof:sysutils/lsof GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -lexecinfo CONFIGURE_ARGS= --enable-unicode USES= autoreconf libtool ncurses Modified: head/textproc/zorba/Makefile ============================================================================== --- head/textproc/zorba/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/textproc/zorba/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -50,12 +50,6 @@ PLIST_SUB+= FULLVERSION=${PORTVERSION} \ MIDVERSION=${PORTVERSION:R} \ MINVERSION=${PORTVERSION:R:R} -.if exists(/usr/lib/libexecinfo.so) -LOC_EXECINFO= /usr/lib/libexecinfo.so -.else -LOC_EXECINFO= ${LOCALBASE}/lib/libexecinfo.so -.endif - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPHP} @@ -91,7 +85,7 @@ BUILD_DEPENDS+= swig2.0:devel/swig20 .endif post-patch: - ${REINPLACE_CMD} -e 's|%%LIBEXECINFO%%|${LOC_EXECINFO}|' \ + ${REINPLACE_CMD} \ -e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/cmake_modules/FindPHP5.cmake Modified: head/textproc/zorba/files/patch-CMakeLists.txt ============================================================================== --- head/textproc/zorba/files/patch-CMakeLists.txt Fri Sep 22 10:48:45 2017 (r450352) +++ head/textproc/zorba/files/patch-CMakeLists.txt Fri Sep 22 10:48:57 2017 (r450353) @@ -18,7 +18,7 @@ +# execinfo +# +IF(FREEBSD) -+ SET(requiredlibs ${requiredlibs} "%%LIBEXECINFO%%") ++ SET(requiredlibs ${requiredlibs} "/usr/lib/libexecinfo.so") +ENDIF(FREEBSD) + +# Modified: head/www/links-hacked/Makefile ============================================================================== --- head/www/links-hacked/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/www/links-hacked/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -18,8 +18,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ssl --without-pmshell --without-atheos --without-fb CFLAGS+= -Wno-error=return-type -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo +LDFLAGS+= -lexecinfo CONFLICTS= links-[0-9]* Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/www/mod_spdy/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -38,7 +38,7 @@ GYP_DEFINES+= \ system_include_path_httpd=${LOCALBASE}/include/apache22 \ system_include_path_apr=${LOCALBASE}/include/apr-1 \ system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ - system_include_path_execinfo=${LOCALBASE}/include \ + system_include_path_execinfo=/usr/include \ include_dirs=${LOCALBASE}/include SUB_FILES+= mod_spdy.conf Modified: head/www/mod_spdy/files/patch-base.gypi ============================================================================== --- head/www/mod_spdy/files/patch-base.gypi Fri Sep 22 10:48:45 2017 (r450352) +++ head/www/mod_spdy/files/patch-base.gypi Fri Sep 22 10:48:57 2017 (r450353) @@ -1,10 +1,12 @@ +FIXME: this feels a bit silly now. + --- base/base.gypi.org 2012-03-31 16:28:56.347804000 +0900 +++ base/base.gypi 2012-03-31 17:03:22.470770534 +0900 @@ -7,6 +7,7 @@ 'variables': { 'base_target': 0, 'chromium_root': '<(DEPTH)/third_party/chromium/src', -+ 'system_include_path_execinfo%': '%%LOCALBASE%%/include', ++ 'system_include_path_execinfo%': '/usr/include', }, 'target_conditions': [ # This part is shared between the targets defined below. Only files and Modified: head/x11-wm/afterstep-stable/Makefile ============================================================================== --- head/x11-wm/afterstep-stable/Makefile Fri Sep 22 10:48:45 2017 (r450352) +++ head/x11-wm/afterstep-stable/Makefile Fri Sep 22 10:48:57 2017 (r450353) @@ -56,10 +56,6 @@ PLIST_SUB+= GNOME="" PLIST_SUB+= GNOME="@comment " .endif -.if !exists(/usr/lib/libexecinfo.so) -STATIC_LIBEXECINFO= ${LOCALBASE}/lib/libexecinfo.a -.endif - post-extract: ${CP} ${FILESDIR}/monitor_bsd.xpm \ ${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm @@ -85,9 +81,6 @@ post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/${f} .endfor - @${REINPLACE_CMD} \ - -e 's,%%STATIC_LIBEXECINFO%%,${STATIC_LIBEXECINFO},g' \ - ${WRKSRC}/configure .if exists(${PREFIX}/share/gnome/wm-properties) pre-install: Modified: head/x11-wm/afterstep-stable/files/patch-configure ============================================================================== --- head/x11-wm/afterstep-stable/files/patch-configure Fri Sep 22 10:48:45 2017 (r450352) +++ head/x11-wm/afterstep-stable/files/patch-configure Fri Sep 22 10:48:57 2017 (r450353) @@ -5,7 +5,7 @@ if test "x$enable_staticlibs" = "xyes"; then - AFTERBASE_LIB="../../libAfterBase/libAfterBase.a" -+ AFTERBASE_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%" ++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.a AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.a" AFTERSTEP_LIB="../../libAfterStep/libAfterStep.a" AFTERCONF_LIB="../../libAfterConf/libAfterConf.a" @@ -14,7 +14,7 @@ LIBINSTALL="install.cyg" else - AFTERBASE_LIB="../../libAfterBase/libAfterBase.so" -+ AFTERBASE_LIB="../../libAfterBase/libAfterBase.so %%STATIC_LIBEXECINFO%%" ++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.so AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.so" AFTERSTEP_LIB="../../libAfterStep/libAfterStep.so" AFTERCONF_LIB="../../libAfterConf/libAfterConf.so" @@ -23,7 +23,7 @@ fi -AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a" -+AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%" ++AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a" AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a" AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a" Modified: head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure ============================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure Fri Sep 22 10:48:45 2017 (r450352) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-configure Fri Sep 22 10:48:57 2017 (r450353) @@ -4,7 +4,7 @@ -+execinfo_libs="-L%%LOCALBASE%%/lib -lexecinfo" ++execinfo_libs="-lexecinfo" +LIBS="$execinfo_libs $LIBS" for ac_func in backtrace_symbols_fd backtrace_symbols backtrace do Modified: head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in ============================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in Fri Sep 22 10:48:45 2017 (r450352) +++ head/x11-wm/afterstep-stable/files/patch-libAfterConf-Makefile.in Fri Sep 22 10:48:57 2017 (r450353) @@ -5,7 +5,7 @@ LIBS_PRIVATE = ../libAfterConf/libAfterConf.a ../libAfterStep/libAfterStep.a\ - ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -+ ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -L%%LOCALBASE%%/lib -lexecinfo ++ ../libAfterImage/libAfterImage.a ../libAfterBase/libAfterBase.a -lexecinfo LIB_INCS= afterconf.h Modified: head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure ============================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure Fri Sep 22 10:48:45 2017 (r450352) +++ head/x11-wm/afterstep-stable/files/patch-libAfterImage-configure Fri Sep 22 10:48:57 2017 (r450353) @@ -5,10 +5,10 @@ AFTERBASE_C= if test "x$have_x" != "xyes" -a "x$have_gif" = "xyes"; then - AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase" -+ AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase -L%%LOCALBASE%%/lib -lexecinfo" ++ AFTERIMAGE_LIBS="$AFTERIMAGE_LIBS -lAfterBase -lexecinfo" else - AFTERIMAGE_LIBS="-lAfterBase $AFTERIMAGE_LIBS" -+ AFTERIMAGE_LIBS="-lAfterBase -L%%LOCALBASE%%/lib -lexecinfo $AFTERIMAGE_LIBS" ++ AFTERIMAGE_LIBS="-lAfterBase -lexecinfo $AFTERIMAGE_LIBS" fi if test -r "../libAfterBase/astypes.h"; then AFTERIMAGE_APPS_LIBS="-L../ -L../../libAfterBase -lAfterImage $AFTERIMAGE_LIBS"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709221048.v8MAmwPw092205>