From f1df3d9845abfe8f8f6ff7af54d11e54a1c941f0 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Thu, 27 Jan 2011 13:56:49 +0000
Subject: * Use autoconf, so other compilers, like Clang, are configured
 correctly. * pkglint clean-up.

---
 audio/libmikmod/Makefile      | 25 ++++++++++++++-----------
 audio/libmikmod/buildlink3.mk |  8 ++++----
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'audio/libmikmod')

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 2c5d4f5f373..2ea818ab252 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,23 +1,26 @@
-# $NetBSD: Makefile,v 1.48 2010/05/02 11:42:17 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2011/01/27 13:56:49 adam Exp $
 
-DISTNAME=		libmikmod-3.1.12
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mikmod/}
+DISTNAME=	libmikmod-3.1.12
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mikmod/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://mikmod.raphnet.net/
-COMMENT=		MikMod Sound Library
-LICENSE=		gnu-lgpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://mikmod.raphnet.net/
+COMMENT=	MikMod Sound Library
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		gmake makeinfo
-GNU_CONFIGURE=		yes
+USE_TOOLS+=		autoconf gmake makeinfo
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-threads
+
 INFO_FILES=		yes
 
-CONFIGURE_ARGS+=	--disable-threads
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index eeca4b63719..5ddcf98c901 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2011/01/27 13:56:49 adam Exp $
 
 BUILDLINK_TREE+=	libmikmod
 
@@ -14,10 +14,10 @@ pkgbase := libmikmod
 
 # On some platforms, libmikmod dynamically loads esound,
 # so there is no library dependency
-.  if !empty(PKG_BUILD_OPTIONS.libmikmod:Mesound) && \
+.if !empty(PKG_BUILD_OPTIONS.libmikmod:Mesound) && \
   empty(OPSYS:MNetBSD) && empty(OPSYS:MLinux)
-.    include "../../audio/esound/buildlink3.mk"
-.  endif
+.  include "../../audio/esound/buildlink3.mk"
+.endif
 .endif # LIBMIKMOD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libmikmod
-- 
cgit v1.2.3