[pkgsrc/trunk]: pkgsrc/audio/mp3blaster Make this correctly compile with gcc3...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/mp3blaster Make this correctly compile with gcc3...
From: cube <cube%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:03:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e78303cb389
branches:  trunk
changeset: 462314:1e78303cb389
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Sep 30 09:43:59 2003 +0000

description:
Make this correctly compile with gcc3, by reorganizing the way it pulls
up getop_long_only implementation. Patch sent to the author.

Ok'd by seb@.

diffstat:

 audio/mp3blaster/Makefile         |    8 +-
 audio/mp3blaster/distinfo         |   20 ++-
 audio/mp3blaster/patches/patch-aa |  315 ++++++++++++++++++++++++++++++++++++++
 audio/mp3blaster/patches/patch-ab |  212 ++++++++++++++++++++++++-
 audio/mp3blaster/patches/patch-ac |   59 ++++++-
 audio/mp3blaster/patches/patch-ad |   66 +++++++
 audio/mp3blaster/patches/patch-ae |  194 +++++++++++++++++++++++
 audio/mp3blaster/patches/patch-af |   17 ++
 audio/mp3blaster/patches/patch-ag |   17 ++
 audio/mp3blaster/patches/patch-ah |    7 +
 audio/mp3blaster/patches/patch-ai |   24 ++
 audio/mp3blaster/patches/patch-aj |   31 +++
 audio/mp3blaster/patches/patch-ak |   10 +
 audio/mp3blaster/patches/patch-al |   43 +++++
 audio/mp3blaster/patches/patch-am |   17 ++
 audio/mp3blaster/patches/patch-an |   27 +++
 audio/mp3blaster/patches/patch-ao |   27 +++
 audio/mp3blaster/patches/patch-ap |   16 +
 18 files changed, 1094 insertions(+), 16 deletions(-)

diffs (truncated from 1210 to 300 lines):

diff -r ef791d2bedd5 -r 1e78303cb389 audio/mp3blaster/Makefile
--- a/audio/mp3blaster/Makefile Tue Sep 30 09:36:27 2003 +0000
+++ b/audio/mp3blaster/Makefile Tue Sep 30 09:43:59 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/30 09:43:59 cube Exp $
 
 DISTNAME=      mp3blaster-3.1.3
 PKGREVISION=   3
@@ -25,6 +25,12 @@
 CONFIGURE_ARGS+=       --enable-newthreads
 .endif
 
+post-extract:
+       ${MKDIR} ${WRKSRC}/getopt
+       ${MV} ${WRKSRC}/nmixer/getopt.h ${WRKSRC}/nmixer/getopt.c ${WRKSRC}/nmixer/getopt1.c \
+               ${WRKSRC}/getopt
+       ${RM} ${WRKSRC}/src/getopt.h ${WRKSRC}/src/getopt.c ${WRKSRC}/src/getopt1.c
+
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
diff -r ef791d2bedd5 -r 1e78303cb389 audio/mp3blaster/distinfo
--- a/audio/mp3blaster/distinfo Tue Sep 30 09:36:27 2003 +0000
+++ b/audio/mp3blaster/distinfo Tue Sep 30 09:43:59 2003 +0000
@@ -1,6 +1,20 @@
-$NetBSD: distinfo,v 1.3 2002/11/22 17:02:04 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2003/09/30 09:43:59 cube Exp $
 
 SHA1 (mp3blaster-3.1.3.tar.gz) = 516f0b55443c9b7035ef2a82903b369c13a8f001
 Size (mp3blaster-3.1.3.tar.gz) = 273688 bytes
