From owner-svn-ports-all@FreeBSD.ORG Mon Jan 20 22:39:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0388D86; Mon, 20 Jan 2014 22:39:41 +0000 (UTC) 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 B20D712CC; Mon, 20 Jan 2014 22:39:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KMdfk6020892; Mon, 20 Jan 2014 22:39:41 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KMdf0p020890; Mon, 20 Jan 2014 22:39:41 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201401202239.s0KMdf0p020890@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 20 Jan 2014 22:39:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340483 - in head/audio: dumb dumb-allegro dumb/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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 20 Jan 2014 22:39:42 -0000 Author: amdmi3 Date: Mon Jan 20 22:39:40 2014 New Revision: 340483 URL: http://svnweb.freebsd.org/changeset/ports/340483 QAT: https://qat.redports.org/buildarchive/r340483/ Log: - Support staging - Minor port improvements Deleted: head/audio/dumb/files/config.txt Modified: head/audio/dumb-allegro/Makefile head/audio/dumb/Makefile Modified: head/audio/dumb-allegro/Makefile ============================================================================== --- head/audio/dumb-allegro/Makefile Mon Jan 20 21:35:05 2014 (r340482) +++ head/audio/dumb-allegro/Makefile Mon Jan 20 22:39:40 2014 (r340483) @@ -3,7 +3,5 @@ OPTIONS_SLAVE= ALLEGRO MASTERDIR= ${.CURDIR}/../dumb -PKGNAMESUFFIX= -allegro -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/dumb/Makefile ============================================================================== --- head/audio/dumb/Makefile Mon Jan 20 21:35:05 2014 (r340482) +++ head/audio/dumb/Makefile Mon Jan 20 22:39:40 2014 (r340483) @@ -11,7 +11,6 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= IT, XM, S3M, and MOD player library USES= gmake -NO_STAGE= yes OPTIONS_DEFINE= ALLEGRO ALLEGRO_DESC= Enable allegro support @@ -22,7 +21,8 @@ ALLEGRO_DESC= Enable allegro support LIB_DEPENDS+= liballeg.so:${PORTSDIR}/devel/allegro PLIST_SUB+= ALLEGRO="" MAKE_ARGS= _PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" -MAKE_ARGS+= LINK_ALLEGRO="-lm -L${LOCALBASE}/lib -lalleg" +MAKE_ARGS+= LINK_ALLEGRO="`allegro-config --libs`" +PKGNAMESUFFIX= -allegro CONFLICTS= dumb-[0-9]* .else PLIST_SUB+= ALLEGRO="@comment " @@ -34,13 +34,14 @@ CONFLICTS= dumb-allegro-[0-9]* CFLAGS+= -fPIC .endif -pre-configure: - @${CP} ${FILESDIR}/config.txt ${WRKSRC}/make - @${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt +post-patch: + @${REINPLACE_CMD} -e 's|_INSTALL_PATH := |&$${DESTDIR}|' ${WRKSRC}/Makefile + +do-configure: + @${ECHO_CMD} 'include make/unix.inc' > ${WRKSRC}/make/config.txt + @${ECHO_CMD} 'ALL_TARGETS := core core-examples core-headers' >> ${WRKSRC}/make/config.txt .if ${PORT_OPTIONS:MALLEGRO} - @${REINPLACE_CMD} -e "s,@ALLEGRO@,," ${WRKSRC}/make/config.txt -.else - @${REINPLACE_CMD} -e "s,@ALLEGRO@,#," ${WRKSRC}/make/config.txt + @${ECHO_CMD} 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> ${WRKSRC}/make/config.txt .endif .include