Index: head/audio/cmp3/files/patch-Makefile.in =================================================================== --- head/audio/cmp3/files/patch-Makefile.in (revision 408390) +++ head/audio/cmp3/files/patch-Makefile.in (revision 408391) @@ -1,52 +1,61 @@ ---- Makefile.in.orig 2001-07-29 07:43:49.000000000 +0200 -+++ Makefile.in 2014-05-08 00:46:44.189113048 +0200 +--- Makefile.in.orig 2001-07-29 05:43:49 UTC ++++ Makefile.in @@ -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" # # 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" ## Define this for bufferring or add other parameters to mpg123 and ogg123 mpg123_params := -b 320 -@@ -35,14 +35,14 @@ +@@ -35,14 +35,14 @@ ogg123_params := -d oss VERSION="2.0pre6" WKGDIR=cmp3-kenrevs -PARAMS= -DCMP3_VER="\$(VERSION)\" -DEXEC_LOC="\$(mpg123_location)\" \ - -DCMP3_CONFIG="\$(config_file)\" -DOGG_LOC="\$(ogg123_location)\" +PARAMS= -DCMP3_VER=\"$(VERSION)\" -DEXEC_LOC=\"$(mpg123_location)\" \ + -DCMP3_CONFIG=\"$(config_file)\" -DOGG_LOC=\"$(ogg123_location)\" RNMP3PARAMS= -DVERSION="\$(VERSION)\" # Something for me and my cd changer, you definately don't want it as it # stands. Change the code to do something else you want it to do... #PARAMS +=-DMY_CD LIBS= -lform -lncurses -CFLAGS= -g -O -Inevlib +CFLAGS= @CFLAGS@ -Inevlib 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 @@ +@@ -83,7 +83,7 @@ shmdump: cmp3shmdump.c + $(CC) $(CFLAGS) cmp3shmdump.c -o cmp3shmdump + + cmp3: lib $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3 ++ $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LDFLAGS) $(LIBS) -o cmp3 + + lib: + @$(MAKE) -C nevlib lib +@@ -103,7 +103,7 @@ tar: distclean 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: head/audio/cmp3/files/patch-cmp3.h =================================================================== --- head/audio/cmp3/files/patch-cmp3.h (nonexistent) +++ head/audio/cmp3/files/patch-cmp3.h (revision 408391) @@ -0,0 +1,11 @@ +--- cmp3.h.orig 2001-07-01 06:38:08.000000000 +0200 ++++ cmp3.h +@@ -1,7 +1,7 @@ + #ifndef _CMP3_H + #define _CMP3_H + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include + #include + #else Property changes on: head/audio/cmp3/files/patch-cmp3.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property