Fri Oct 31 22:48:02 2008 UTC ()
Update to herrie-2.2.  Change 'libmodplug' option to 'modplug',
which was in options.description all along.  I've removed the
redundant 'libmodplug' option.

2008-10-14 -- Herrie 2.2:
 * Added: Ukranian translation - Viacheslav Chumushuk
 * Added: Option to disable yes/no questions - Viacheslav Chumushuk
 * Fixed: Add support for libSpiff 1.0.0 relative pathname support
 * Fixed: Don't write non-UTF-8 titles to disk - Peter Koeleman


(bjs)
diff -r1.10 -r1.11 pkgsrc/audio/herrie/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/herrie/PLIST
diff -r1.4 -r1.5 pkgsrc/audio/herrie/distinfo
diff -r1.6 -r1.7 pkgsrc/audio/herrie/options.mk
cvs diff -r1.10 -r1.11 pkgsrc/audio/herrie/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/herrie/Makefile 2008/07/16 07:21:23 1.10
+++ pkgsrc/audio/herrie/Makefile 2008/10/31 22:48:02 1.11
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.10 2008/07/16 07:21:23 bjs Exp $ 1# $NetBSD: Makefile,v 1.11 2008/10/31 22:48:02 bjs Exp $
2# 2#
3 3
4DISTNAME= herrie-2.1 4DISTNAME= herrie-2.2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://herrie.info/distfiles/ 6MASTER_SITES= http://herrie.info/distfiles/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= bjs@NetBSD.org 9MAINTAINER= bjs@NetBSD.org
10HOMEPAGE= http://herrie.info/ 10HOMEPAGE= http://herrie.info/
11COMMENT= Minimalistic, ncurses-based audio player 11COMMENT= Minimalistic, ncurses-based audio player
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
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
18 19
19CONFIGURE_ARGS+= verbose 20CONFIGURE_ARGS+= verbose
20 21
21EGDIR= ${PREFIX}/share/examples/herrie 22EGDIR= ${PREFIX}/share/examples/herrie
22CONF_FILES= ${EGDIR}/herrie.conf ${PKG_SYSCONFDIR}/herrie.conf 23CONF_FILES= ${EGDIR}/herrie.conf ${PKG_SYSCONFDIR}/herrie.conf
23 24
24CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR:Q} 25CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR:Q}
25CONFIGURE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
26CONFIGURE_ENV+= TRANSDIR=${PREFIX}/${PKGLOCALEDIR}/locale 27CONFIGURE_ENV+= TRANSDIR=${PREFIX}/${PKGLOCALEDIR}/locale
27 28
28RESOLV_AUTO_VARS= yes 29RESOLV_AUTO_VARS= yes
29USE_FEATURES= snprintf regcomp 30USE_FEATURES= snprintf regcomp
30USE_NCURSES= yes 31USE_NCURSES= yes
cvs diff -r1.3 -r1.4 pkgsrc/audio/herrie/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/herrie/PLIST 2008/03/27 14:24:36 1.3
+++ pkgsrc/audio/herrie/PLIST 2008/10/31 22:48:02 1.4
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1@comment $NetBSD: PLIST,v 1.3 2008/03/27 14:24:36 bjs Exp $ 1@comment $NetBSD: PLIST,v 1.4 2008/10/31 22:48:02 bjs Exp $
2bin/herrie 2bin/herrie
3man/man1/herrie.1 3man/man1/herrie.1
4share/examples/herrie/herrie.conf 4share/examples/herrie/herrie.conf
5share/locale/ca/LC_MESSAGES/herrie.mo 5share/locale/ca/LC_MESSAGES/herrie.mo
6share/locale/da/LC_MESSAGES/herrie.mo 6share/locale/da/LC_MESSAGES/herrie.mo
7share/locale/de/LC_MESSAGES/herrie.mo 7share/locale/de/LC_MESSAGES/herrie.mo
8share/locale/es/LC_MESSAGES/herrie.mo 8share/locale/es/LC_MESSAGES/herrie.mo
9share/locale/fi/LC_MESSAGES/herrie.mo 9share/locale/fi/LC_MESSAGES/herrie.mo
10share/locale/ga/LC_MESSAGES/herrie.mo 10share/locale/ga/LC_MESSAGES/herrie.mo
11share/locale/nl/LC_MESSAGES/herrie.mo 11share/locale/nl/LC_MESSAGES/herrie.mo
12share/locale/pl/LC_MESSAGES/herrie.mo 12share/locale/pl/LC_MESSAGES/herrie.mo
13share/locale/pt_BR/LC_MESSAGES/herrie.mo 13share/locale/pt_BR/LC_MESSAGES/herrie.mo
14share/locale/ru/LC_MESSAGES/herrie.mo 14share/locale/ru/LC_MESSAGES/herrie.mo
15share/locale/sv/LC_MESSAGES/herrie.mo 15share/locale/sv/LC_MESSAGES/herrie.mo
16share/locale/tr/LC_MESSAGES/herrie.mo 16share/locale/tr/LC_MESSAGES/herrie.mo
 17share/locale/uk/LC_MESSAGES/herrie.mo
