Date: Tue, 21 Jan 2014 08:37:24 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: sylvio@FreeBSD.org Subject: ports/185953: [PATCH] audio/maplay: fix build on 10.x Message-ID: <20140121043724.435FF18865@hades.panopticon> Resent-Message-ID: <201401210440.s0L4e0of060592@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185953
>Category: ports
>Synopsis: [PATCH] audio/maplay: fix build on 10.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 21 04:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix build on 10.x
- Support staging
Port maintainer (sylvio@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- maplay-1.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 340547)
+++ Makefile (working copy)
@@ -14,12 +14,11 @@
LICENSE= GPLv2
NO_WRKSUBDIR= yes
-NO_STAGE= yes
PLIST_FILES= bin/maplay
PORTDOCS= README
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS
post-patch:
@${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
@@ -26,10 +25,8 @@
${WRKSRC}/configuration.sh
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/maplay ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/maplay ${STAGEDIR}${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
Index: files/patch-maplay.cc
===================================================================
--- files/patch-maplay.cc (revision 340547)
+++ files/patch-maplay.cc (working copy)
@@ -1,5 +1,5 @@
---- maplay.cc.orig Thu Jun 23 22:14:36 1994
-+++ maplay.cc Thu Nov 21 16:40:21 2002
+--- maplay.cc.orig 1994-06-23 16:14:36.000000000 +0400
++++ maplay.cc 2014-01-21 06:31:36.011086289 +0400
@@ -39,8 +39,8 @@
#include <stdlib.h>
#include <string.h>
@@ -34,8 +34,12 @@
static real scalefactor;
// data extracted from header of first frame:
-@@ -93,12 +92,12 @@
- main (int argc, char *argv[])
+@@ -90,15 +89,15 @@
+ }
+
+
+-main (int argc, char *argv[])
++int main (int argc, char *argv[])
{
int i;
- bool read_ready = False, write_ready = False;
--- maplay-1.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140121043724.435FF18865>