summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-06-08 14:44:21 +0000
committerrillig <rillig@pkgsrc.org>2006-06-08 14:44:21 +0000
commit0f49650ef3a762e65d86556792b437de75580429 (patch)
tree0ee24ce2d351b948cb20d72ebebd0237f493278a /audio
parentb463e1528915dbd57551bcc7df3edd47584e03f4 (diff)
downloadpkgsrc-0f49650ef3a762e65d86556792b437de75580429.tar.gz
Fixed pkglint warnings.
Diffstat (limited to 'audio')
-rw-r--r--audio/libmikmod/Makefile4
-rw-r--r--audio/libmikmod/buildlink3.mk21
2 files changed, 12 insertions, 13 deletions
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 1b8857faae0..ea870476b8b 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/06/08 14:44:21 rillig Exp $
DISTNAME= libmikmod-3.1.11
PKGNAME= libmikmod-3.1.11.1
@@ -6,8 +6,8 @@ PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://mikmod.raphnet.net/files/
-PATCHFILES= libmikmod-3.1.11-a.diff
PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= libmikmod-3.1.11-a.diff
PATCH_DIST_STRIP= -p1
MAINTAINER= kuebart@mathematik.uni-ulm.de
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index a02af8c9c85..f32e1b5ecc1 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,35 +1,34 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/04/12 10:27:01 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/06/08 14:44:21 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= libmikmod
.endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmikmod}
BUILDLINK_PACKAGES+= libmikmod
-.if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
+.if ${LIBMIKMOD_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libmikmod+= libmikmod>=3.1.9
BUILDLINK_ABI_DEPENDS.libmikmod+= libmikmod>=3.1.11.1nb2
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
-.endif # LIBMIKMOD_BUILDLINK3_MK
-.if !defined(PKG_BUILD_OPTIONS.libmikmod)
+. include "../../mk/bsd.prefs.mk"
+. if !defined(PKG_BUILD_OPTIONS.libmikmod)
PKG_BUILD_OPTIONS.libmikmod!= cd ${BUILDLINK_PKGSRCDIR.libmikmod} && \
${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
MAKEFLAGS+= PKG_BUILD_OPTIONS.libmikmod=${PKG_BUILD_OPTIONS.libmikmod:Q}
-.endif
+. endif
MAKEVARS+= PKG_BUILD_OPTIONS.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_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}