diff options
author | kevlo <kevlo@FreeBSD.org> | 2000-12-26 15:07:53 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2000-12-26 15:07:53 +0000 |
commit | f926b48f7ef377d7978686e662cee02bf7a1defa (patch) | |
tree | bf36eef25a9262c4cca0d882eb259011c45762dc /audio/cmp3/files | |
parent | 4c8c7ba683f72db0cac4f4e6bfed16b12708b6ab (diff) | |
download | FreeBSD-ports-f926b48f7ef377d7978686e662cee02bf7a1defa.zip FreeBSD-ports-f926b48f7ef377d7978686e662cee02bf7a1defa.tar.gz |
Upgrade to 2.0.p5
PR: 23828
Submitted by: Ports Fury
Diffstat (limited to 'audio/cmp3/files')
-rw-r--r-- | audio/cmp3/files/patch-aa | 40 | ||||
-rw-r--r-- | audio/cmp3/files/patch-ab | 11 |
2 files changed, 33 insertions, 18 deletions
diff --git a/audio/cmp3/files/patch-aa b/audio/cmp3/files/patch-aa index e6d6fae..82156cf 100644 --- a/audio/cmp3/files/patch-aa +++ b/audio/cmp3/files/patch-aa @@ -1,35 +1,45 @@ ---- Makefile.orig Tue Mar 7 14:21:48 2000 -+++ Makefile Tue Mar 7 14:23:36 2000 -@@ -3,7 +3,7 @@ +--- Makefile.orig Fri Mar 17 10:35:33 2000 ++++ Makefile Sat Dec 23 10:34:05 2000 +@@ -3,19 +3,19 @@ # - initial_directory := "/mp3" + # initial_directory is now set in the config file mpg123_location := "mpg123" -install_directory := "$(HOME)/bin" +install_directory := "$(PREFIX)/bin" # - # Location of config file (YOU create this file by yourself, see README) -@@ -15,7 +15,7 @@ + # Location of config file - Please edit this file before installing + # +-config_file := "$(HOME)/.cmp3rc" ++config_file := "$$\(HOME)/.cmp3rc" + + # + # Uncomment and set if desired # ## An ass repository is a nice thing to have. See README -ass_repository := "$(HOME)/.cmp3ass" -+#ass_repository := "$(HOME)/.cmp3ass" ++ass_repository := "$$\(HOME)/.cmp3ass" ## Define this for bufferring or add other parameters to mpg123 mpg123_params := -b 320 -@@ -34,8 +34,8 @@ +@@ -38,8 +38,8 @@ # stands. Change the code to do something else you want it to do... #PARAMS +=-DMY_CD - LIBS= -lncurses --CFLAGS= -Wall -g -O2 + LIBS= -lform -lncurses +-CFLAGS= -g -O -Inevlib -CC= gcc -+CFLAGS+= -Wall ++CFLAGS+= -Inevlib +CC?= gcc - OBJS= llist.o cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ + OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \ - cmp3general.o -@@ -91,4 +91,4 @@ + cmp3general.o cmp3id3.o +@@ -78,7 +78,7 @@ + $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3 - include .depend + lib: +- @$(MAKE) -C nevlib lib ++ @$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -C nevlib lib + cleanlib: + @$(MAKE) -C nevlib clean diff --git a/audio/cmp3/files/patch-ab b/audio/cmp3/files/patch-ab index 42d75ff..603d1f3 100644 --- a/audio/cmp3/files/patch-ab +++ b/audio/cmp3/files/patch-ab @@ -1,11 +1,16 @@ ---- cmp3.h.orig Tue Mar 7 14:25:06 2000 -+++ cmp3.h Tue Mar 7 14:25:12 2000 -@@ -1,7 +1,7 @@ +--- cmp3.h.orig Fri Mar 17 10:14:10 2000 ++++ cmp3.h Sat Dec 23 09:46:16 2000 +@@ -1,7 +1,12 @@ #ifndef _CMP3_H #define _CMP3_H -#include<curses.h> ++#if defined(__FreeBSD__) +#include <ncurses.h> ++#include <termios.h> ++#else ++#include <curses.h> ++#endif #ifndef NCURSES_VERSION #error "This program requires ncurses to function" |