From owner-svn-ports-head@freebsd.org Thu Jan 11 16:16:17 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D0BFE6C7CA; Thu, 11 Jan 2018 16:16:17 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 483DC78588; Thu, 11 Jan 2018 16:16:17 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D04817434; Thu, 11 Jan 2018 16:16:16 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BGGGt9005267; Thu, 11 Jan 2018 16:16:16 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BGGGGC005266; Thu, 11 Jan 2018 16:16:16 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201801111616.w0BGGGGC005266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 11 Jan 2018 16:16:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458752 - head/audio/espeak X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/audio/espeak X-SVN-Commit-Revision: 458752 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2018 16:16:17 -0000 Author: danfe Date: Thu Jan 11 16:16:16 2018 New Revision: 458752 URL: https://svnweb.freebsd.org/changeset/ports/458752 Log: - Unbreak the port on sparc64, by 's|-fpic|-fPIC|' in the Makefile (vague explanation: http://seclists.org/tcpdump/2012/q4/112) - While here, sort the knob groups properly, drop redundant WRKSRC, simplify patching with sed(1) logic, remove superfluous linefeed Modified: head/audio/espeak/Makefile Modified: head/audio/espeak/Makefile ============================================================================== --- head/audio/espeak/Makefile Thu Jan 11 16:05:49 2018 (r458751) +++ head/audio/espeak/Makefile Thu Jan 11 16:16:16 2018 (r458752) @@ -13,6 +13,15 @@ COMMENT= Software speech synthesizer LICENSE= GPLv3 +CONFLICTS= speak-1.[0-9] + +USES= gmake zip +USE_LDCONFIG= yes +CXXFLAGS+= -I${LOCALBASE}/include + +BUILD_WRKSRC= ${WRKSRC}/src +INSTALL_WRKSRC= ${WRKSRC}/src + OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= PORTAUDIO OPTIONS_RADIO= AUDIO_SYSTEM @@ -34,25 +43,15 @@ PULSEAUDIO_MAKE_ENV= AUDIO="pulseaudio" PORTAUDIO_MAKE_ENV= AUDIO="portaudio" RUNTIME_MAKE_ENV= AUDIO="runtime" -CONFLICTS= speak-1.[0-9] +.include -CXXFLAGS+= -I${LOCALBASE}/include -USES= gmake zip -USE_LDCONFIG= yes - -WRKSRC= ${WRKDIR}/${DISTNAME} -BUILD_WRKSRC= ${WRKSRC}/src -INSTALL_WRKSRC= ${WRKSRC}/src - -REINPLACE_FILES= Makefile speech.h -REINPLACE_ARGS= -i.bak -e "s|%%DATADIR%%|${DATADIR}|g" - -BROKEN_sparc64= Does not compile on sparc64 - - post-patch: - cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES} - ${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ + ${WRKSRC}/src/Makefile ${WRKSRC}/src/speech.h + @${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h +.if ${ARCH} == sparc64 # cf. http://seclists.org/tcpdump/2012/q4/112 + @${REINPLACE_CMD} -e 's|-fpic|-fPIC|' ${WRKSRC}/src/Makefile +.endif post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -60,4 +59,4 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libespeak.so* -.include +.include