[pkgsrc/trunk]: pkgsrc/audio/cmus Dont include options.mk from Makefile.commo...

[ahoka <ahoka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2555cd991a19
branches:  trunk
changeset: 563506:2555cd991a19
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Mon Aug 17 14:21:42 2009 +0000

description:
Dont include options.mk from Makefile.common, but from Makefile.

diffstat:

 audio/cmus/Makefile        |  5 +++--
 audio/cmus/Makefile.common |  5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 3c70b34970d6 -r 2555cd991a19 audio/cmus/Makefile
--- a/audio/cmus/Makefile       Mon Aug 17 11:24:53 2009 +0000
+++ b/audio/cmus/Makefile       Mon Aug 17 14:21:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/06/07 12:31:43 ahoka Exp $
+# $NetBSD: Makefile,v 1.19 2009/08/17 14:21:42 ahoka Exp $
 #
 
 DISTNAME=              cmus-2.2.0
@@ -13,4 +13,5 @@
 
 CONFLICTS+=            cmus-unofficial-[0-9]*
 
-.include "../cmus/Makefile.common"
+.include "options.mk"
+.include "../cmus/Makefile.common"
\ No newline at end of file
diff -r 3c70b34970d6 -r 2555cd991a19 audio/cmus/Makefile.common
--- a/audio/cmus/Makefile.common        Mon Aug 17 11:24:53 2009 +0000
+++ b/audio/cmus/Makefile.common        Mon Aug 17 14:21:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2009/06/07 12:31:43 ahoka Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/08/17 14:21:42 ahoka Exp $
 #
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -27,8 +27,7 @@
 CONFIGURE_ARGS+=        CONFIG_SUN=n
 .endif
 
-.include "../cmus/options.mk"
-
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+