Attachment #12655 for bug #24352

View | Details | Raw Unified | Return to bug 24352
Collapse All | Expand All

Lines 7-12 Link Here

(-)audio/cmp3/Makefile (+1 lines)
7		7
8	PORTNAME= cmp3	8	PORTNAME= cmp3
9	PORTVERSION= 2.0.p5	9	PORTVERSION= 2.0.p5
		10	PORTREVISION= 1
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= http://www.personal.psu.edu/users/n/k/nkk104/cmp3/	12	MASTER_SITES= http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}

Lines 1-6 Link Here

(-)audio/cmp3/files/patch-aa (-5 / +9 lines)
1	--- Makefile.orig Fri Mar 17 10:35:33 2000	1	--- Makefile.orig Fri Mar 17 10:35:33 2000
2	+++ Makefile Sat Dec 23 10:34:05 2000	2	+++ Makefile Fri Jan 12 03:02:20 2001
3	@@ -3,19 +3,19 @@	3	@@ -3,22 +3,22 @@
4	#	4	#
5	# initial_directory is now set in the config file	5	# initial_directory is now set in the config file
6	mpg123_location := "mpg123"	6	mpg123_location := "mpg123"
Lines 11-17 Link Here
11	# Location of config file - Please edit this file before installing	11	# Location of config file - Please edit this file before installing
12	#	12	#
13	-config_file := "$(HOME)/.cmp3rc"	13	-config_file := "$(HOME)/.cmp3rc"
14	+config_file := "$$\(HOME)/.cmp3rc"	14	+#config_file := "$(HOME)/.cmp3rc"
15		15
16	#	16	#
17	# Uncomment and set if desired	17	# Uncomment and set if desired
Lines 19-28 Link Here
19		19
20	## An ass repository is a nice thing to have. See README	20	## An ass repository is a nice thing to have. See README
21	-ass_repository := "$(HOME)/.cmp3ass"	21	-ass_repository := "$(HOME)/.cmp3ass"
22	+ass_repository := "$$\(HOME)/.cmp3ass"	22	+#ass_repository := "$(HOME)/.cmp3ass"
23		23
24	## Define this for bufferring or add other parameters to mpg123	24	## Define this for bufferring or add other parameters to mpg123
25	mpg123_params := -b 320	25	-mpg123_params := -b 320
		26	+#mpg123_params := -b 320
		27
		28	# You need debugging info? Uncomment this and check /tmp/cmp3log
		29	#debugging := 1
26	@@ -38,8 +38,8 @@	30	@@ -38,8 +38,8 @@
27	# stands. Change the code to do something else you want it to do...	31	# stands. Change the code to do something else you want it to do...
28	#PARAMS +=-DMY_CD	32	#PARAMS +=-DMY_CD




--- 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;

Return to bug 24352

Line 0 Link Here

(-)audio/cmp3/files/patch-ae (+22 lines)
	1	--- cmp3main.c.orig Fri Mar 17 08:40:00 2000
	2	+++ cmp3main.c Fri Jan 12 02:16:41 2001
	3	@@ -33,13 +33,18 @@
	4	int lastleftline = 0;
	5	int lastrightline = 0;
	6	char *init_dir = NULL;
	7	+ char *home_dir = NULL;
	8	+ char cmp3_config[4096];
	9
	10	if (argc > 1)
	11	docmdline(argc, argv);
	12	shm_init();
	13
	14	cmp3rc = ini_create();
	15	- if (ini_load(cmp3rc, CMP3_CONFIG) == INI_FAIL)
	16	+ home_dir = getenv("HOME");
	17	+ strcpy (cmp3_config, home_dir);
	18	+ strcat (cmp3_config, "/.cmp3rc");
	19	+ if (ini_load(cmp3rc, cmp3_config) == INI_FAIL)
	20	{
	21	ini_destroy(cmp3rc);
	22	cmp3rc = NULL;