aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-03-20 03:19:36 +0800
committerkrion <krion@FreeBSD.org>2004-03-20 03:19:36 +0800
commitb5ee2612eae7c4e82c2085f06d8d07f536a42d9c (patch)
tree9c49ff97c04d7dd4979b952eae56db7bd0a0f83d /audio
parent4b6e87f1606b4c972eed1c0de325dfda10517241 (diff)
downloadfreebsd-ports-gnome-b5ee2612eae7c4e82c2085f06d8d07f536a42d9c.tar.gz
freebsd-ports-gnome-b5ee2612eae7c4e82c2085f06d8d07f536a42d9c.tar.zst
freebsd-ports-gnome-b5ee2612eae7c4e82c2085f06d8d07f536a42d9c.zip
- Update to version 2.0.p6
PR: ports/64466 Submitted by: Ports Fury
Diffstat (limited to 'audio')
-rw-r--r--audio/cmp3/Makefile16
-rw-r--r--audio/cmp3/distinfo4
-rw-r--r--audio/cmp3/files/patch-Makefile.in (renamed from audio/cmp3/files/patch-aa)33
-rw-r--r--audio/cmp3/files/patch-ab16
-rw-r--r--audio/cmp3/files/patch-cmp3volume.c14
-rw-r--r--audio/cmp3/files/patch-nevlib::Makefile.in10
-rw-r--r--audio/cmp3/pkg-descr2
-rw-r--r--audio/cmp3/pkg-plist5
8 files changed, 48 insertions, 52 deletions
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 809edad3c476..a89820fd8644 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= cmp3
-PORTVERSION= 2.0.p5
-PORTREVISION= 2
+PORTVERSION= 2.0.p6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
@@ -17,9 +17,17 @@ COMMENT= An ncurses based frontend to mpg123
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/${PORTNAME}-kenrevs/
USE_GMAKE= yes
+GNU_CONFIGURE= yes
+
+PORTDOCS= README sample.cmp3rc
+PLIST_FILES= bin/cmp3 bin/rnmp3
+
+.if !defined(WITHOUT_VORBIS)
+RUN_DEPENDS+= ogg123:${PORTSDIR}/audio/vorbis-tools
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
index ae148f764693..0dcbb94b6b5b 100644
--- a/audio/cmp3/distinfo
+++ b/audio/cmp3/distinfo
@@ -1,2 +1,2 @@
-MD5 (cmp3-2.0pre5.tar.gz) = 830b2bcf3c7d7daba67bf8752ddb102b
-SIZE (cmp3-2.0pre5.tar.gz) = 40207
+MD5 (cmp3-2.0pre6.tar.gz) = 3c58301334de2cbc58c4e37433a0b760
+SIZE (cmp3-2.0pre6.tar.gz) = 183749
diff --git a/audio/cmp3/files/patch-aa b/audio/cmp3/files/patch-Makefile.in
index f3a63603e257..216fda26c28c 100644
--- a/audio/cmp3/files/patch-aa
+++ b/audio/cmp3/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.orig Fri Mar 17 10:35:33 2000
-+++ Makefile Fri Jan 12 03:02:20 2001
-@@ -3,22 +3,22 @@
- #
+--- Makefile.in.orig Sun Jul 29 14:43:49 2001
++++ Makefile.in Thu Mar 18 22:27:35 2004
+@@ -5,19 +5,19 @@
# initial_directory is now set in the config file
mpg123_location := "mpg123"
+ ogg123_location := "ogg123"
-install_directory := "$(HOME)/bin"
+install_directory := "$(PREFIX)/bin"
@@ -21,29 +21,14 @@
-ass_repository := "$(HOME)/.cmp3ass"
+#ass_repository := "$(HOME)/.cmp3ass"
- ## Define this for bufferring or add other parameters to mpg123
--mpg123_params := -b 320
-+#mpg123_params := -b 320
-
- # You need debugging info? Uncomment this and check /tmp/cmp3log
- #debugging := 1
-@@ -38,8 +38,8 @@
+ ## Define this for bufferring or add other parameters to mpg123 and ogg123
+ mpg123_params := -b 320
+@@ -42,7 +42,7 @@
# stands. Change the code to do something else you want it to do...
#PARAMS +=-DMY_CD
LIBS= -lform -lncurses
-CFLAGS= -g -O -Inevlib
--CC= gcc
-+CFLAGS+= -Inevlib
-+CC?= gcc
++CFLAGS= @CFLAGS@ -Inevlib
+ CC= @CC@
OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
- cmp3general.o cmp3id3.o
-@@ -78,7 +78,7 @@
- $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3
-
- 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
deleted file mode 100644
index 603d1f38e017..000000000000
--- a/audio/cmp3/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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"
diff --git a/audio/cmp3/files/patch-cmp3volume.c b/audio/cmp3/files/patch-cmp3volume.c
new file mode 100644
index 000000000000..7bc9af0d5967
--- /dev/null
+++ b/audio/cmp3/files/patch-cmp3volume.c
@@ -0,0 +1,14 @@
+--- cmp3volume.c.orig Sun Jul 1 13:38:08 2001
++++ cmp3volume.c Sat Mar 20 00:23:51 2004
+@@ -3,11 +3,7 @@
+ */
+
+ #include "cmp3funcs.h"
+-#if defined(__FreeBSD__)
+-#include <machine/soundcard.h>
+-#else
+ #include<sys/soundcard.h>
+-#endif
+
+ static int mixernum, /* ID number for the mixer */
+ vol; /* Current volume level */
diff --git a/audio/cmp3/files/patch-nevlib::Makefile.in b/audio/cmp3/files/patch-nevlib::Makefile.in
new file mode 100644
index 000000000000..81044fa48285
--- /dev/null
+++ b/audio/cmp3/files/patch-nevlib::Makefile.in
@@ -0,0 +1,10 @@
+--- nevlib/Makefile.in.orig Sun Jul 29 14:09:13 2001
++++ nevlib/Makefile.in Thu Mar 18 22:26:26 2004
+@@ -1,6 +1,6 @@
+ CC = @CC@
+
+-CFLAGS = -Wall -ansi -O2 -g
++CFLAGS = @CFLAGS@
+
+ FILES=llist.o inifile.o
+ LIBNAME=libnev.a
diff --git a/audio/cmp3/pkg-descr b/audio/cmp3/pkg-descr
index 28cce1683783..1afabdeb01b9 100644
--- a/audio/cmp3/pkg-descr
+++ b/audio/cmp3/pkg-descr
@@ -2,4 +2,4 @@ A simple yet featureful ncurses frontend to mpg123. Includes
playlist support, volume control and tools to help with file
management. The author is Neville Kadwa <pandama@psu.edu>.
-WWW: http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
+WWW: http://cmp3.sourceforge.net/
diff --git a/audio/cmp3/pkg-plist b/audio/cmp3/pkg-plist
deleted file mode 100644
index 923cbdc24d4c..000000000000
--- a/audio/cmp3/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/cmp3
-bin/rnmp3
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/sample.cmp3rc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%