Mon Mar 23 10:15:46 2015 UTC ()
Find builtin XPG4 curses library on 64-bit SunOS.


(jperkin)
diff -r1.46 -r1.47 pkgsrc/mail/mutt-devel/options.mk
cvs diff -r1.46 -r1.47 pkgsrc/mail/mutt-devel/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/options.mk 2014/09/23 13:13:49 1.46
+++ pkgsrc/mail/mutt-devel/Attic/options.mk 2015/03/23 10:15:46 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.46 2014/09/23 13:13:49 jperkin Exp $ 1# $NetBSD: options.mk,v 1.47 2015/03/23 10:15:46 jperkin Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt 5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 6PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses 7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl 8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
10# Comment the following line out on updates. 10# Comment the following line out on updates.
11#PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 11#PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
12PKG_SUPPORTED_OPTIONS+= mutt-sidebar 12PKG_SUPPORTED_OPTIONS+= mutt-sidebar
13#PKG_SUPPORTED_OPTIONS+= mutt-xlabel 13#PKG_SUPPORTED_OPTIONS+= mutt-xlabel
14PKG_SUGGESTED_OPTIONS= ssl smime curses 14PKG_SUGGESTED_OPTIONS= ssl smime curses
@@ -36,28 +36,29 @@ CONFIGURE_ARGS+= --with-curses=${BUILDLI @@ -36,28 +36,29 @@ CONFIGURE_ARGS+= --with-curses=${BUILDLI
36### SASLv2 36### SASLv2
37### 37###
38.if !empty(PKG_OPTIONS:Msasl) 38.if !empty(PKG_OPTIONS:Msasl)
39. include "../../security/cyrus-sasl/buildlink3.mk" 39. include "../../security/cyrus-sasl/buildlink3.mk"
40CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} 40CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
41.endif 41.endif
42 42
43### curses 43### curses
44### 44###
45.if !empty(PKG_OPTIONS:Mcurses) 45.if !empty(PKG_OPTIONS:Mcurses)
46. include "../../mk/curses.buildlink3.mk" 46. include "../../mk/curses.buildlink3.mk"
47. if ${OPSYS} == "SunOS" 47. if ${OPSYS} == "SunOS"
48BUILDLINK_PASSTHRU_DIRS+= /usr/xpg4 48BUILDLINK_PASSTHRU_DIRS+= /usr/xpg4
49CONFIGURE_ARGS+= --with-curses=/usr/xpg4 49CONFIGURE_ARGS+= --with-curses=/usr/xpg4
50LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib 50LDFLAGS+= -L/usr/xpg4/lib${LIBABISUFFIX}
 51LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
51. endif 52. endif
52.endif 53.endif
53 54
54### 55###
55### ncursesw 56### ncursesw
56### 57###
57.if !empty(PKG_OPTIONS:Mncursesw) 58.if !empty(PKG_OPTIONS:Mncursesw)
58. include "../../devel/ncursesw/buildlink3.mk" 59. include "../../devel/ncursesw/buildlink3.mk"
59.else 60.else
60SUBST_CLASSES+= curse 61SUBST_CLASSES+= curse
61SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw 62SUBST_MESSAGE.curse= Fixing mutt to avoid ncursesw
62SUBST_STAGE.curse= post-patch 63SUBST_STAGE.curse= post-patch
63SUBST_FILES.curse= configure 64SUBST_FILES.curse= configure