From owner-svn-ports-all@freebsd.org Sun Oct 28 14:17:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82F5210D3018; Sun, 28 Oct 2018 14:17:20 +0000 (UTC) (envelope-from linimon@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 37031867A1; Sun, 28 Oct 2018 14:17:20 +0000 (UTC) (envelope-from linimon@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 F1E8C20760; Sun, 28 Oct 2018 14:17:19 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SEHJBw086125; Sun, 28 Oct 2018 14:17:19 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SEHJYP086122; Sun, 28 Oct 2018 14:17:19 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201810281417.w9SEHJYP086122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sun, 28 Oct 2018 14:17:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483298 - in head/audio: drumgizmo/files wmmp/files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/audio: drumgizmo/files wmmp/files X-SVN-Commit-Revision: 483298 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 14:17:20 -0000 Author: linimon Date: Sun Oct 28 14:17:19 2018 New Revision: 483298 URL: https://svnweb.freebsd.org/changeset/ports/483298 Log: Fix mismerge. Pointy hat to: linimon Modified: head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc head/audio/wmmp/files/patch-CMakeLists.txt Modified: head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc ============================================================================== --- head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc Sun Oct 28 14:17:19 2018 (r483298) @@ -8,13 +8,3 @@ static int const NOTE_ON = 0x90; ---- drumgizmo/input/ossmidi.cc.orig 2018-10-06 16:29:02 UTC -+++ drumgizmo/input/ossmidi.cc -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - - static int const NOTE_ON = 0x90; Modified: head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc ============================================================================== --- head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc Sun Oct 28 14:17:19 2018 (r483298) @@ -8,13 +8,3 @@ OSSOutputEngine::OSSOutputEngine() ---- drumgizmo/output/oss.cc.orig 2018-10-06 16:27:27 UTC -+++ drumgizmo/output/oss.cc -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - - OSSOutputEngine::OSSOutputEngine() Modified: head/audio/wmmp/files/patch-CMakeLists.txt ============================================================================== --- head/audio/wmmp/files/patch-CMakeLists.txt Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/wmmp/files/patch-CMakeLists.txt Sun Oct 28 14:17:19 2018 (r483298) @@ -7,21 +7,3 @@ -set(CMAKE_C_FLAGS "-Oz") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ---- CMakeLists.txt.orig 2018-09-20 09:45:39 UTC -+++ CMakeLists.txt -@@ -15,6 +15,5 @@ find_package(X11 REQUIRED) - include_directories(${X11_INCLUDE_DIR}) - target_link_libraries(WMmp ${X11_LIBRARIES} ${X11_Xpm_LIB}) - --set(CMAKE_C_FLAGS "-Oz") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ---- CMakeLists.txt.orig 2018-09-20 09:45:39 UTC -+++ CMakeLists.txt -@@ -15,6 +15,5 @@ find_package(X11 REQUIRED) - include_directories(${X11_INCLUDE_DIR}) - target_link_libraries(WMmp ${X11_LIBRARIES} ${X11_Xpm_LIB}) - --set(CMAKE_C_FLAGS "-Oz") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)