From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 20 16:00:05 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 209441065693 for ; Sun, 20 Sep 2009 16:00:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id ECBF88FC1C for ; Sun, 20 Sep 2009 16:00:04 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8KG04Li042096 for ; Sun, 20 Sep 2009 16:00:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8KG04gb042095; Sun, 20 Sep 2009 16:00:04 GMT (envelope-from gnats) Resent-Date: Sun, 20 Sep 2009 16:00:04 GMT Resent-Message-Id: <200909201600.n8KG04gb042095@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sylvio Cesar Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 511A51065676 for ; Sun, 20 Sep 2009 15:50:50 +0000 (UTC) (envelope-from scjamorim@bsd.com.br) Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.246]) by mx1.freebsd.org (Postfix) with ESMTP id 0982F8FC15 for ; Sun, 20 Sep 2009 15:50:49 +0000 (UTC) Received: by an-out-0708.google.com with SMTP id d14so1023648and.13 for ; Sun, 20 Sep 2009 08:50:49 -0700 (PDT) Received: by 10.101.27.20 with SMTP id e20mr3417951anj.137.1253461849332; Sun, 20 Sep 2009 08:50:49 -0700 (PDT) Received: from fbsd9.scjamorim.org (201.22.150.35.dynamic.adsl.gvt.net.br [201.22.150.35]) by mx.google.com with ESMTPS id b7sm1455458ana.16.2009.09.20.08.50.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 20 Sep 2009 08:50:48 -0700 (PDT) Received: by fbsd9.scjamorim.org (Postfix, from userid 0) id 5DCF64DA20F; Sun, 20 Sep 2009 12:50:45 -0300 (BRT) Message-Id: <20090920155045.5DCF64DA20F@fbsd9.scjamorim.org> Date: Sun, 20 Sep 2009 12:50:45 -0300 (BRT) From: Sylvio Cesar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/138993: [PATCH] audio/cmp3: Changed Makefile. Take maintainership. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Sep 2009 16:00:05 -0000 >Number: 138993 >Category: ports >Synopsis: [PATCH] audio/cmp3: Changed Makefile. Take maintainership. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Sep 20 16:00:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sylvio Cesar >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: System: FreeBSD fbsd9.scjamorim.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Sep 14 01:24:51 BRT 2009 >Description: - Rename old patch files to the form correct - Removed lines "do-install" and "CP" of Makefile - Removed "/" in the end of line "${WRKSRC}" - Added "post-install" and changed form how to install of docs - Changed patch file Makefile.in to copy file cmp3rc to sample.cmp3rc - Take maintainership. Added file(s): - files/patch-cmp3main.c - files/patch-nevlib_Makefile.in Removed file(s): - files/patch-ae - files/patch-nevlib::Makefile.in You can see the log in my tinderbox: AMD64 http://www.scjamorim.org/Home/cmp3-2.0.p6_1-8amd64.log i386 http://www.scjamorim.org/Home/cmp3-2.0.p6_1-8i386.log Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- cmp3-2.0.p6_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/audio/cmp3/Makefile,v retrieving revision 1.23 diff -u -u -r1.23 Makefile --- Makefile 22 Aug 2009 00:13:02 -0000 1.23 +++ Makefile 20 Sep 2009 15:42:45 -0000 @@ -12,12 +12,12 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.0-pre6 DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= scjamorim@bsd.com.br COMMENT= An ncurses based frontend to mpg123 RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -WRKSRC= ${WRKDIR}/${PORTNAME}-kenrevs/ +WRKSRC= ${WRKDIR}/${PORTNAME}-kenrevs USE_GMAKE= yes GNU_CONFIGURE= yes @@ -29,13 +29,12 @@ RUN_DEPENDS+= ogg123:${PORTSDIR}/audio/vorbis-tools .endif -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/cmp3rc ${DOCSDIR}/sample.cmp3rc +.for docs in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} +.endfor .endif .include Index: files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/audio/cmp3/files/patch-Makefile.in,v retrieving revision 1.1 diff -u -u -r1.1 patch-Makefile.in --- files/patch-Makefile.in 19 Mar 2004 19:19:36 -0000 1.1 +++ files/patch-Makefile.in 20 Sep 2009 15:42:45 -0000 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sun Jul 29 14:43:49 2001 -+++ Makefile.in Thu Mar 18 22:27:35 2004 +--- Makefile.in.orig 2001-07-29 02:43:49.000000000 -0300 ++++ Makefile.in 2009-09-20 11:17:07.000000000 -0300 @@ -5,19 +5,19 @@ # initial_directory is now set in the config file mpg123_location := "mpg123" @@ -32,3 +32,12 @@ CC= @CC@ OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \ +@@ -103,7 +103,7 @@ + install: rnmp3 cmp3 + install -c -s cmp3 $(install_directory)/cmp3 + install -c -s rnmp3 $(install_directory)/rnmp3 +- cp -i cmp3rc $(config_file) ++ cp -i cmp3rc sample.cmp3rc + ifdef ass_repository + @if [ ! -x $(ass_repository) ]; then mkdir $(ass_repository); \ + echo mkdir $(ass_repository); fi; Index: files/patch-ae =================================================================== RCS file: files/patch-ae diff -N files/patch-ae --- files/patch-ae 16 Jan 2001 15:13:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ ---- cmp3main.c.orig Fri Mar 17 08:40:00 2000 -+++ cmp3main.c Fri Jan 12 02:16:41 2001 -@@ -33,13 +33,18 @@ - int lastleftline = 0; - int lastrightline = 0; - char *init_dir = NULL; -+ char *home_dir = NULL; -+ char cmp3_config[4096]; - - if (argc > 1) - docmdline(argc, argv); - shm_init(); - - cmp3rc = ini_create(); -- if (ini_load(cmp3rc, CMP3_CONFIG) == INI_FAIL) -+ home_dir = getenv("HOME"); -+ strcpy (cmp3_config, home_dir); -+ strcat (cmp3_config, "/.cmp3rc"); -+ if (ini_load(cmp3rc, cmp3_config) == INI_FAIL) - { - ini_destroy(cmp3rc); - cmp3rc = NULL; Index: files/patch-cmp3main.c =================================================================== RCS file: files/patch-cmp3main.c diff -N files/patch-cmp3main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cmp3main.c 20 Sep 2009 15:42:46 -0000 @@ -0,0 +1,22 @@ +--- cmp3main.c.orig 2001-07-07 16:17:23.000000000 -0300 ++++ cmp3main.c 2009-09-20 11:11:06.000000000 -0300 +@@ -33,13 +33,18 @@ + int lastleftline = 0; + int lastrightline = 0; + char *init_dir = NULL; ++ char *home_dir = NULL; ++ char cmp3_config[4096]; + + if (argc > 1) + docmdline(argc, argv); + shm_init(); + + cmp3rc = ini_create(); +- if (ini_load(cmp3rc, CMP3_CONFIG) == INI_FAIL) ++ home_dir = getenv("HOME"); ++ strcpy (cmp3_config, home_dir); ++ strcat (cmp3_config, "/.cmp3rc"); ++ if (ini_load(cmp3rc, cmp3_config) == INI_FAIL) + { + ini_destroy(cmp3rc); + cmp3rc = NULL; Index: files/patch-nevlib::Makefile.in =================================================================== RCS file: files/patch-nevlib::Makefile.in diff -N files/patch-nevlib::Makefile.in --- files/patch-nevlib::Makefile.in 19 Mar 2004 19:19:36 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- 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 Index: files/patch-nevlib_Makefile.in =================================================================== RCS file: files/patch-nevlib_Makefile.in diff -N files/patch-nevlib_Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-nevlib_Makefile.in 20 Sep 2009 15:42:46 -0000 @@ -0,0 +1,10 @@ +--- nevlib/Makefile.in.orig 2001-07-29 02:09:13.000000000 -0300 ++++ nevlib/Makefile.in 2009-09-20 11:11:06.000000000 -0300 +@@ -1,6 +1,6 @@ + CC = @CC@ + +-CFLAGS = -Wall -ansi -O2 -g ++CFLAGS = @CFLAGS@ + + FILES=llist.o inifile.o + LIBNAME=libnev.a --- cmp3-2.0.p6_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: