diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index 971acc868550..4663e3060015 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2008/02/28 11:58:47 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2008/03/27 14:24:36 bjs Exp $ # -DISTNAME= herrie-1.9.1 -PKGREVISION= 1 +DISTNAME= herrie-2.0 CATEGORIES= audio MASTER_SITES= http://herrie.info/distfiles/ EXTRACT_SUFX= .tar.bz2 @@ -30,7 +29,7 @@ RESOLV_AUTO_VARS= yes USE_FEATURES= snprintf regcomp USE_NCURSES= yes -AUTO_MKDIRS= yes +AUTO_MKDIRS= yes .include "options.mk" @@ -52,5 +51,4 @@ post-install: .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/resolv.buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/audio/herrie/PLIST b/audio/herrie/PLIST index d5e93517841f..006b52ace41c 100644 --- a/audio/herrie/PLIST +++ b/audio/herrie/PLIST @@ -1,15 +1,19 @@ -@comment $NetBSD: PLIST,v 1.2 2007/12/19 08:13:11 bjs Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/03/27 14:24:36 bjs Exp $ bin/herrie man/man1/herrie.1 share/examples/herrie/herrie.conf share/locale/ca/LC_MESSAGES/herrie.mo +share/locale/da/LC_MESSAGES/herrie.mo share/locale/de/LC_MESSAGES/herrie.mo share/locale/es/LC_MESSAGES/herrie.mo +share/locale/fi/LC_MESSAGES/herrie.mo share/locale/ga/LC_MESSAGES/herrie.mo share/locale/nl/LC_MESSAGES/herrie.mo share/locale/pl/LC_MESSAGES/herrie.mo +share/locale/pt_BR/LC_MESSAGES/herrie.mo share/locale/ru/LC_MESSAGES/herrie.mo share/locale/sv/LC_MESSAGES/herrie.mo share/locale/tr/LC_MESSAGES/herrie.mo share/locale/vi/LC_MESSAGES/herrie.mo +share/locale/zh_CN/LC_MESSAGES/herrie.mo @dirrm share/examples/herrie diff --git a/audio/herrie/distinfo b/audio/herrie/distinfo index 6d31783d8656..a16a38e7ab52 100644 --- a/audio/herrie/distinfo +++ b/audio/herrie/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2007/12/19 08:13:11 bjs Exp $ +$NetBSD: distinfo,v 1.3 2008/03/27 14:24:36 bjs Exp $ -SHA1 (herrie-1.9.1.tar.bz2) = dc887c2a76b1427e1496c22e29340b20cc75f6c3 -RMD160 (herrie-1.9.1.tar.bz2) = 89643ffae7b3930f00d47cb3a03480273e81a5b1 -Size (herrie-1.9.1.tar.bz2) = 65212 bytes -SHA1 (patch-aa) = d50bdaff285886541e0b143b884521453b6e78cf -SHA1 (patch-ab) = e6b0231b4eb87e45d7e361715db4885448250a97 +SHA1 (herrie-2.0.tar.bz2) = 560b8dc591e0f2d5e84ae33843e42fe726dd828e +RMD160 (herrie-2.0.tar.bz2) = f53ed76f578ad92a6146fe2a19c5b6a4decf35a6 +Size (herrie-2.0.tar.bz2) = 69438 bytes +SHA1 (patch-aa) = 6721730981182b07a668525e919cd5ec8cb4d9fa diff --git a/audio/herrie/options.mk b/audio/herrie/options.mk index 68743cee5ce6..4df8ab0e6999 100644 --- a/audio/herrie/options.mk +++ b/audio/herrie/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2008/02/22 16:59:56 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2008/03/27 14:24:36 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.herrie PKG_SUPPORTED_OPTIONS= curl libao modplug libspiff sndfile \ @@ -67,7 +67,6 @@ CONFIGURE_ARGS+= no_vorbis .endif .if !empty(PKG_OPTIONS:Mwide-curses) -CONFIGURE_ARGS+= ncursesw . include "../../devel/ncursesw/buildlink3.mk" .else CONFIGURE_ARGS+= ncurses diff --git a/audio/herrie/patches/patch-aa b/audio/herrie/patches/patch-aa index a922cf2c1db1..3d7031cc6568 100644 --- a/audio/herrie/patches/patch-aa +++ b/audio/herrie/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $ +$NetBSD: patch-aa,v 1.3 2008/03/27 14:24:36 bjs Exp $ ---- configure.orig 2007-12-17 11:06:05.000000000 -0500 +--- configure.orig 2008-03-16 09:09:14.000000000 -0400 +++ configure -@@ -33,7 +33,7 @@ APP_LINGUAS='ca de es ga nl pl ru sv tr +@@ -33,7 +33,7 @@ APP_LINGUAS='ca da de es fi ga nl pl pt_ CFG_AO=oss unset CFG_BINEXT CFG_CURSES_HEADER=ncurses -CFG_CURSES_LIB=ncursesw +CFG_CURSES_LIB=ncurses - CFG_FTELLO=yes CFG_HTTP=yes CFG_MODPLUG=yes -@@ -66,7 +66,7 @@ Darwin) + CFG_MP3=yes +@@ -64,7 +64,7 @@ Darwin) LDFLAGS="$LDFLAGS -lresolv" [ "$PREFIX" = "" ] && PREFIX=/opt/local ;; @@ -20,15 +20,7 @@ $NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $ CFG_SETPROCTITLE=yes [ "$PREFIX" = "" ] && PREFIX=/usr/local [ "$MANDIR" = "" ] && MANDIR=$PREFIX/man -@@ -98,7 +98,6 @@ Windows) - unset CFG_FTELLO - unset CFG_HTTP - unset CFG_MODPLUG -- unset CFG_REGEX - CFG_CURSES_HEADER=curses - CFG_CURSES_LIB=pdcurses - ;; -@@ -325,13 +324,13 @@ oss) +@@ -319,13 +319,13 @@ oss) NetBSD|OpenBSD) CFLAGS="$CFLAGS -DOSS_HEADER=\\" LDFLAGS="$LDFLAGS -lossaudio" @@ -44,7 +36,7 @@ $NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $ ;; esac CFG_VOLUME=yes -@@ -375,7 +374,7 @@ echo "- Using $CFG_AO audio output" +@@ -363,7 +363,7 @@ echo "- Using $CFG_AO audio output" echo # Perform a simple compiler test @@ -53,24 +45,24 @@ $NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $ if [ $? -ne 0 ] then echo "Error: some dependencies are missing" -@@ -402,13 +401,13 @@ done +@@ -390,13 +390,13 @@ done all: $APP_NAME$CFG_BINEXT $APP_NAME.1.gz $SRCDIR/$APP_NAME.conf.sample $MOS $APP_NAME$CFG_BINEXT: $OBJS # Linking $APP_NAME$CFG_BINEXT - $DOIT$CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT -+ $DOIT$\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT ++ $DOIT\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT $APP_NAME.1.gz: $MANFILES Makefile # Generating manual page $APP_NAME.1.gz - ${DOIT}sed $MANREGEX $MANFILES | gzip -9 > $APP_NAME.1.gz + ${DOIT}sed $MANREGEX $MANFILES > $APP_NAME.1 clean: - # Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o + # Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.dSYM *.mo *.o - ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o + ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1 *.mo *.o + ${DOIT}rm -Rf *.dSYM distclean: clean # Removing Makefile - ${DOIT}rm -f Makefile -@@ -416,29 +415,29 @@ Makefile: $0 `dirname $0`/depends +@@ -405,29 +405,29 @@ Makefile: $0 `dirname $0`/depends # WARNING: Your Makefile is outdated. Please re-run $0! install: all # Installing \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT @@ -112,7 +104,7 @@ $NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $ EOF for i in $CFG_LINGUAS do -@@ -455,7 +454,7 @@ do +@@ -444,7 +444,7 @@ do done echo "$i.o: Makefile $SRCDIR/src/$i.c $SRCDIR/src/stdinc.h $DEPS" echo " # Compiling $i.o" diff --git a/audio/herrie/patches/patch-ab b/audio/herrie/patches/patch-ab deleted file mode 100644 index 200dc1698514..000000000000 --- a/audio/herrie/patches/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2007/12/19 08:13:11 bjs Exp $ - ---- src/stdinc.h.orig 2007-12-17 11:06:05.000000000 -0500 -+++ src/stdinc.h -@@ -39,7 +39,14 @@ - #include - #endif /* BUILD_NLS */ - #include -+ -+#if defined(HAVE_NBCOMPAT_H) -+#include -+#include -+#else - #include -+#endif -+ - #include - #include - #include