From owner-svn-ports-head@freebsd.org Fri May 8 20:50:32 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CEE932E153E; Fri, 8 May 2020 20:50:32 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JjCD3MLJz4JRm; Fri, 8 May 2020 20:50:32 +0000 (UTC) (envelope-from sunpoet@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 43F1E84B0; Fri, 8 May 2020 20:50:31 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 048KoUqC000999; Fri, 8 May 2020 20:50:30 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048KoURO000994; Fri, 8 May 2020 20:50:30 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202005082050.048KoURO000994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 8 May 2020 20:50:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534424 - in head/audio/libshout: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/audio/libshout: . files X-SVN-Commit-Revision: 534424 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.32 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: Fri, 08 May 2020 20:50:33 -0000 Author: sunpoet Date: Fri May 8 20:50:29 2020 New Revision: 534424 URL: https://svnweb.freebsd.org/changeset/ports/534424 Log: Convert REINPLACE_CMD to patch files Added: head/audio/libshout/files/patch-Makefile.in (contents, props changed) head/audio/libshout/files/patch-configure (contents, props changed) head/audio/libshout/files/patch-examples-Makefile.in (contents, props changed) head/audio/libshout/files/patch-src-common-net-sock.c (contents, props changed) Modified: head/audio/libshout/Makefile Modified: head/audio/libshout/Makefile ============================================================================== --- head/audio/libshout/Makefile Fri May 8 20:50:24 2020 (r534423) +++ head/audio/libshout/Makefile Fri May 8 20:50:29 2020 (r534424) @@ -33,10 +33,4 @@ SPEEX_LIB_DEPENDS= libspeex.so:audio/speex THEORA_CONFIGURE_ENABLE=theora THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora -post-patch: - @${REINPLACE_CMD} -e '/^DATA = / s| $$(ckport_DATA)||; /^install-data-am:/ s| install-ckportDATA||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's| -ffast-math||g; /libssl/d' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in - @${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/common/net/sock.c - .include Added: head/audio/libshout/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libshout/files/patch-Makefile.in Fri May 8 20:50:29 2020 (r534424) @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2020-05-08 18:29:05 UTC ++++ Makefile.in +@@ -158,7 +158,7 @@ am__uninstall_files_from_dir = { \ + } + am__installdirs = "$(DESTDIR)$(ckportdir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" +-DATA = $(ckport_DATA) $(doc_DATA) $(m4data_DATA) $(pkgconfig_DATA) ++DATA = $(doc_DATA) $(m4data_DATA) $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + am__recursive_targets = \ +@@ -903,7 +903,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-ckportDATA install-docDATA install-m4dataDATA \ ++install-data-am: install-docDATA install-m4dataDATA \ + install-pkgconfigDATA + + install-dvi: install-dvi-recursive Added: head/audio/libshout/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libshout/files/patch-configure Fri May 8 20:50:29 2020 (r534424) @@ -0,0 +1,19 @@ +--- configure.orig 2019-05-28 19:31:20 UTC ++++ configure +@@ -11927,7 +11927,7 @@ if test -z "$GCC"; then + ;; + esac + else +- XIPH_CFLAGS="-Wall -ffast-math -fsigned-char" ++ XIPH_CFLAGS="-Wall -fsigned-char" + + $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h + +@@ -14923,7 +14923,6 @@ EOF + done + XIPH_LIBS="$xt_filtered $XIPH_LIBS" + +- SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl" + SHOUT_TLS="1" + + else Added: head/audio/libshout/files/patch-examples-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libshout/files/patch-examples-Makefile.in Fri May 8 20:50:29 2020 (r534424) @@ -0,0 +1,11 @@ +--- examples/Makefile.in.orig 2020-05-08 18:29:05 UTC ++++ examples/Makefile.in +@@ -330,7 +330,7 @@ example_LDADD = $(top_builddir)/src/libshout.la @SHOUT + nonblocking_SOURCES = nonblocking.c + nonblocking_LDADD = $(top_builddir)/src/libshout.la @SHOUT_LIBDEPS@ + AM_CFLAGS = @XIPH_CFLAGS@ +-AM_CPPFLAGS = @XIPH_CPPFLAGS@ -I$(top_builddir)/include ++AM_CPPFLAGS = -I$(top_builddir)/include @XIPH_CPPFLAGS@ + all: all-am + + .SUFFIXES: Added: head/audio/libshout/files/patch-src-common-net-sock.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libshout/files/patch-src-common-net-sock.c Fri May 8 20:50:29 2020 (r534424) @@ -0,0 +1,11 @@ +--- src/common/net/sock.c.orig 2019-05-15 08:58:13 UTC ++++ src/common/net/sock.c +@@ -742,7 +742,7 @@ sock_t sock_get_server_socket (int port, const char *s + + setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof(on)); + on = 0; +-#ifdef IPV6_V6ONLY ++#if defined(__BSD_VISIBLE) && defined(IPV6_V6ONLY) + setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof on); + #endif +