17share/locale/vi/LC_MESSAGES/herrie.mo 18share/locale/vi/LC_MESSAGES/herrie.mo
18share/locale/zh_CN/LC_MESSAGES/herrie.mo 19share/locale/zh_CN/LC_MESSAGES/herrie.mo
19@dirrm share/examples/herrie 20@dirrm share/examples/herrie
cvs diff -r1.4 -r1.5 pkgsrc/audio/herrie/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/herrie/distinfo 2008/07/16 07:21:23 1.4
+++ pkgsrc/audio/herrie/distinfo 2008/10/31 22:48:02 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2008/07/16 07:21:23 bjs Exp $ 1$NetBSD: distinfo,v 1.5 2008/10/31 22:48:02 bjs Exp $
2 2
3SHA1 (herrie-2.1.tar.bz2) = da9f0838826954066abe9900e618ed8ad4da85ca 3SHA1 (herrie-2.2.tar.bz2) = ae5c39be11aeb19898cd3f968580eafc623830b7
4RMD160 (herrie-2.1.tar.bz2) = 638561a51aad2ee46a5915dc0ff921e5468218d3 4RMD160 (herrie-2.2.tar.bz2) = e0f70ca4d867cf6cdbb452bd0f0860ef1f5a9f39
5Size (herrie-2.1.tar.bz2) = 70592 bytes 5Size (herrie-2.2.tar.bz2) = 71596 bytes
6SHA1 (patch-aa) = ee64594d6a4157869e6c99dd419c9c538c78bb52 6SHA1 (patch-aa) = ee64594d6a4157869e6c99dd419c9c538c78bb52
cvs diff -r1.6 -r1.7 pkgsrc/audio/herrie/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/herrie/options.mk 2008/03/27 14:24:36 1.6
+++ pkgsrc/audio/herrie/options.mk 2008/10/31 22:48:02 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.6 2008/03/27 14:24:36 bjs Exp $ 1# $NetBSD: options.mk,v 1.7 2008/10/31 22:48:02 bjs 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_LEGACY_OPTS+= ncursesw:wide-curses 7PKG_LEGACY_OPTS+= ncursesw:wide-curses
8 8
9.include "../../mk/oss.buildlink3.mk" 9.include "../../mk/oss.buildlink3.mk"
10 10
11.if ${OSS_TYPE} == "native" 11.if ${OSS_TYPE} == "native"
12PKG_SUPPORTED_OPTIONS+= oss 12PKG_SUPPORTED_OPTIONS+= oss
13PKG_SUGGESTED_OPTIONS+= oss 13PKG_SUGGESTED_OPTIONS+= oss
14.elif ${OSS_TYPE} == "none" 14.elif ${OSS_TYPE} == "none"
@@ -20,27 +20,27 @@ PKG_SUGGESTED_OPTIONS+= libao @@ -20,27 +20,27 @@ PKG_SUGGESTED_OPTIONS+= libao
20 20
21.if !empty(PKG_OPTIONS:Mcurl) 21.if !empty(PKG_OPTIONS:Mcurl)
22. include "../../www/curl/buildlink3.mk" 22. include "../../www/curl/buildlink3.mk"
23.else 23.else
24CONFIGURE_ARGS+= no_http 24CONFIGURE_ARGS+= no_http
25CONFIGURE_ARGS+= no_scrobbler 25CONFIGURE_ARGS+= no_scrobbler
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mlibao) 28.if !empty(PKG_OPTIONS:Mlibao)
29CONFIGURE_ARGS+= ao 29CONFIGURE_ARGS+= ao
30. include "../../audio/libao/buildlink3.mk" 30. include "../../audio/libao/buildlink3.mk"
31.endif 31.endif
32 32
33.if !empty(PKG_OPTIONS:Mlibmodplug) 33.if !empty(PKG_OPTIONS:Mmodplug)
34. include "../../audio/libmodplug/buildlink3.mk" 34. include "../../audio/libmodplug/buildlink3.mk"
35.else 35.else
36CONFIGURE_ARGS+= no_modplug 36CONFIGURE_ARGS+= no_modplug
37.endif 37.endif
38 38
39.if !empty(PKG_OPTIONS:Mlibspiff) 39.if !empty(PKG_OPTIONS:Mlibspiff)
40. include "../../audio/libspiff/buildlink3.mk" 40. include "../../audio/libspiff/buildlink3.mk"
41.else 41.else
42CONFIGURE_ARGS+= no_xspf 42CONFIGURE_ARGS+= no_xspf
43.endif 43.endif
44 44
45.if !empty(PKG_OPTIONS:Moss) 45.if !empty(PKG_OPTIONS:Moss)
46CONFIGURE_ARGS+= oss 46CONFIGURE_ARGS+= oss