Wed Jan 4 16:47:59 2017 UTC ()
Use the curses framework.


(roy)
diff -r1.29 -r1.30 pkgsrc/audio/herrie/Makefile
diff -r1.8 -r1.9 pkgsrc/audio/herrie/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/audio/herrie/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/herrie/Makefile 2017/01/01 16:06:03 1.29
+++ pkgsrc/audio/herrie/Makefile 2017/01/04 16:47:59 1.30
@@ -1,49 +1,54 @@ @@ -1,49 +1,54 @@
1# $NetBSD: Makefile,v 1.29 2017/01/01 16:06:03 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2017/01/04 16:47:59 roy Exp $
2# 2#
3 3
4DISTNAME= herrie-2.2 4DISTNAME= herrie-2.2
5PKGREVISION= 14 5PKGREVISION= 15
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://herrie.info/distfiles/ 7MASTER_SITES= http://herrie.info/distfiles/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://herrie.info/ 11HOMEPAGE= http://herrie.info/
12COMMENT= Minimalistic, ncurses-based audio player 12COMMENT= Minimalistic, ncurses-based audio player
13LICENSE= 2-clause-bsd AND gnu-gpl-v2 13LICENSE= 2-clause-bsd AND gnu-gpl-v2
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake msgfmt pkg-config 17USE_TOOLS+= gmake msgfmt pkg-config
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19 19
20CONFIGURE_ARGS+= verbose 20CONFIGURE_ARGS+= verbose
21 21
22EGDIR= ${PREFIX}/share/examples/herrie 22EGDIR= ${PREFIX}/share/examples/herrie
23CONF_FILES= ${EGDIR}/herrie.conf ${PKG_SYSCONFDIR}/herrie.conf 23CONF_FILES= ${EGDIR}/herrie.conf ${PKG_SYSCONFDIR}/herrie.conf
24 24
25CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR} 25CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
26CONFIGURE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
27CONFIGURE_ENV+= TRANSDIR=${PREFIX}/${PKGLOCALEDIR}/locale 27CONFIGURE_ENV+= TRANSDIR=${PREFIX}/${PKGLOCALEDIR}/locale
28 28
29RESOLV_AUTO_VARS= yes 29RESOLV_AUTO_VARS= yes
30USE_FEATURES= snprintf regcomp 30USE_FEATURES= snprintf regcomp
31USE_NCURSES= yes 
32 31
33AUTO_MKDIRS= yes 32AUTO_MKDIRS= yes
34 33
 34FAKE_NCURSES= yes
 35
35.include "options.mk" 36.include "options.mk"
36 37
 38.if ${CURSES_TYPE} != "ncursesw"
 39CONFIGURE_ARGS+= ncurses
 40.endif
 41
37SUBST_CLASSES+= conf 42SUBST_CLASSES+= conf
38SUBST_STAGE.conf= pre-configure 43SUBST_STAGE.conf= pre-configure
39SUBST_FILES.conf= ${WRKDIR}/herrie.conf 44SUBST_FILES.conf= ${WRKDIR}/herrie.conf
40SUBST_MESSAGE.conf= Preparing example configuration file. 45SUBST_MESSAGE.conf= Preparing example configuration file.
41SUBST_VARS.conf= DEVOSSAUDIO HERRIE_USE_OSS 46SUBST_VARS.conf= DEVOSSAUDIO HERRIE_USE_OSS
42 47
43post-extract: 48post-extract:
44 ${RUN} ${CP} ${FILESDIR}/herrie.conf ${WRKDIR} 49 ${RUN} ${CP} ${FILESDIR}/herrie.conf ${WRKDIR}
45 50
46post-install: 51post-install:
47 ${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} && \ 52 ${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} && \
48 ${INSTALL_DATA} ${WRKDIR}/herrie.conf ${DESTDIR}${EGDIR} 53 ${INSTALL_DATA} ${WRKDIR}/herrie.conf ${DESTDIR}${EGDIR}
49 54
cvs diff -r1.8 -r1.9 pkgsrc/audio/herrie/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/herrie/options.mk 2016/07/10 09:42:07 1.8
+++ pkgsrc/audio/herrie/options.mk 2017/01/04 16:47:59 1.9
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: options.mk,v 1.8 2016/07/10 09:42:07 rillig Exp $ 1# $NetBSD: options.mk,v 1.9 2017/01/04 16:47:59 roy Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.herrie 3PKG_OPTIONS_VAR= PKG_OPTIONS.herrie
4PKG_SUPPORTED_OPTIONS= curl libao modplug libspiff sndfile \ 4PKG_SUPPORTED_OPTIONS= curl libao modplug libspiff sndfile \
5 vorbis wide-curses 5 vorbis wide-curses
6PKG_SUGGESTED_OPTIONS= curl 6PKG_SUGGESTED_OPTIONS= curl
7PKG_OPTIONS_LEGACY_OPTS+= ncursesw:wide-curses 7PKG_OPTIONS_LEGACY_OPTS+= ncursesw:wide-curses
8 8
 9.include "../../mk/curses.buildlink3.mk"
9.include "../../mk/oss.buildlink3.mk" 10.include "../../mk/oss.buildlink3.mk"
10 11
11.if ${OSS_TYPE} == "native" 12.if ${OSS_TYPE} == "native"
12PKG_SUPPORTED_OPTIONS+= oss 13PKG_SUPPORTED_OPTIONS+= oss
13PKG_SUGGESTED_OPTIONS+= oss 14PKG_SUGGESTED_OPTIONS+= oss
14.elif ${OSS_TYPE} == "none" 15.elif ${OSS_TYPE} == "none"
15PKG_SUGGESTED_OPTIONS+= libao 16PKG_SUGGESTED_OPTIONS+= libao
16.endif 17.endif
17 18
18.include "../../mk/bsd.fast.prefs.mk" 19.include "../../mk/bsd.fast.prefs.mk"
19.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
20 21
21.if !empty(PKG_OPTIONS:Mcurl) 22.if !empty(PKG_OPTIONS:Mcurl)
@@ -55,20 +56,13 @@ HERRIE_USE_OSS= \# @@ -55,20 +56,13 @@ HERRIE_USE_OSS= \#
55.else 56.else
56CONFIGURE_ARGS+= no_sndfile 57CONFIGURE_ARGS+= no_sndfile
57.endif 58.endif
58 59
59.if !empty(PKG_OPTIONS:Mdebug) 60.if !empty(PKG_OPTIONS:Mdebug)
60CONFIGURE_ARGS+= no_strip strict 61CONFIGURE_ARGS+= no_strip strict
61.endif 62.endif
62 63
63.if !empty(PKG_OPTIONS:Mvorbis) 64.if !empty(PKG_OPTIONS:Mvorbis)
64. include "../../audio/libvorbis/buildlink3.mk" 65. include "../../audio/libvorbis/buildlink3.mk"
65.else 66.else
66CONFIGURE_ARGS+= no_vorbis 67CONFIGURE_ARGS+= no_vorbis
67.endif 68.endif
68 
69.if !empty(PKG_OPTIONS:Mwide-curses) 
70. include "../../devel/ncursesw/buildlink3.mk" 
71.else 
72CONFIGURE_ARGS+= ncurses 
73. include "../../devel/ncurses/buildlink3.mk" 
74.endif