From owner-svn-ports-head@freebsd.org Tue Dec 29 00:33:02 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED4FCA53EF5; Tue, 29 Dec 2015 00:33:01 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC729174D; Tue, 29 Dec 2015 00:33:01 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBT0X0BA007119; Tue, 29 Dec 2015 00:33:00 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBT0X0ik007112; Tue, 29 Dec 2015 00:33:00 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201512290033.tBT0X0ik007112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Tue, 29 Dec 2015 00:33:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404710 - in head/sysutils/cdrtools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2015 00:33:02 -0000 Author: marius Date: Tue Dec 29 00:33:00 2015 New Revision: 404710 URL: https://svnweb.freebsd.org/changeset/ports/404710 Log: - Update to 3.01 - Fix build when `uname -m` != `uname -p` [1] PR: 191424, 197794 [1] Added: head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd - copied unchanged from r404695, head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd Modified: head/sysutils/cdrtools/Makefile head/sysutils/cdrtools/distinfo head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul head/sysutils/cdrtools/files/patch-include__schily__sha2.h head/sysutils/cdrtools/files/patch-readcd__readcd.1 head/sysutils/cdrtools/pkg-descr Modified: head/sysutils/cdrtools/Makefile ============================================================================== --- head/sysutils/cdrtools/Makefile Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/Makefile Tue Dec 29 00:33:00 2015 (r404710) @@ -19,8 +19,7 @@ ########################################################################### PORTNAME= cdrtools -PORTVERSION= 3.00 -PORTREVISION= 2 +PORTVERSION= 3.01 CATEGORIES= sysutils audio MASTER_SITES= SF/${PORTNAME} @@ -85,11 +84,12 @@ PLIST_SUB+= RSCSI="@comment " MAKE_ENV= CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \ INS_RBASE=${LOCALBASE} -CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc/}-${OPSYS:tl}-cc +CDRTLSTARGET= ${ARCH}-${OPSYS:tl}-cc +CDRTLSXARCH!= ${UNAME} -m .if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \ exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS} -MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include +MAKE_ENV+= DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib USES+= gettext iconv .endif @@ -99,9 +99,9 @@ post-extract: @${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j} .endfor .endfor -.if ${CDRTLSTARGET} != "i386-freebsd-cc" +.if ${CDRTLSXARCH} != "i386" @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${CDRTLSTARGET}.rul + ${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul .endif post-patch: @@ -109,14 +109,11 @@ post-patch: .if !${PORT_OPTIONS:MRSCSI} @${RM} ${WRKSRC}/TARGETS/55rscsi .endif - @${REINPLACE_CMD} -e 's|\/opt\/schily\/bin\/|${PREFIX}\/etc\/|g' \ - ${WRKSRC}/cdda2wav/cdda2ogg.1 -.for i in DEFAULTS/Defaults.freebsd btcflash/btcflash.1 cdda2wav/cdda2mp3 \ - cdda2wav/cdda2ogg cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 \ - cdrecord/README.rscsi cdrecord/cdrecord.1 cdrecord/cdrecord.dfl \ - include/schily/deflts.h libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c \ - readcd/readcd.1 rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl \ - scgcheck/scgcheck.1 +.for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \ + cdda2wav/cdda2ogg.1 cdda2wav/cdda2wav.1 cdrecord/README.rscsi \ + cdrecord/cdrecord.1 cdrecord/cdrecord.dfl include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c librscg/scsi-remote.c readcd/readcd.1 \ + rscsi/rscsi.1 rscsi/rscsi.c rscsi/rscsi.dfl scgcheck/scgcheck.1 @${REINPLACE_CMD} -e 's|\/opt\/schily|${PREFIX}|g; \ s|\/usr\/local|${PREFIX}|g; s|\/etc\/default|${PREFIX}\/etc|g; \ s|\/var\/adm\/messages|\/var\/run\/dmesg.boot|g; \ Modified: head/sysutils/cdrtools/distinfo ============================================================================== --- head/sysutils/cdrtools/distinfo Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/distinfo Tue Dec 29 00:33:00 2015 (r404710) @@ -1,2 +1,2 @@ -SHA256 (cdrtools-3.00.tar.bz2) = 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d -SIZE (cdrtools-3.00.tar.bz2) = 1978563 +SHA256 (cdrtools-3.01.tar.bz2) = ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f +SIZE (cdrtools-3.01.tar.bz2) = 2087416 Copied: head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd (from r404695, head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-DEFAULTS__Defaults.freebsd Tue Dec 29 00:33:00 2015 (r404710, copy of r404695, head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 ++++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 +@@ -29,8 +29,8 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-DEFOSINCDIRS= /usr/local/include +-LDPATH= -L/opt/schily/lib -L/usr/local/lib ++#DEFOSINCDIRS= /usr/local/include ++#LDPATH= -L/opt/schily/lib -L/usr/local/lib + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work + + ########################################################################### Modified: head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul ============================================================================== --- head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul Tue Dec 29 00:33:00 2015 (r404710) @@ -17,52 +17,72 @@ --- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 +++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -20,8 +20,9 @@ - ########################################################################### +@@ -24,11 +24,12 @@ + GCC_OPT= + GCC_OPT32= -m32 + GCC_OPT64= -m64 +-GCC_OPTXX= $(GCC_OPT$(C_ARCH:gcc%=%)) ++GCC_OPTXX= - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) -CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) -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= -@@ -29,12 +30,10 @@ + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) + COPTS= $(GCC_OPTXX) +@@ -36,12 +37,10 @@ CWOPTS= -Wall -Wtraditional CWOPTS= -Wall -Wno-unknown-pragmas \ -Wshadow -Wmissing-prototypes -Wstrict-prototypes -COPTOPT= -O COPTDYN= -fpic COPTGPROF= -pg - C++OPTS= + C++OPTS= $(GCC_OPTXX) C++WOPTS= $(CWOPTS) -C++OPTOPT= $(COPTOPT) C++OPTDYN= -fpic C++OPTGPROF= -pg -@@ -54,15 +53,15 @@ +@@ -61,28 +60,18 @@ FLOAT_OPTIONS= --CC= @echo " ==> COMPILING \"$@\""; gcc --CC++ = @echo " ==> COMPILING \"$@\""; g++ --LDCC= @echo " ==> LINKING \"$@\""; gcc --LDCC++ = @echo " ==> LINKING \"$@\""; g++ --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ +-__CC_COM= $(_UNIQ)$(CC) +-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) +-CC_COM= $(___CC_COM:$(_UNIQ)%=%) +- +-__CC++_COM= $(_UNIQ)$(CCC) +-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) +-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) +- +-CC_COM_DEF= gcc +-CC++_COM_DEF= g++ +-CC= $(CC_COM_DEF) +-CCC= $(CC++_COM_DEF) +- +-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX) +-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX) +-LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX) +-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX) +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX) +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX) +CC_COM= $(CC) -+CC++ = $(CXX) -+LDCC= $(CC) -+LDCC++ = $(CXX) -+DYNLD= $(CC) -+DYNLDC++ = $(CXX) ++CC++_COM= $(CXX) ++ ++CCCC = $(CC_COM) ++CC++ = $(CC++_COM) ++LDCC= $(CC_COM) ++LDCC++ = $(CC++_COM) ++DYNLD= $(CC_COM) ++DYNLDC++ = $(CC++_COM) RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CC) -M +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -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) $(GCC_OPTXX) -M ++MKC++DEP= $(CC++_COM) -M MKC++DEP_OUT= Modified: head/sysutils/cdrtools/files/patch-include__schily__sha2.h ============================================================================== --- head/sysutils/cdrtools/files/patch-include__schily__sha2.h Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/files/patch-include__schily__sha2.h Tue Dec 29 00:33:00 2015 (r404710) @@ -1,14 +1,15 @@ --- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 +++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 -@@ -102,9 +102,11 @@ +@@ -104,10 +104,12 @@ #ifdef HAVE_LONGLONG extern void SHA384Init __PR((SHA2_CTX *)); +#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Transform __PR((UInt64_t state[8], + const UInt8_t [SHA384_BLOCK_LENGTH])); extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); extern void SHA384Pad __PR((SHA2_CTX *)); +#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)); + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], + SHA2_CTX *)); extern char *SHA384End __PR((SHA2_CTX *, char *)); - extern char *SHA384File __PR((const char *, char *)); Modified: head/sysutils/cdrtools/files/patch-readcd__readcd.1 ============================================================================== --- head/sysutils/cdrtools/files/patch-readcd__readcd.1 Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/files/patch-readcd__readcd.1 Tue Dec 29 00:33:00 2015 (r404710) @@ -17,14 +17,12 @@ --- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 +++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 -@@ -432,9 +432,7 @@ - .SH FILES +@@ -604,8 +604,6 @@ .SH SEE ALSO .BR cdrecord (1), --.BR mkisofs (1), + .BR mkisofs (8), -.BR scg (7), -.BR fbk (7), -+.BR mkisofs (8), .BR rcmd (3), .BR ssh (1). Modified: head/sysutils/cdrtools/pkg-descr ============================================================================== --- head/sysutils/cdrtools/pkg-descr Mon Dec 28 23:34:01 2015 (r404709) +++ head/sysutils/cdrtools/pkg-descr Tue Dec 29 00:33:00 2015 (r404710) @@ -19,4 +19,4 @@ This package contains the following prog - scgcheck (checks and validates the ABI of libscg) - rscsi (daemon providing access to local SCSI-devices over the network) -WWW: http://cdrecord.berlios.de/old/private/cdrecord.html +WWW: http://cdrecord.org/