diff options
| author | cube <cube> | 2003-09-30 09:43:59 +0000 |
|---|---|---|
| committer | cube <cube> | 2003-09-30 09:43:59 +0000 |
| commit | 70a040e0b613d4ec46d90a9bd4d34b27e6e1a654 (patch) | |
| tree | 94308ef957c597b0360db19134b58d598a94b604 /audio/mp3blaster/patches/patch-ac | |
| parent | 6efe866504c2877bc7871b32fbeb2980f27c6862 (diff) | |
| download | pkgsrc-70a040e0b613d4ec46d90a9bd4d34b27e6e1a654.tar.gz | |
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 (limited to 'audio/mp3blaster/patches/patch-ac')
| -rw-r--r-- | audio/mp3blaster/patches/patch-ac | 59 |
1 files changed, 54 insertions, 5 deletions
diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac index 22dcf29fb9a..7a7614ed90f 100644 --- a/audio/mp3blaster/patches/patch-ac +++ b/audio/mp3blaster/patches/patch-ac @@ -1,13 +1,62 @@ -$NetBSD: patch-ac,v 1.3 2002/11/22 17:02:05 jschauma Exp $ +$NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $ ---- Makefile.in.orig Fri Nov 22 11:21:10 2002 -+++ Makefile.in Fri Nov 22 11:21:24 2002 -@@ -76,7 +76,7 @@ +--- Makefile.in.orig 2002-10-20 19:05:07.000000000 +0200 ++++ Makefile.in +@@ -59,6 +59,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + CC = @CC@ + CXX = @CXX@ ++LIBGETOPT = @LIBGETOPT@ + LIBMPEGSOUND = @LIBMPEGSOUND@ + LIBMYSQL = @LIBMYSQL@ + LIBNMIXER = @LIBNMIXER@ +@@ -75,8 +76,8 @@ SID_LIBS = @SID_LIBS@ + SRCDIRS = @SRCDIRS@ VERSION = @VERSION@ - SUBDIRS = mpegsound nmixer src doc +-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 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 + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +@@ -258,7 +259,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" \ +- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) ++ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + + mostlyclean-tags: + +@@ -307,6 +308,11 @@ distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) + -chmod 777 $(distdir) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ |