ports/183110: [PATCH] audio/mp3asm: fix build with clang
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat Oct 19 18:20:00 UTC 2013
>Number: 183110
>Category: ports
>Synopsis: [PATCH] audio/mp3asm: fix build with clang
>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: Sat Oct 19 18:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 10.0-BETA1 amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256445: Tue Oct 15 04:48:04 CST
>Description:
- Fix build with clang
- Convert to new options framework
- Support STAGEDIR
- Use PLIST_FILES and PORTDOCS instead of PLIST
- Use SED/REINPLACE_CMD instead of patch files
Port maintainer (dinoex at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- mp3asm-0.1.3.1_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 330920)
+++ Makefile (working copy)
@@ -13,7 +13,7 @@
LICENSE= GPLv2
-NO_STAGE= yes
+OPTIONS_DEFINE= DOCS
USES= gmake
USE_BZIP2= yes
@@ -20,6 +20,11 @@
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-0.1
+PLIST_FILES= bin/mp3asm
+PORTDOCS= Changelog README
+
+.include <bsd.port.options.mk>
+
post-extract:
@${RM} ${WRKSRC}/config.cache
@@ -28,13 +33,15 @@
's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|getprogname|_getprogname|g' ${WRKSRC}/src/mp3asm.c
+ @${REINPLACE_CMD} -e \
+ 's|#include <argz.h>|#include <errno.h>|' ${WRKSRC}/src/mp3asm.h
+ @${REINPLACE_CMD} -e \
+ 's|\([ (!]\)\(log[\.;]\)|\1mp3asm\2|g' ${WRKSRC}/src/*.c ${WRKSRC}/src/*.h
post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for i in Changelog README
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
.endif
.include <bsd.port.mk>
Index: files/patch-src::mp3asm.h
===================================================================
--- files/patch-src::mp3asm.h (revision 330920)
+++ files/patch-src::mp3asm.h (working copy)
@@ -1,10 +0,0 @@
---- src/mp3asm.h.orig Fri Jul 20 11:17:05 2001
-+++ src/mp3asm.h Fri Jul 20 11:17:58 2001
-@@ -30,7 +30,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sysexits.h>
--#include <argz.h>
- #include <ctype.h>
-
- #define LOGBUFSIZE 4096
Index: files/patch-src::utils.c
===================================================================
--- files/patch-src::utils.c (revision 330920)
+++ files/patch-src::utils.c (working copy)
@@ -1,10 +0,0 @@
---- src/utils.c.orig Fri Jul 20 11:14:59 2001
-+++ src/utils.c Fri Jul 20 11:15:37 2001
-@@ -25,6 +25,7 @@
- #include "utils.h"
- #include <unistd.h>
- #include <stdio.h>
-+#include <errno.h>
-
- /*
- * tmalloc: mallocs cleanly
Index: pkg-plist
===================================================================
--- pkg-plist (revision 330920)
+++ pkg-plist (working copy)
@@ -1,4 +0,0 @@
-bin/mp3asm
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- mp3asm-0.1.3.1_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list