summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/mp3blaster/Makefile8
-rw-r--r--audio/mp3blaster/distinfo24
-rw-r--r--audio/mp3blaster/patches/patch-aa14
-rw-r--r--audio/mp3blaster/patches/patch-ab112
-rw-r--r--audio/mp3blaster/patches/patch-ac24
-rw-r--r--audio/mp3blaster/patches/patch-ad18
-rw-r--r--audio/mp3blaster/patches/patch-ae43
-rw-r--r--audio/mp3blaster/patches/patch-ag16
-rw-r--r--audio/mp3blaster/patches/patch-ak7
-rw-r--r--audio/mp3blaster/patches/patch-al12
-rw-r--r--audio/mp3blaster/patches/patch-an22
11 files changed, 178 insertions, 122 deletions
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 19e12865ed7..b3680444f7a 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/30 09:43:59 cube Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/03 12:31:36 cube Exp $
-DISTNAME= mp3blaster-3.1.3
-PKGREVISION= 3
+DISTNAME= mp3blaster-3.2.0
CATEGORIES= audio
-MASTER_SITES= ftp://mud.stack.nl/pub/mp3blaster/ \
- http://mp3blaster.linuxave.net/src/
+MASTER_SITES= http://www.stack.nl/~brama/mp3blaster/src/
MAINTAINER= rxg@NetBSD.org
HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html
diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo
index c2c2e49344f..f766c369f51 100644
--- a/audio/mp3blaster/distinfo
+++ b/audio/mp3blaster/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.5 2003/10/11 21:55:24 cube Exp $
+$NetBSD: distinfo,v 1.6 2003/12/03 12:31:36 cube Exp $
-SHA1 (mp3blaster-3.1.3.tar.gz) = 516f0b55443c9b7035ef2a82903b369c13a8f001
-Size (mp3blaster-3.1.3.tar.gz) = 273688 bytes
-SHA1 (patch-aa) = d6a9663d14bcf353e0c78df9d63f3c3565e4b074
-SHA1 (patch-ab) = 285020f22f45c1b0e84b87f67e454de81dd0538a
-SHA1 (patch-ac) = 859ad4b9ea4a501be08672142f1fed462abaa707
-SHA1 (patch-ad) = b181950ed46cb29508f75a9e681038a66444b48d
-SHA1 (patch-ae) = 74e28ada4059863c51eb7590b28c58a3b07bb1c2
+SHA1 (mp3blaster-3.2.0.tar.gz) = edc4538ad233270dd4b17066c5d2267708f1b5e0
+Size (mp3blaster-3.2.0.tar.gz) = 312991 bytes
+SHA1 (patch-aa) = d869d2acb66edbf569f39fd8d35e66b4651b4f77
+SHA1 (patch-ab) = f4d2486c915e593c81653df1285d532706e4107b
+SHA1 (patch-ac) = 3ad9344d22e511682ad05ab1e2dfbc057fb6cf96
+SHA1 (patch-ad) = bf744e9d9fffe01dcbeaa1579029d94a6060fa22
+SHA1 (patch-ae) = 65feb8611cea4b0f6e8de593e56972d676fb64d4
SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
-SHA1 (patch-ag) = e1e3a921b45e46c688c1466f8de3970d8fc0bd38
+SHA1 (patch-ag) = a7b796b7ff1c1c5497e0127a5f8b6dc02278d91b
SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
-SHA1 (patch-ak) = d839af2dd8bc09260b67573b7837789a4b718340
-SHA1 (patch-al) = c43b9f42050fd3bfb5943d3c3bc1c3d8814b8eb7
+SHA1 (patch-ak) = 35ec20a47287e0a158b385be3e8fcc133684d40b
+SHA1 (patch-al) = 746d2441b79530f3efa51bcd2bce847f247eec7c
SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
-SHA1 (patch-an) = 1a29ac76aa9725f7d42f31a4713defafd675c1af
+SHA1 (patch-an) = 7e801e08c2d5e72ff6dd4215c8d3466362fc54b1
SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
diff --git a/audio/mp3blaster/patches/patch-aa b/audio/mp3blaster/patches/patch-aa
index ef998c900da..491a44a8a10 100644
--- a/audio/mp3blaster/patches/patch-aa
+++ b/audio/mp3blaster/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/03 12:31:36 cube Exp $
---- getopt/Makefile.in.orig 2003-09-29 13:46:00.000000000 +0200
+--- getopt/Makefile.in.orig 2003-11-29 15:26:17.000000000 +0100
+++ getopt/Makefile.in
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,316 @@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -62,13 +62,19 @@ $NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+CC = @CC@
+CXX = @CXX@
++HAVE_LIB = @HAVE_LIB@
++LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
+LIBMPEGSOUND = @LIBMPEGSOUND@
+LIBMYSQL = @LIBMYSQL@
+LIBNMIXER = @LIBNMIXER@
++LIRC_LIBS = @LIRC_LIBS@
+LN_S = @LN_S@
++LTLIB = @LTLIB@
+MAKEINFO = @MAKEINFO@
+MP3B_MODULES = @MP3B_MODULES@
+NAS_CFLAGS = @NAS_CFLAGS@
@@ -109,7 +115,7 @@ $NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
-+TAR = gtar
++TAR = tar
+GZIP_ENV = --best
+DEP_FILES = .deps/getopt.P .deps/getopt1.P
+SOURCES = $(libgetopt_a_SOURCES)
diff --git a/audio/mp3blaster/patches/patch-ab b/audio/mp3blaster/patches/patch-ab
index 14fd5a8ce72..017a84388eb 100644
--- a/audio/mp3blaster/patches/patch-ab
+++ b/audio/mp3blaster/patches/patch-ab
@@ -1,40 +1,50 @@
-$NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ab,v 1.5 2003/12/03 12:31:36 cube Exp $
---- src/Makefile.in.orig 2002-10-20 19:05:08.000000000 +0200
+--- src/Makefile.in.orig 2003-11-28 21:07:27.000000000 +0100
+++ src/Makefile.in
-@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- CC = @CC@
+@@ -10,6 +10,8 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
++#bin_PROGRAMS = mp3blaster mp3tag splay
++
+
+ SHELL = @SHELL@
+
+@@ -63,6 +65,7 @@ CC = @CC@
CXX = @CXX@
+ HAVE_LIB = @HAVE_LIB@
+ LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
LIBMPEGSOUND = @LIBMPEGSOUND@
LIBMYSQL = @LIBMYSQL@
LIBNMIXER = @LIBNMIXER@
-@@ -75,9 +76,9 @@ SID_LIBS = @SID_LIBS@
+@@ -81,19 +84,15 @@ SID_LIBS = @SID_LIBS@
SRCDIRS = @SRCDIRS@
VERSION = @VERSION@
-bin_PROGRAMS = mp3blaster mp3tag splay
-+bin_PROGRAMS = mp3blaster mp3tag
- #bin_PROGRAMS = mp3blaster mp3tag
+-#bin_PROGRAMS = mp3blaster mp3tag
-mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc getopt.c getopt1.c fileman.h genretab.h getopt.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h
+-
+-splay_SOURCES = splay.cc splay.h splay_common.cc
+-splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
+-splay_LDADD = @LIBMPEGSOUND@
++bin_PROGRAMS = mp3blaster mp3tag
+mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc fileman.h genretab.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h history.cc history.h getinput.cc getinput.h interface.cc interface.h
-
- splay_SOURCES = splay.cc splay.h splay_common.cc
- splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
-@@ -85,9 +86,9 @@ splay_LDADD = @LIBMPEGSOUND@
++
mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
-mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
+-mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
++mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
EXTRA_DIST = FILES
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -104,9 +105,8 @@ X_CFLAGS = @X_CFLAGS@
+@@ -110,14 +109,11 @@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -46,21 +56,25 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
mp3blaster_LDFLAGS =
mp3tag_OBJECTS = id3parse.o mp3tag.o
mp3tag_LDFLAGS =
-@@ -124,8 +124,12 @@ DIST_COMMON = Makefile.am Makefile.in
+-splay_OBJECTS = splay.o splay_common.o
+-splay_LDFLAGS =
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+@@ -132,16 +128,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
--TAR = tar
-+TAR = gtar
+ TAR = tar
GZIP_ENV = --best
+-SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
+-OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
+DEP_FILES = .deps/config.P .deps/fileman.P .deps/getinput.P \
+.deps/global.P .deps/history.P .deps/id3parse.P .deps/interface.P \
+.deps/main.P .deps/mp3item.P .deps/mp3tag.P .deps/mp3win.P \
-+.deps/scrollwin.P .deps/splay.P .deps/splay_common.P .deps/winitem.P
- SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
- OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
++.deps/scrollwin.P .deps/winitem.P
++SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES)
++OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS)
-@@ -133,9 +137,9 @@ all: all-redirect
+ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .cc .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -72,7 +86,7 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -165,9 +169,6 @@ uninstall-binPROGRAMS:
+@@ -171,9 +171,6 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
@@ -82,7 +96,18 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
.s.o:
$(COMPILE) -c $<
-@@ -216,7 +217,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+@@ -197,10 +194,6 @@ mp3blaster: $(mp3blaster_OBJECTS) $(mp3b
+ mp3tag: $(mp3tag_OBJECTS) $(mp3tag_DEPENDENCIES)
+ @rm -f mp3tag
+ $(CXXLINK) $(mp3tag_LDFLAGS) $(mp3tag_OBJECTS) $(mp3tag_LDADD) $(LIBS)
+-
+-splay: $(splay_OBJECTS) $(splay_DEPENDENCIES)
+- @rm -f splay
+- $(CXXLINK) $(splay_LDFLAGS) $(splay_OBJECTS) $(splay_LDADD) $(LIBS)
+ .cc.o:
+ $(CXXCOMPILE) -c $<
+
+@@ -222,7 +215,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
@@ -91,7 +116,7 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
mostlyclean-tags:
-@@ -232,6 +233,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+@@ -238,6 +231,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
subdir = src
distdir: $(DISTFILES)
@@ -103,9 +128,36 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
-@@ -243,6 +249,56 @@ distdir: $(DISTFILES)
+@@ -248,33 +246,57 @@ distdir: $(DISTFILES)
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+-config.o: config.cc mp3blaster.h ../config.h global.h
+-fileman.o: fileman.cc mp3blaster.h ../config.h getopt.h fileman.h \
+- scrollwin.h winitem.h global.h
+-getinput.o: getinput.cc getinput.h ../config.h
+-getopt.o: getopt.c ../config.h
+-getopt1.o: getopt1.c ../config.h getopt.h
+-global.o: global.cc getopt.h mp3blaster.h ../config.h id3parse.h
+-history.o: history.cc ../config.h history.h getopt.h
+-id3parse.o: id3parse.cc id3parse.h genretab.h
+-interface.o: interface.cc
+-main.o: main.cc ../config.h history.h getopt.h mp3blaster.h global.h \
+- scrollwin.h winitem.h mp3win.h fileman.h \
+- ../mpegsound/mpegsound.h ../nmixer/nmixer.h keybindings.h \
+- getinput.h
+-mp3item.o: mp3item.cc mp3item.h winitem.h mp3blaster.h ../config.h \
+- mp3win.h scrollwin.h
+-mp3tag.o: mp3tag.cc mp3blaster.h ../config.h getopt.h \
+- ../mpegsound/mpegsound.h id3parse.h
+-mp3win.o: mp3win.cc mp3win.h scrollwin.h mp3blaster.h ../config.h \
+- winitem.h mp3item.h
+-scrollwin.o: scrollwin.cc mp3blaster.h ../config.h global.h scrollwin.h \
+- winitem.h
+-splay.o: splay.cc ../config.h getopt.h ../mpegsound/mpegsound.h splay.h
+-splay_common.o: splay_common.cc ../config.h ../mpegsound/mpegsound.h \
+- getopt.h splay.h
+-winitem.o: winitem.cc mp3blaster.h ../config.h scrollwin.h winitem.h
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
@@ -160,7 +212,7 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
info-am:
info: info-am
dvi-am:
-@@ -280,23 +336,24 @@ distclean-generic:
+@@ -312,23 +334,24 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
@@ -190,7 +242,7 @@ $NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-@@ -306,12 +363,13 @@ maintainer-clean: maintainer-clean-am
+@@ -338,12 +361,13 @@ maintainer-clean: maintainer-clean-am
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac
index 7a7614ed90f..457254c025c 100644
--- a/audio/mp3blaster/patches/patch-ac
+++ b/audio/mp3blaster/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ac,v 1.5 2003/12/03 12:31:36 cube Exp $
---- Makefile.in.orig 2002-10-20 19:05:07.000000000 +0200
+--- Makefile.in.orig 2003-11-28 21:07:22.000000000 +0100
+++ Makefile.in
-@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- CC = @CC@
+@@ -63,6 +63,7 @@ CC = @CC@
CXX = @CXX@
+ HAVE_LIB = @HAVE_LIB@
+ LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
LIBMPEGSOUND = @LIBMPEGSOUND@
LIBMYSQL = @LIBMYSQL@
LIBNMIXER = @LIBNMIXER@
-@@ -75,8 +76,8 @@ SID_LIBS = @SID_LIBS@
+@@ -81,8 +82,8 @@ SID_LIBS = @SID_LIBS@
SRCDIRS = @SRCDIRS@
VERSION = @VERSION@
@@ -21,13 +21,7 @@ $NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 BUGS splay.1 mp3blaster.list mp3blaster.spec
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -94,14 +95,14 @@ configure configure.in install-sh missin
-
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
--TAR = tar
-+TAR = gtar
- GZIP_ENV = --best
+@@ -106,9 +107,9 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -39,7 +33,7 @@ $NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -258,7 +259,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -265,7 +266,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
@@ -48,7 +42,7 @@ $NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
mostlyclean-tags:
-@@ -307,6 +308,11 @@ distdir: $(DISTFILES)
+@@ -314,6 +315,11 @@ distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
-chmod 777 $(distdir)
diff --git a/audio/mp3blaster/patches/patch-ad b/audio/mp3blaster/patches/patch-ad
index b23b5170ac3..4ee8c7eda05 100644
--- a/audio/mp3blaster/patches/patch-ad
+++ b/audio/mp3blaster/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ad,v 1.2 2003/12/03 12:31:36 cube Exp $
---- configure.orig 2002-10-20 19:04:59.000000000 +0200
+--- configure.orig 2003-11-28 21:07:16.000000000 +0100
+++ configure
-@@ -1589,7 +1589,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
+@@ -1591,7 +1591,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
fi
fi
@@ -10,8 +10,8 @@ $NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
+for ac_func in strdup strstr getopt_long_only
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1596: checking for $ac_func" >&5
-@@ -2420,7 +2420,7 @@ else
+ echo "configure:1598: checking for $ac_func" >&5
+@@ -2542,7 +2542,7 @@ else
fi
done
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3749,13 +3749,15 @@ fi
+@@ -3907,13 +3907,15 @@ fi
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
trap '' 1 2 15
cat > confcache <<\EOF
-@@ -3858,7 +3860,7 @@ done
+@@ -4016,7 +4018,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
EOF
cat >> $CONFIG_STATUS <<EOF
-@@ -3919,6 +3921,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
+@@ -4079,6 +4081,7 @@ s%@NAS_CFLAGS@%$NAS_CFLAGS%g
s%@NCURSES_LIBS@%$NCURSES_LIBS%g
s%@LIBMPEGSOUND@%$LIBMPEGSOUND%g
s%@LIBNMIXER@%$LIBNMIXER%g
@@ -55,7 +55,7 @@ $NetBSD: patch-ad,v 1.1 2003/09/30 09:44:00 cube Exp $
s%@SRCDIRS@%$SRCDIRS%g
CEOF
-@@ -3961,7 +3964,7 @@ EOF
+@@ -4121,7 +4124,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
diff --git a/audio/mp3blaster/patches/patch-ae b/audio/mp3blaster/patches/patch-ae
index 997a77ec7a2..780e2986af6 100644
--- a/audio/mp3blaster/patches/patch-ae
+++ b/audio/mp3blaster/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ae,v 1.2 2003/12/03 12:31:37 cube Exp $
---- nmixer/Makefile.in.orig 2002-10-20 19:05:08.000000000 +0200
+--- nmixer/Makefile.in.orig 2003-11-28 21:07:25.000000000 +0100
+++ nmixer/Makefile.in
-@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- CC = @CC@
+@@ -63,6 +63,7 @@ CC = @CC@
CXX = @CXX@
+ HAVE_LIB = @HAVE_LIB@
+ LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
LIBMPEGSOUND = @LIBMPEGSOUND@
LIBMYSQL = @LIBMYSQL@
LIBNMIXER = @LIBNMIXER@
-@@ -77,12 +78,11 @@ VERSION = @VERSION@
+@@ -83,12 +84,11 @@ VERSION = @VERSION@
bin_PROGRAMS = nmixer
nmixer_SOURCES = main.cc
@@ -26,7 +26,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
CXXFLAGS = @NAS_CFLAGS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
-@@ -99,8 +99,7 @@ X_LIBS = @X_LIBS@
+@@ -105,8 +105,7 @@ X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
libnmixer_a_LIBADD =
@@ -36,19 +36,16 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
AR = ar
PROGRAMS = $(bin_PROGRAMS)
-@@ -120,8 +119,10 @@ Makefile.in
+@@ -128,6 +127,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
--TAR = tar
-+TAR = gtar
+ TAR = tar
GZIP_ENV = --best
+DEP_FILES = .deps/main.P .deps/mixers.P .deps/nasmixer.P .deps/nmixer.P \
+.deps/ossmixer.P
SOURCES = $(libnmixer_a_SOURCES) $(nmixer_SOURCES)
OBJECTS = $(libnmixer_a_OBJECTS) $(nmixer_OBJECTS)
-@@ -129,9 +130,9 @@ all: all-redirect
+@@ -135,9 +136,9 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .cc .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -60,7 +57,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -145,9 +146,6 @@ distclean-noinstLIBRARIES:
+@@ -151,9 +152,6 @@ distclean-noinstLIBRARIES:
maintainer-clean-noinstLIBRARIES:
@@ -70,7 +67,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
.s.o:
$(COMPILE) -c $<
-@@ -218,7 +216,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+@@ -224,7 +222,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
@@ -79,7 +76,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
mostlyclean-tags:
-@@ -234,6 +232,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+@@ -240,6 +238,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
subdir = nmixer
distdir: $(DISTFILES)
@@ -91,9 +88,17 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
-@@ -245,6 +248,56 @@ distdir: $(DISTFILES)
+@@ -250,14 +253,57 @@ distdir: $(DISTFILES)
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+-getopt.o: getopt.c ../config.h
+-getopt1.o: getopt1.c ../config.h getopt.h
+-main.o: main.cc nmixer.h ../config.h getopt.h
+-mixers.o: mixers.cc nmixer.h ../config.h getopt.h
+-nasmixer.o: nasmixer.cc
+-nmixer.o: nmixer.cc nmixer.h ../config.h getopt.h
+-ossmixer.o: ossmixer.cc nmixer.h ../config.h getopt.h
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
@@ -148,7 +153,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
info-am:
info: info-am
dvi-am:
-@@ -283,25 +336,25 @@ distclean-generic:
+@@ -296,25 +342,25 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
mostlyclean-binPROGRAMS mostlyclean-tags \
@@ -180,7 +185,7 @@ $NetBSD: patch-ae,v 1.1 2003/09/30 09:44:00 cube Exp $
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-@@ -313,8 +366,9 @@ mostlyclean-compile distclean-compile cl
+@@ -326,8 +372,9 @@ mostlyclean-compile distclean-compile cl
maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \
clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
install-binPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \
diff --git a/audio/mp3blaster/patches/patch-ag b/audio/mp3blaster/patches/patch-ag
index c47a82a13f0..66bc60d1a91 100644
--- a/audio/mp3blaster/patches/patch-ag
+++ b/audio/mp3blaster/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2003/10/11 21:55:24 cube Exp $
+$NetBSD: patch-ag,v 1.3 2003/12/03 12:31:37 cube Exp $
---- src/main.cc.orig 2002-10-20 16:19:08.000000000 +0200
+--- src/main.cc.orig 2003-09-09 23:22:55.000000000 +0200
+++ src/main.cc
-@@ -45,10 +45,10 @@
+@@ -51,10 +51,10 @@
#include <pth.h>
#endif
#include NCURSES
@@ -15,13 +15,3 @@ $NetBSD: patch-ag,v 1.2 2003/10/11 21:55:24 cube Exp $
#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
-@@ -133,7 +133,9 @@ void usage();
- void show_help();
- void draw_static(int file_mode=0);
- void draw_settings(int cleanit=0);
-+#if 0
- char *gettext(const char *label, short display_path=0);
-+#endif
- void fw_getpath(char *, void *);
- void fw_convmp3(char *, void *);
- void fw_addurl(char *, void *);
diff --git a/audio/mp3blaster/patches/patch-ak b/audio/mp3blaster/patches/patch-ak
index 7daac6de983..8e5d4bb04a1 100644
--- a/audio/mp3blaster/patches/patch-ak
+++ b/audio/mp3blaster/patches/patch-ak
@@ -1,10 +1,11 @@
-$NetBSD: patch-ak,v 1.1 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ak,v 1.2 2003/12/03 12:31:37 cube Exp $
---- Makefile.am.orig 2002-10-20 18:29:01.000000000 +0200
+--- Makefile.am.orig 2002-10-20 16:01:47.000000000 +0200
+++ Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = mpegsound nmixer src doc
+-man_MANS = mp3blaster.1 nmixer.1 splay.1
+SUBDIRS = getopt mpegsound nmixer src doc
- man_MANS = mp3blaster.1 nmixer.1 splay.1
++man_MANS = mp3blaster.1 nmixer.1
EXTRA_DIST = CREDITS TODO FAQ mp3blaster.1 nmixer.1 \
BUGS splay.1 mp3blaster.list mp3blaster.spec
diff --git a/audio/mp3blaster/patches/patch-al b/audio/mp3blaster/patches/patch-al
index 6a38d6471f8..2bca705120d 100644
--- a/audio/mp3blaster/patches/patch-al
+++ b/audio/mp3blaster/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-al,v 1.2 2003/12/03 12:31:37 cube Exp $
---- configure.in.orig 2002-10-20 18:34:43.000000000 +0200
+--- configure.in.orig 2003-10-26 16:40:37.000000000 +0100
+++ configure.in
@@ -17,7 +17,7 @@ AC_C_BIGENDIAN
@@ -9,9 +9,9 @@ $NetBSD: patch-al,v 1.1 2003/09/30 09:44:00 cube Exp $
-AC_CHECK_FUNCS(strdup strstr)
+AC_CHECK_FUNCS(strdup strstr getopt_long_only)
- #For FreeBSD, look in /usr/local/(lib,include) first, since ncurses4
- #must be installed as an add-on on these systems in /usr/local
-@@ -201,7 +201,7 @@ AC_CHECK_HEADERS(fcntl.h malloc.h sys/io
+ AC_LANG_CPLUSPLUS
+
+@@ -220,7 +220,7 @@ AC_CHECK_HEADERS(fcntl.h malloc.h sys/io
AC_CHECK_HEADERS(bool.h)
AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h pth.h)
AC_CHECK_HEADERS(curses.h,HAVE_CURSES_H=1)
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.1 2003/09/30 09:44:00 cube Exp $
AC_CHECK_HEADER(sys/soundcard.h,HAVE_SYS_SOUNDCARD_H=1)
AC_CHECK_HEADER(machine/soundcard.h,HAVE_MACHINE_SOUNDCARD_H=1)
AC_CHECK_HEADER(soundcard.h,HAVE_SOUNDCARD_H=1)
-@@ -336,15 +336,17 @@ dnl CXXFLAGS="$CXXFLAGS -D__NO_MATH_INLI
+@@ -355,15 +355,17 @@ dnl CXXFLAGS="$CXXFLAGS -D__NO_MATH_INLI
dnl check for Network Audio System library
diff --git a/audio/mp3blaster/patches/patch-an b/audio/mp3blaster/patches/patch-an
index 302b1c7eedd..add85adf719 100644
--- a/audio/mp3blaster/patches/patch-an
+++ b/audio/mp3blaster/patches/patch-an
@@ -1,8 +1,12 @@
-$NetBSD: patch-an,v 1.1 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-an,v 1.2 2003/12/03 12:31:37 cube Exp $
---- src/Makefile.am.orig 2002-09-20 22:40:15.000000000 +0200
+--- src/Makefile.am.orig 2003-09-08 23:48:56.000000000 +0200
+++ src/Makefile.am
-@@ -3,11 +3,8 @@ bin_PROGRAMS = mp3blaster mp3tag splay
+@@ -1,13 +1,10 @@
+-bin_PROGRAMS = mp3blaster mp3tag splay
+-#bin_PROGRAMS = mp3blaster mp3tag
++#bin_PROGRAMS = mp3blaster mp3tag splay
++bin_PROGRAMS = mp3blaster mp3tag
mp3blaster_SOURCES = fileman.cc \
main.cc \
scrollwin.cc \
@@ -14,14 +18,20 @@ $NetBSD: patch-an,v 1.1 2003/09/30 09:44:00 cube Exp $
id3parse.cc \
id3parse.h \
mp3blaster.h \
-@@ -35,8 +32,8 @@ splay_LDADD = @LIBMPEGSOUND@
+@@ -29,14 +26,11 @@ mp3blaster_SOURCES = fileman.cc \
+ interface.cc \
+ interface.h
+ @MP3B_MODULES@
+-splay_SOURCES = splay.cc splay.h splay_common.cc
+-splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
+-splay_LDADD = @LIBMPEGSOUND@
mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
-mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
+-mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
++mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
EXTRA_DIST = FILES
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 12:01:04 +0000