Date: Mon, 20 Jan 2014 22:39:41 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> 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 Message-ID: <201401202239.s0KMdf0p020890@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401202239.s0KMdf0p020890>