From owner-svn-ports-head@FreeBSD.ORG Fri Nov 8 05:59:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6755EA5F; Fri, 8 Nov 2013 05:59:06 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB272FCA; Fri, 8 Nov 2013 05:59:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA85x6kZ041659; Fri, 8 Nov 2013 05:59:06 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA85x5mV041657; Fri, 8 Nov 2013 05:59:05 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311080559.rA85x5mV041657@svn.freebsd.org> From: Dirk Meyer Date: Fri, 8 Nov 2013 05:59:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333182 - in head/audio/mp3asm: . files X-SVN-Group: ports-head 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.14 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 Nov 2013 05:59:06 -0000 Author: dinoex Date: Fri Nov 8 05:59:05 2013 New Revision: 333182 URL: http://svnweb.freebsd.org/changeset/ports/333182 Log: - Fix build with clang - use STAGEDIR - use OPTIONS_DEFINE - Use PLIST_FILES and PORTDOCS instead of PLIST PR: 183110 Submitted by: sunpoet (Sunpoet Po-Chuan Hsieh) - rename patchfiles - merge REINPLACE_CMD Added: head/audio/mp3asm/files/patch-utils.c - copied unchanged from r333181, head/audio/mp3asm/files/patch-src::utils.c Deleted: head/audio/mp3asm/files/patch-src::mp3asm.h head/audio/mp3asm/files/patch-src::utils.c head/audio/mp3asm/pkg-plist Modified: head/audio/mp3asm/Makefile Modified: head/audio/mp3asm/Makefile ============================================================================== --- head/audio/mp3asm/Makefile Fri Nov 8 05:29:43 2013 (r333181) +++ head/audio/mp3asm/Makefile Fri Nov 8 05:59:05 2013 (r333182) @@ -13,28 +13,29 @@ COMMENT= MP3 frame level editor LICENSE= GPLv2 -NO_STAGE= yes - USES= gmake USE_BZIP2= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-0.1 +PLIST_FILES= bin/mp3asm +PORTDOCS= Changelog README + +.include post-extract: @${RM} ${WRKSRC}/config.cache post-patch: - @${REINPLACE_CMD} -e \ - 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|getprogname|_getprogname|g' ${WRKSRC}/src/mp3asm.c + ${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|#include ||' \ + -e 's|getprogname|_getprogname|g' \ + -e 's|\([ (!]\)\(log[\.;]\)|\1mp3asm\2|g' \ + ${WRKSRC}/src/mp3asm.h ${WRKSRC}/src/*.c +.if ${PORT_OPTIONS:MDOCS} post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in Changelog README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .endif .include Copied: head/audio/mp3asm/files/patch-utils.c (from r333181, head/audio/mp3asm/files/patch-src::utils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mp3asm/files/patch-utils.c Fri Nov 8 05:59:05 2013 (r333182, copy of r333181, head/audio/mp3asm/files/patch-src::utils.c) @@ -0,0 +1,10 @@ +--- 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 + #include ++#include + + /* + * tmalloc: mallocs cleanly