diff options
| -rw-r--r-- | sysutils/cdrtools-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cdrtools-devel/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/cdrtools-devel/files/patch-ad | 25 |
3 files changed, 17 insertions, 14 deletions
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile index 09c00723a17c..1debf6eb3ec6 100644 --- a/sysutils/cdrtools-devel/Makefile +++ b/sysutils/cdrtools-devel/Makefile @@ -18,7 +18,7 @@ ########################################################################### PORTNAME= cdrtools -PORTVERSION= 3.01a11 +PORTVERSION= 3.01a12 PORTEPOCH= 1 CATEGORIES= sysutils audio MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/ \ diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo index 50968174cb32..05b0b486c165 100644 --- a/sysutils/cdrtools-devel/distinfo +++ b/sysutils/cdrtools-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (cdrtools-3.01a11.tar.bz2) = c94d974a78d88ab77e524d3d748ef2047273f1b303baae99508cf8deaf337dfd -SIZE (cdrtools-3.01a11.tar.bz2) = 2050612 +SHA256 (cdrtools-3.01a12.tar.bz2) = 6b2bc91b4dd3bb5dc0ff10a3a858f68edff5a230500f40496ffbce406e7dfff8 +SIZE (cdrtools-3.01a12.tar.bz2) = 2050364 diff --git a/sysutils/cdrtools-devel/files/patch-ad b/sysutils/cdrtools-devel/files/patch-ad index f3466a277671..a0ca40c6d9b0 100644 --- a/sysutils/cdrtools-devel/files/patch-ad +++ b/sysutils/cdrtools-devel/files/patch-ad @@ -25,7 +25,7 @@ -C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) +XCFLAGS:= $(CFLAGS) +CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) COPTS= @@ -42,28 +42,31 @@ C++OPTDYN= -fpic C++OPTGPROF= -pg -@@ -54,16 +53,15 @@ +@@ -54,18 +53,17 @@ FLOAT_OPTIONS= -CC_COM= gcc +-CC++_COM= g++ ++CC_COM= $(CC) ++CC++_COM= $(CXX) + -CC= @echo " ==> COMPILING \"$@\""; $(CC_COM) --CC++ = @echo " ==> COMPILING \"$@\""; g++ +-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) -LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) --LDCC++ = @echo " ==> LINKING \"$@\""; g++ +-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) -DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ -+CC_COM= $(CC) -+CC++ = $(CXX) +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) ++CC++ = $(CC++_COM) +LDCC= $(CC_COM) -+LDCC++ = $(CXX) ++LDCC++ = $(CC++_COM) +DYNLD= $(CC_COM) -+DYNLDC++ = $(CXX) ++DYNLDC++ = $(CC++_COM) RMDEP= : -MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M +MKDEP= $(CC_COM) -M MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M -+MKC++DEP= $(CXX) -M +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M ++MKC++DEP= $(CC++_COM) -M MKC++DEP_OUT= |