From 5ecdc6949fb988a0cfa6b7c7dbc5400469716f3d Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 20 Jan 2014 22:39:40 +0000
Subject: [PATCH] - Support staging - Minor port improvements

---
 audio/dumb-allegro/Makefile |  2 --
 audio/dumb/Makefile         | 17 +++++++++--------
 audio/dumb/files/config.txt |  4 ----
 3 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 audio/dumb/files/config.txt

diff --git a/audio/dumb-allegro/Makefile b/audio/dumb-allegro/Makefile
index 0827b93eb379..ed4625b29708 100644
--- a/audio/dumb-allegro/Makefile
+++ b/audio/dumb-allegro/Makefile
@@ -3,7 +3,5 @@
 
 OPTIONS_SLAVE=	ALLEGRO
 MASTERDIR=	${.CURDIR}/../dumb
-PKGNAMESUFFIX=	-allegro
-NO_STAGE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index c0e55aabdbfe..0f291c0d0d87 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -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>
diff --git a/audio/dumb/files/config.txt b/audio/dumb/files/config.txt
deleted file mode 100644
index 3dc79747974c..000000000000
--- a/audio/dumb/files/config.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-include make/unix.inc
-ALL_TARGETS := core core-examples core-headers
-@ALLEGRO@ ALL_TARGETS += allegro allegro-examples allegro-headers
-PREFIX := @LOCALBASE@