Date: Sun, 6 Sep 2015 13:43:10 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396216 - head/audio/soundtracker Message-ID: <201509061343.t86DhAXD064102@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Sep 6 13:43:09 2015 New Revision: 396216 URL: https://svnweb.freebsd.org/changeset/ports/396216 Log: audio/soundtracker: fix options and unbreak ASM=on on 10+ AC_ARG_ENABLE usage in configure.in is broken. Only 'gnome' and 'nls' are defined properly for both --enable- and --disable- prefix. --CONFIGURE_ARGS-- --disable-gnome --disable-asm --disable-jack --enable-nls --prefix=/usr/local ${_LATE_CONFIGURE_ARGS} --End CONFIGURE_ARGS-- [...] integer32-asm.S:64:1: error: unexpected token at start of statement .0: ^ integer32-asm.S:120:1: error: unexpected token at start of statement .1: ^ integer32-asm.S:166:1: error: unexpected token at start of statement .2: ^ integer32-asm.S:214:1: error: unexpected token at start of statement .3: ^ Reported by: pkg-fallout Pointy hat to: mat (option helpers) Modified: head/audio/soundtracker/Makefile (contents, props changed) Modified: head/audio/soundtracker/Makefile ============================================================================== --- head/audio/soundtracker/Makefile Sun Sep 6 13:40:36 2015 (r396215) +++ head/audio/soundtracker/Makefile Sun Sep 6 13:43:09 2015 (r396216) @@ -3,7 +3,7 @@ PORTNAME= soundtracker PORTVERSION= 0.6.8 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= audio MASTER_SITES= http://www.soundtracker.org/dl/v${PORTVERSION:R}/ @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile GNU_CONFIGURE= yes -USES= pathfix pkgconfig +USES= compiler pathfix pkgconfig USE_GNOME= esound gdkpixbuf CPPFLAGS+= -I${LOCALBASE}/include @@ -32,17 +32,23 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern- "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \ "soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false -ASM_CONFIGURE_ENABLE= asm +ASM_CONFIGURE_ON= --enable-asm JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack -JACK_CONFIGURE_ENABLE= jack +JACK_CONFIGURE_OFF= --disable-jack -DSL_USE= SDL=sdl -DSL_CONFIGURE_ENABLE= sdl +SDL_USE= SDL=sdl +SDL_CONFIGURE_OFF= --disable-sdl NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +.include <bsd.port.pre.mk> + +.if ${PORT_OPTIONS:MASM} && ${CHOSEN_COMPILER_TYPE} == "clang" +CFLAGS+= -no-integrated-as +.endif + post-patch: @${REINPLACE_CMD} -e 's|soundtracker.desktop||' \ ${WRKSRC}/Makefile.in @@ -60,4 +66,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/sharp.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps/soundtracker.xpm -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509061343.t86DhAXD064102>