Index: head/audio/soundtouch/Makefile =================================================================== --- head/audio/soundtouch/Makefile (revision 429386) +++ head/audio/soundtouch/Makefile (revision 429387) @@ -1,50 +1,50 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= soundtouch PORTVERSION= 1.9.2 PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.surina.net/soundtouch/ MAINTAINER= crees@FreeBSD.org COMMENT= Open-source audio processing library LICENSE= LGPL21 WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= autoreconf libtool pathfix OPTIONS_DEFINE= INTEGER_SAMPLES DOCS OPENMP -OPTIONS_DEFAULT= ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/} +OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE} INTEGER_SAMPLES_DESC= Use integer sample format INTEGER_SAMPLES_CONFIGURE_ENABLE= integer-samples OPENMP_CONFIGURE_ENABLE=openmp OPENMP_USES= compiler:gcc-c++11-lib SSE_CONFIGURE_ENABLE= x86-optimizations SSE_USES= compiler:c++11-lang post-patch: @${REINPLACE_CMD} -e \ '/^dist_doc_DATA/s|COPYING.TXT||' \ ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e \ 's|^INCLUDES|AM_CPPFLAGS| ; \ s|$$(prefix)/doc|$$(datadir)/doc|' \ ${WRKSRC}/config/am_include.mk .for i in SoundStretch SoundTouch @${REINPLACE_CMD} -e \ 's|-O[0-9]||;s|-fcheck-new||' \ ${WRKSRC}/source/${i}/Makefile.am .endfor .include Index: head/devel/ponscripter-sekai/Makefile =================================================================== --- head/devel/ponscripter-sekai/Makefile (revision 429386) +++ head/devel/ponscripter-sekai/Makefile (revision 429387) @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= ponscripter-sekai PORTVERSION= 0.0.6 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org COMMENT= NScripter-like novel-game interpreter with Unicode support LICENSE= GPLv2+ LIB_DEPENDS= libsmpeg2.so:multimedia/smpeg2 \ libfreetype.so:print/freetype2 CONFLICTS= ponscripter-[0-9]* # doesn't exist yet USE_GITHUB= yes GH_ACCOUNT= sekaiproject GH_PROJECT= ${PORTNAME:S/sekai/fork/} USES= compiler:c++11-lang gmake shebangfix USE_SDL= image2 mixer2 EXTRACT_AFTER_ARGS=--exclude src/extlib SHEBANG_FILES= util/xml-template HAS_CONFIGURE= yes # XXX Pretend clang is like lang/gcc and can USE_CPU_GFX CONFIGURE_ENV= CC_VER="4.8" CC="${CC} ${CFLAGS}" CXX="${CXX} ${CXXFLAGS}" \ CPATH="${LOCALBASE}/include" LIBRARY_PATH="${LOCALBASE}/lib" CONFIGURE_ARGS= --prefix="${STAGEDIR}${PREFIX}" --unsupported-compiler LDFLAGS+= -Wl,--as-needed PORTDOCS= BUGS CHANGES MANUAL README TODO PLIST_FILES= bin/ponscr \ share/emacs/site-lisp/ponscripter-mode.el OPTIONS_DEFINE= DOCS MANPAGES TREMOR -OPTIONS_DEFAULT=MANPAGES ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/} +OPTIONS_DEFAULT=MANPAGES ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/} MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto MANPAGES_PLIST_FILES=\ man/man6/ponscr.6.gz \ man/man7/ponscr-ext.7.gz \ man/man7/ponscr-syntax.7.gz \ man/man7/ponscripter.7.gz TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor TREMOR_CFLAGS= -DINTEGER_OGG_VORBIS TREMOR_LIB_DEPENDS_OFF= libvorbisfile.so:audio/libvorbis post-patch: @${REINPLACE_CMD} -e '/^ifdef DEBUG/,/^$$/d' \ -e 's/$$STRIPFLAG/${STRIP}/' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/src/Makefile.ponscripter post-patch-MANPAGES-off: @${REINPLACE_CMD} -i .manpages.bak \ -e '/install-man/d' \ -e 's/xmlto/${FALSE}/' \ ${WRKSRC}/configure post-patch-TREMOR-on: @${REINPLACE_CMD} -i .tremor.bak \ -e 's/"libogg, libvorbis"/libvorbisidec/' \ -e 's,vorbis/vorbisfile,tremor/ivorbisfile,' \ -e 's,vorbis/codec,tremor/ivorbiscodec,' \ -e '/genlink/ { s/vorbisfile/vorbisidec/; \ /ogg/d; /vorbis$$/d; }' \ -e 's/ $$LINKogg//; s/ $$LINKvorbis//' \ -e 's/LINKvorbisfile/LINKvorbisidec/' \ ${WRKSRC}/configure post-build-MANPAGES-on: # Remove extraneous whitespace to unbreak manpage syntax ${REINPLACE_CMD} -e 's/^[[:space:]]*//; /^$$/d' \ ${WRKSRC}/doc/*.[0-9] post-install: ${INSTALL_DATA} ${WRKSRC}/misc/ponscripter-mode.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/games/openbor/Makefile =================================================================== --- head/games/openbor/Makefile (revision 429386) +++ head/games/openbor/Makefile (revision 429387) @@ -1,116 +1,116 @@ # $FreeBSD$ PORTNAME= openbor PORTVERSION= 3.0.r4420 CATEGORIES= games MASTER_SITES= LOCAL/jbeich \ https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn MAINTAINER= jbeich@FreeBSD.org COMMENT= Moddable fighting game engine (aka Beats of Rage) LICENSE= BSD3CLAUSE GPLv2+ MIT LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2 # source/gfxlib/hq2x.c LICENSE_FILE_MIT= ${WRKSRC}/source/webmlib/nestegg/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ libvpx.so:multimedia/libvpx USES= gmake pkgconfig tar:xz USE_SDL= gfx2 MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \ GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}" MAKE_ARGS= CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \ TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \ TARGET_FINAL='${TARGET}' BUILD_MMX="" CFLAGS+= -fgnu89-inline ${CFLAGS_${OPSYS}} CFLAGS_DragonFly= -D_GCC_MAX_ALIGN_T # system stddef.h LDFLAGS+= -Wl,--as-needed # ogg, pthread, zlib PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.png PORTDOCS= README DESKTOP_ENTRIES="OpenBOR" \ "" \ "${PORTNAME}" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" OPTIONS_DEFINE= TREMOR -OPTIONS_DEFAULT= ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/} +OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/} OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT_i386= MMX # runtime detection MMX_BUILD_DEPENDS= yasm:devel/yasm MMX_MAKE_ARGS= BUILD_MMX=1 TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor TREMOR_MAKE_ARGS= BUILD_TREMOR=1 BUILD_VORBIS="" TREMOR_LIB_DEPENDS_OFF= libvorbisfile.so:audio/libvorbis # # To update snapshot: make makesum BOOTSTRAP= # Specific snapshot: make makesum SVN_FETCH= PORTVERSION=1.0.r1234 # .if defined(BOOTSTRAP) # XXX SED and _MASTER_SITES_svn aren't defined yet SED?= /usr/bin/sed SVN_REV!= ${SETENV} LC_ALL=C svn info \ ${MASTER_SITES:M*\:svn:S/:svn//} | \ ${SED} -n 's/^Last Changed Rev: //p' PORTVERSION:= ${PORTVERSION:R}.r${SVN_REV} .else SVN_REV?= ${PORTVERSION:E:S/r//} .endif .if defined(BOOTSTRAP) || defined(SVN_FETCH) FETCH_DEPENDS+= svn:devel/subversion NO_CHECKSUM= yes do-fetch: ${MKDIR} ${WRKDIR} svn export -r${SVN_REV} ${_MASTER_SITES_svn} ${WRKSRC} (cd ${WRKDIR} && ${TAR} cJvf \ ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \ --uid 0 --gid 0 ${DISTNAME}) . ifmake makesum ${REINPLACE_CMD} -i '' '/^PORTVERSION=/s/r.*/r${SVN_REV}/' \ ${MASTERDIR}/Makefile . endif . if ${USER} == ${MAINTAINER:C/@.*//} -scp ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \ freefall.freebsd.org:public_distfiles/ . endif .endif post-patch: @${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \ -e 's/ -fomit-frame-pointer//' \ -e 's/ -freorder-blocks//' \ -e 's/ -Wno-unused-result//' \ -e 's/ -Wl,-rpath,$$(LIBRARIES)//' \ -e '/echo/!s/ @/ /' \ -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/Makefile @${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ 's,malloc\.h,stdlib.h,' @${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \ -e 's/^get_revnum$$/VERSION_BUILD=${SVN_REV}/' \ ${WRKSRC}/version.sh do-configure: (cd ${WRKSRC} && ${SH} ./version.sh) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/www/firefox/Makefile.options =================================================================== --- head/www/firefox/Makefile.options (revision 429386) +++ head/www/firefox/Makefile.options (revision 429387) @@ -1,28 +1,28 @@ # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \ GNOMEUI INTEGER_SAMPLES LIBPROXY \ OPTIMIZED_CFLAGS PGO PROFILE TEST OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG OPTIMIZED_CFLAGS \ ${OPTIONS_MULTI_AUDIO} \ - ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/} + ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} OPTIONS_MULTI+= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO # dragonfly, sparc64, riscv .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif # dtrace(1) crashes during build or fails to allocate space for probe OPTIONS_EXCLUDE_FreeBSD_9= DTRACE BUNDLED_CAIRO_DESC?= Use bundled fork of cairo-1.9.5 CANBERRA_DESC?= Sound theme alerts GNOMEUI_DESC?= libgnomeui support module INTEGER_SAMPLES_DESC?= Integer audio sample format LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension RUST_DESC?= Build with components written in Rust language