Attachment 12284 Details for Bug 23828 – file.diff

[patch] file.diff

file.diff (text/plain), 4.42 KB, created by tkato on 2000-12-25 15:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-12-25 15:10:00 UTC

Size: 4.42 KB

patch

obsolete

>diff -urN /usr/ports/audio/cmp3/Makefile audio/cmp3/Makefile
>--- /usr/ports/audio/cmp3/Makefile	Fri Aug 25 19:06:36 2000
>+++ audio/cmp3/Makefile	Sat Dec 23 10:28:25 2000
>@@ -1,23 +1,31 @@
>-# New ports collection makefile for:   cmp3
>-# Date created:        10 April 1999
>-# Whom:                Chris Piazza <cpiazza@FreeBSD.org>
>+# New ports collection makefile for:	cmp3
>+# Date created:		10 April 1999
>+# Whom:			Chris Piazza <cpiazza@FreeBSD.org>
> #
> # $FreeBSD: ports/audio/cmp3/Makefile,v 1.10 2000/08/23 21:42:39 cpiazza Exp $
> #
> 
> PORTNAME=	cmp3
>-PORTVERSION=	2.0.p4
>+PORTVERSION=	2.0.p5
> CATEGORIES=	audio
> MASTER_SITES=	http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
>-DISTNAME=	cmp3-2.0pre4
>+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
> 
> MAINTAINER= 	ports@FreeBSD.org
> 
> RUN_DEPENDS= 	mpg123:${PORTSDIR}/audio/mpg123
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+
> USE_GMAKE=	yes
> 
>-WRKSRC=		${WRKDIR}/cmp3
>-PKGMESSAGE=	${WRKSRC}/MESSAGE
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${PREFIX}/share/doc/cmp3
>+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
>+	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/audio/cmp3/distinfo audio/cmp3/distinfo
>--- /usr/ports/audio/cmp3/distinfo	Wed Mar  8 09:18:33 2000
>+++ audio/cmp3/distinfo	Sat Dec  9 08:41:31 2000
>@@ -1 +1 @@
>-MD5 (cmp3-2.0pre4.tar.gz) = 8d13ba6fa3e0b7b903b4d5fa122a94ab
>+MD5 (cmp3-2.0pre5.tar.gz) = 830b2bcf3c7d7daba67bf8752ddb102b
>diff -urN /usr/ports/audio/cmp3/files/patch-aa audio/cmp3/files/patch-aa
>--- /usr/ports/audio/cmp3/files/patch-aa	Wed Mar  8 09:18:34 2000
>+++ audio/cmp3/files/patch-aa	Sat Dec 23 10:34:27 2000
>@@ -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 -urN /usr/ports/audio/cmp3/files/patch-ab audio/cmp3/files/patch-ab
>--- /usr/ports/audio/cmp3/files/patch-ab	Wed Mar  8 09:18:34 2000
>+++ audio/cmp3/files/patch-ab	Sat Dec 23 09:46:25 2000
>@@ -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"
>diff -urN /usr/ports/audio/cmp3/pkg-plist audio/cmp3/pkg-plist
>--- /usr/ports/audio/cmp3/pkg-plist	Wed Mar  8 09:18:36 2000
>+++ audio/cmp3/pkg-plist	Sat Dec 23 10:28:34 2000
>@@ -1,2 +1,5 @@
> bin/cmp3
> bin/rnmp3
>+share/doc/cmp3/README
>+share/doc/cmp3/sample.cmp3rc
>+@dirrm share/doc/cmp3

Actions: View | Diff

Attachments on bug 23828: 12284