-SHA1 (patch-ab) = 6c0535a5cecba3c28c08e323fc2b3800f40692de
-SHA1 (patch-ac) = 216d44457f7f7d814123e418528acacbef3b5398
+SHA1 (patch-aa) = d6a9663d14bcf353e0c78df9d63f3c3565e4b074
+SHA1 (patch-ab) = 285020f22f45c1b0e84b87f67e454de81dd0538a
+SHA1 (patch-ac) = 859ad4b9ea4a501be08672142f1fed462abaa707
+SHA1 (patch-ad) = b181950ed46cb29508f75a9e681038a66444b48d
+SHA1 (patch-ae) = 74e28ada4059863c51eb7590b28c58a3b07bb1c2
+SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
+SHA1 (patch-ag) = 3f8d5320cac1f76c1c43fd53bda1cdf5bc4ae08b
+SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
+SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
+SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
+SHA1 (patch-ak) = d839af2dd8bc09260b67573b7837789a4b718340
+SHA1 (patch-al) = c43b9f42050fd3bfb5943d3c3bc1c3d8814b8eb7
+SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
+SHA1 (patch-an) = 1a29ac76aa9725f7d42f31a4713defafd675c1af
+SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
+SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
diff -r ef791d2bedd5 -r 1e78303cb389 audio/mp3blaster/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mp3blaster/patches/patch-aa Tue Sep 30 09:43:59 2003 +0000
@@ -0,0 +1,315 @@
+$NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+
+--- getopt/Makefile.in.orig    2003-09-29 13:46:00.000000000 +0200
++++ getopt/Makefile.in
+@@ -0,0 +1,310 @@
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++
++SHELL = @SHELL@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
++bindir = @bindir@
++sbindir = @sbindir@
++libexecdir = @libexecdir@
++datadir = @datadir@
++sysconfdir = @sysconfdir@
++sharedstatedir = @sharedstatedir@
++localstatedir = @localstatedir@
++libdir = @libdir@
++infodir = @infodir@
++mandir = @mandir@
++includedir = @includedir@
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++
++top_builddir = ..
++
++ACLOCAL = @ACLOCAL@
++AUTOCONF = @AUTOCONF@
++AUTOMAKE = @AUTOMAKE@
++AUTOHEADER = @AUTOHEADER@
++
++INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++transform = @program_transform_name@
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++CC = @CC@
++CXX = @CXX@
++LIBGETOPT = @LIBGETOPT@
++LIBMPEGSOUND = @LIBMPEGSOUND@
++LIBMYSQL = @LIBMYSQL@
++LIBNMIXER = @LIBNMIXER@
++LN_S = @LN_S@
++MAKEINFO = @MAKEINFO@
++MP3B_MODULES = @MP3B_MODULES@
++NAS_CFLAGS = @NAS_CFLAGS@
++NAS_LIBS = @NAS_LIBS@
++NCURSES_LIBS = @NCURSES_LIBS@
++OGG_LIBS = @OGG_LIBS@
++PACKAGE = @PACKAGE@
++RANLIB = @RANLIB@
++SID_LIBS = @SID_LIBS@
++SRCDIRS = @SRCDIRS@
++VERSION = @VERSION@
++
++noinst_LIBRARIES = libgetopt.a
++libgetopt_a_SOURCES = gnugetopt.h getopt.c getopt1.c
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = ../config.h
++CONFIG_CLEAN_FILES = 
++LIBRARIES =  $(noinst_LIBRARIES)
++
++
++DEFS = @DEFS@ -I. -I$(srcdir) -I..
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++X_CFLAGS = @X_CFLAGS@
++X_LIBS = @X_LIBS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_PRE_LIBS = @X_PRE_LIBS@
++libgetopt_a_LIBADD = 
++libgetopt_a_OBJECTS =  getopt.o getopt1.o
++AR = ar
++CFLAGS = @CFLAGS@
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = gtar
++GZIP_ENV = --best
++DEP_FILES =  .deps/getopt.P .deps/getopt1.P
++SOURCES = $(libgetopt_a_SOURCES)
++OBJECTS = $(libgetopt_a_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .o .s
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++      cd $(top_srcdir) && $(AUTOMAKE) --gnu getopt/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
++      cd $(top_builddir) \
++        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-noinstLIBRARIES:
++
++clean-noinstLIBRARIES:
++      -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
++
++distclean-noinstLIBRARIES:
++
++maintainer-clean-noinstLIBRARIES:
++
++.s.o:
++      $(COMPILE) -c $<
++
++.S.o:
++      $(COMPILE) -c $<
++
++mostlyclean-compile:
++      -rm -f *.o core *.core
++
++clean-compile:
++
++distclean-compile:
++      -rm -f *.tab.c
++
++maintainer-clean-compile:
++
++libgetopt.a: $(libgetopt_a_OBJECTS) $(libgetopt_a_DEPENDENCIES)
++      -rm -f libgetopt.a
++      $(AR) cru libgetopt.a $(libgetopt_a_OBJECTS) $(libgetopt_a_LIBADD)
++      $(RANLIB) libgetopt.a
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++      list='$(SOURCES) $(HEADERS)'; \
++      unique=`for i in $$list; do echo $$i; done | \
++        awk '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
++      here=`pwd` && cd $(srcdir) \
++        && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++      tags=; \
++      here=`pwd`; \
++      list='$(SOURCES) $(HEADERS)'; \
++      unique=`for i in $$list; do echo $$i; done | \
++        awk '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
++      test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++        || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++      -rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = getopt
++
++distdir: $(DISTFILES)
++      here=`cd $(top_builddir) && pwd`; \
++      top_distdir=`cd $(top_distdir) && pwd`; \
++      distdir=`cd $(distdir) && pwd`; \
++      cd $(top_srcdir) \
++        && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu getopt/Makefile
++      @for file in $(DISTFILES); do \
++        d=$(srcdir); \
++        if test -d $$d/$$file; then \
++          cp -pr $$d/$$file $(distdir)/$$file; \
++        else \
++          test -f $(distdir)/$$file \
++          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++          || cp -p $$d/$$file $(distdir)/$$file || :; \
++        fi; \
++      done
++
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++      -rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++      @echo '$(COMPILE) -c $<'; \
++      $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++      @-cp .deps/$(*F).pp .deps/$(*F).P; \
++      tr ' ' '\012' < .deps/$(*F).pp \
++        | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++          >> .deps/$(*F).P; \
++      rm .deps/$(*F).pp
++
++%.lo: %.c
++      @echo '$(LTCOMPILE) -c $<'; \
++      $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++      @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
++        < .deps/$(*F).pp > .deps/$(*F).P; \
++      tr ' ' '\012' < .deps/$(*F).pp \
++        | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++          >> .deps/$(*F).P; \
++      rm -f .deps/$(*F).pp
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk/buildlink3 Set the final form of the template build...
Next by Date: [pkgsrc/trunk]: pkgsrc Match the buildlink3.mk guidelines set out in revision...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk/buildlink3 Set the final form of the template build...
Next by Thread: [pkgsrc/trunk]: pkgsrc Match the buildlink3.mk guidelines set out in revision...
Indexes:
Home | Main Index | Thread Index | Old Index