Index: head/sysutils/cdrdao/Makefile =================================================================== --- head/sysutils/cdrdao/Makefile (revision 472344) +++ head/sysutils/cdrdao/Makefile (revision 472345) @@ -1,178 +1,168 @@ # Created by: futatuki # $FreeBSD$ PORTNAME?= cdrdao -PORTVERSION= 1.2.3 -PORTREVISION?= 5 +PORTVERSION= 1.2.4 +PORTREVISION?= 0 CATEGORIES= sysutils audio -MASTER_SITES= SF/cdrdao/cdrdao/${PORTVERSION} +MASTER_SITES= SF/cdrdao DISTNAME= cdrdao-${PORTVERSION} MAINTAINER= marius@FreeBSD.org COMMENT?= Record CD-R[W]s in disk-at-once mode LICENSE= GPLv2 USES= alias compiler:c++11-lang gmake tar:bzip2 GNU_CONFIGURE= yes USE_CXXSTD= c++11 MP3OGG_LIB_DEPENDS= libao.so:audio/libao \ libmad.so:audio/libmad \ libvorbis.so:audio/libvorbis .if ${PORTNAME} == "cdrdao" OPTIONS_DEFINE= DOCS TOC2MP3 MP3OGG OPTIONS_DEFAULT= MP3OGG MP3OGG_DESC= Build with MP3/Ogg support (for sysutils/gcdmaster) TOC2MP3_DESC= Build with toc2mp3 (requires audio/lame) .include .endif .if ${PORTNAME} == "gcdmaster" USES+= pkgconfig shared-mime-info GCONF_SCHEMAS= gcdmaster.schemas LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \ libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 RUN_DEPENDS+= ${LOCALBASE}/bin/cdrdao:sysutils/cdrdao \ ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:misc/shared-mime-info CONFIGURE_ARGS+= --with-lame=no .else -CONFIGURE_ARGS+= --with-xdao=no +CONFIGURE_ARGS+= --with-gcdmaster=no .if ${PORT_OPTIONS:MTOC2MP3} LIB_DEPENDS+= libmp3lame.so:audio/lame -CONFIGURE_ARGS+= --with-lame-include=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --disable-lame-test \ + --with-lame-include=${LOCALBASE}/include \ --with-lame-lib=${LOCALBASE}/lib PLIST_SUB+= TOC2MP3="" .else CONFIGURE_ARGS+= --with-lame=no PLIST_SUB+= TOC2MP3="@comment " .endif .if ${PORT_OPTIONS:MMP3OGG} USES+= pkgconfig LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} CONFIGURE_ENV+= AO_CFLAGS=-I${LOCALBASE}/include \ AO_LIBS="-L${LOCALBASE}/lib -lao" \ MAD_CFLAGS=-I${LOCALBASE}/include \ MAD_LIBS="-L${LOCALBASE}/lib -lmad" \ VORBISFILE_CFLAGS=-I${LOCALBASE}/include \ VORBISFILE_LIBS="-L${LOCALBASE}/lib -lvorbisfile" .else CONFIGURE_ARGS+= --with-mp3-support=no --with-ogg-support=no .endif .endif .include CONFIGURE_ARGS+= --without-pcctsbin --without-pcctsinc \ --with-posix-threads=no --with-scglib MAKE_ENV= CCOM=cc SCSILIBXARCH!= ${UNAME} -m post-extract: - @(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-dragonfly.id) + @(cd ${WRKSRC}/scsilib/RULES && ${CP} -p os-freebsd.id os-dragonfly.id) .if ${SCSILIBXARCH} != "i386" @${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \ ${WRKSRC}/scsilib/RULES/${SCSILIBXARCH}-${OPSYS:tl}-cc.rul .endif post-patch: .for i in 45libdeflt 45libedc 45libfile 45libhfs_iso 45libparanoia 45libunls \ 45librscg 55cdda2wav 55cdrecord 55cmd 55mkisofs 55mkisofs!@!diag \ 55readcd 55scgcheck 55scgskeleton 55rscsi 85man @${RM} ${WRKSRC}/scsilib/TARGETS/${i} .endfor - @${REINPLACE_CMD} -e 's|"$$ac_declaration"|"$$ac_declarationXXX"|g' \ - ${WRKSRC}/configure -.for i in include/schily.h libscg/scsitransp.c libschily/fexec.c \ - libschily/stdio/fgetline.c - @${REINPLACE_CMD} -E -e 's|fexecve|js_fexecve|g; \ - s|^getline|js_getline|g;s|([^f_])getline|\1js_getline|g' \ - ${WRKSRC}/scsilib/${i} -.endfor .if ${PORTNAME} == "gcdmaster" - @${REINPLACE_CMD} -E -e 's|(sigc\+\+/)object.h|\1trackable.h|g' \ - ${WRKSRC}/xdao/CdDevice.h @${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \ - ${WRKSRC}/xdao/Makefile.in - @${REINPLACE_CMD} -E -e 's|[&]?(pixmap_) == 0|!\1|g' \ - ${WRKSRC}/xdao/SampleDisplay.cc + ${WRKSRC}/gcdmaster/Makefile.in @${REINPLACE_CMD} -E -e \ 's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \ - ${WRKSRC}/xdao/Settings.cc + ${WRKSRC}/gcdmaster/Settings.cc @${REINPLACE_CMD} -E -e \ 's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/pixmaps\/document-icons\/\2|g' \ - ${WRKSRC}/xdao/gcdmaster.keys + ${WRKSRC}/gcdmaster/gcdmaster.keys @${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::ptr_fun|g' \ - ${WRKSRC}/xdao/xcdrdao.cc + ${WRKSRC}/gcdmaster/xcdrdao.cc .else .for i in cdrdao.man main.cc @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i} .endfor @${REINPLACE_CMD} -E -e 's|(^CDRDAO_DATA_DIR.+=).+|\1 ${DATADIR}|' \ ${WRKSRC}/dao/Makefile.in .for i in toc2cddb.1 toc2cue.1 @${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i} .endfor .endif .if ${PORTNAME} == "gcdmaster" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \ + ${INSTALL_PROGRAM} ${WRKSRC}/gcdmaster/gcdmaster \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gcdmaster/gcdmaster.man \ ${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1 @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster-doc.png \ ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/application-registry - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.applications \ ${STAGEDIR}${LOCALBASE}/share/application-registry - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.desktop \ ${STAGEDIR}${LOCALBASE}/share/applications @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.keys \ ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.mime \ ${STAGEDIR}${LOCALBASE}/share/mime-info - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.png \ ${STAGEDIR}${LOCALBASE}/share/pixmaps @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.schemas \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.schemas \ ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime/packages - ${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.xml \ ${STAGEDIR}${LOCALBASE}/share/mime/packages @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/Preferences.glade \ ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade \ + ${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/ProjectChooser.glade \ ${STAGEDIR}${DATADIR} .else do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \ ${STAGEDIR}${PREFIX}/man/man1/cdrdao.1 ${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${STAGEDIR}${PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers \ ${STAGEDIR}${DATADIR}/drivers do-install-TOC2MP3-on: ${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in CREDITS ChangeLog README README.PlexDAE ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/sysutils/cdrdao/distinfo =================================================================== --- head/sysutils/cdrdao/distinfo (revision 472344) +++ head/sysutils/cdrdao/distinfo (revision 472345) @@ -1,2 +1,3 @@ -SHA256 (cdrdao-1.2.3.tar.bz2) = 8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e -SIZE (cdrdao-1.2.3.tar.bz2) = 1428695 +TIMESTAMP = 1528148639 +SHA256 (cdrdao-1.2.4.tar.bz2) = 358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4 +SIZE (cdrdao-1.2.4.tar.bz2) = 1442181 Index: head/sysutils/cdrdao/files/patch-dao__main.cc =================================================================== --- head/sysutils/cdrdao/files/patch-dao__main.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-dao__main.cc (nonexistent) @@ -1,15 +0,0 @@ ---- dao/main.cc.orig Sat Dec 28 03:01:20 2002 -+++ dao/main.cc Sat Dec 28 03:04:38 2002 -@@ -2314,11 +2314,7 @@ - - Settings* settings = new Settings; - -- settingsPath = "/etc/cdrdao.conf"; -- if (settings->read(settingsPath) == 0) -- log_message(3, "Read settings from \"%s\".", settingsPath); -- -- settingsPath = "/etc/defaults/cdrdao"; -+ settingsPath = "%%PREFIX%%/etc/cdrdao.conf"; - if (settings->read(settingsPath) == 0) - log_message(3, "Read settings from \"%s\".", settingsPath); - Property changes on: head/sysutils/cdrdao/files/patch-dao__main.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul (revision 472344) +++ head/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul (nonexistent) @@ -1,32 +0,0 @@ ---- scsilib/RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002 -+++ scsilib/RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002 -@@ -24,7 +24,8 @@ - ########################################################################### - - CPPFLAGS= $(CPPOPTS) $(CPPOPTX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) - - CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) - COPTS= -@@ -57,14 +58,14 @@ - - FLOAT_OPTIONS= - --CC= @echo " ==> COMPILING \"$@\""; gcc --LDCC= @echo " ==> LINKING \"$@\""; gcc --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc --RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib -+CCCOM= $(CC) -+LDCC= $(CCCOM) -+DYNLD= $(CCCOM) -+RANLIB= ranlib - ARFLAGS= cr - LORDER= lorder - TSORT= tsort - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CCCOM) -M - MKDEP_OUT= Property changes on: head/sysutils/cdrdao/files/patch-scsilib__RULES__i386-freebsd-cc.rul ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc =================================================================== --- head/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc (nonexistent) @@ -1,10 +0,0 @@ ---- trackdb/FormatOgg.cc.orig 2010-06-06 16:45:05.000000000 +0200 -+++ trackdb/FormatOgg.cc 2010-06-06 16:48:23.000000000 +0200 -@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit - return FS_WRONG_FORMAT; - } - -+ memset(&outFormat_, 0, sizeof(outFormat_)); - outFormat_.bits = 16; - outFormat_.rate = 44100; - outFormat_.channels = 2; Property changes on: head/sysutils/cdrdao/files/patch-trackdb__FormatOgg.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-dao_CdrDriver.cc =================================================================== --- head/sysutils/cdrdao/files/patch-dao_CdrDriver.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-dao_CdrDriver.cc (nonexistent) @@ -1,11 +0,0 @@ ---- dao/CdrDriver.cc.orig 2009-09-12 16:21:25 UTC -+++ dao/CdrDriver.cc -@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12] - 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 - }; - --char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; -+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; - - - /* Maps a string to the corresponding driver option value Property changes on: head/sysutils/cdrdao/files/patch-dao_CdrDriver.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-xdao_CdDevice.cc =================================================================== --- head/sysutils/cdrdao/files/patch-xdao_CdDevice.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-xdao_CdDevice.cc (nonexistent) @@ -1,11 +0,0 @@ ---- xdao/CdDevice.cc.orig 2009-02-21 13:49:17 UTC -+++ xdao/CdDevice.cc -@@ -255,7 +255,7 @@ int CdDevice::updateStatus() - - bool CdDevice::updateProgress(Glib::IOCondition cond, int fd) - { -- static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 }; -+ static unsigned char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 }; - fd_set fds; - int state = 0; - char buf[10]; Property changes on: head/sysutils/cdrdao/files/patch-xdao_CdDevice.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-dao_CdrDriver.h =================================================================== --- head/sysutils/cdrdao/files/patch-dao_CdrDriver.h (revision 472344) +++ head/sysutils/cdrdao/files/patch-dao_CdrDriver.h (nonexistent) @@ -1,11 +0,0 @@ ---- dao/CdrDriver.h.orig 2009-02-21 10:27:31 UTC -+++ dao/CdrDriver.h -@@ -440,7 +440,7 @@ protected: - bool fullBurn_; - - static unsigned char syncPattern[12]; -- static char REMOTE_MSG_SYNC_[4]; -+ static unsigned char REMOTE_MSG_SYNC_[4]; - - static int speed2Mult(int); - static int mult2Speed(int); Property changes on: head/sysutils/cdrdao/files/patch-dao_CdrDriver.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc =================================================================== --- head/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc (nonexistent) @@ -1,10 +0,0 @@ ---- trackdb/FormatMp3.cc.orig 2010-06-06 16:45:00.000000000 +0200 -+++ trackdb/FormatMp3.cc 2010-06-06 16:45:36.000000000 +0200 -@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit - - // Initialize libao for WAV output; - ao_sample_format out_format; -+ memset(&out_format, 0, sizeof(out_format)); - out_format.bits = 16; - out_format.rate = 44100; - out_format.channels = 2; Property changes on: head/sysutils/cdrdao/files/patch-trackdb__FormatMp3.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-dao__cdrdao.man =================================================================== --- head/sysutils/cdrdao/files/patch-dao__cdrdao.man (revision 472344) +++ head/sysutils/cdrdao/files/patch-dao__cdrdao.man (nonexistent) @@ -1,24 +0,0 @@ ---- dao/cdrdao.man.orig Sat Dec 28 03:05:59 2002 -+++ dao/cdrdao.man Sat Dec 28 03:08:17 2002 -@@ -783,13 +783,9 @@ - .I cdrdao - in that order: - --1. /etc/cdrdao.conf -+1. %%PREFIX%%/etc/cdrdao.conf - --2. /etc/defaults/cdrdao -- --3. /etc/default/cdrdao -- --4. $HOME/.cdrdao -+2. $HOME/.cdrdao - - - Command line options will overwrite the loaded settings. -@@ -869,4 +865,4 @@ - .ft R - .fi - .SH SEE ALSO --.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8) -+.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) Property changes on: head/sysutils/cdrdao/files/patch-dao__cdrdao.man ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc =================================================================== --- head/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc (nonexistent) @@ -1,10 +0,0 @@ ---- xdao/SoundIF-ao.cc.orig 2010-06-06 16:37:14.000000000 +0200 -+++ xdao/SoundIF-ao.cc 2010-06-06 16:42:17.000000000 +0200 -@@ -37,6 +37,7 @@ SoundIF::SoundIF() - - impl_ = new SoundIFImpl; - impl_->driverId = ao_default_driver_id(); -+ memset(&impl_->format, 0, sizeof(impl_->format)); - impl_->format.bits = 16; - impl_->format.rate = 44100; - impl_->format.channels = 2; Property changes on: head/sysutils/cdrdao/files/patch-xdao__SoundIF-ao.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc =================================================================== --- head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc (revision 472344) +++ head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc (nonexistent) @@ -1,24 +0,0 @@ ---- utils/toc2mp3.cc.orig 2003-02-22 10:16:56 UTC -+++ utils/toc2mp3.cc -@@ -143,8 +143,8 @@ static void printUsage() - - message(0, "LAME encoder version: %s", get_lame_version()); - message(0, "Supported bit rates: "); -- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { -- message(0, "%d ", bitrate_table[1][i]); -+ for (int br, i = 0; (br = lame_get_bitrate(1, i)) >= 0; i++) { -+ message(0, "%d ", br); - } - message(0, ""); - } -@@ -238,8 +238,8 @@ lame_global_flags *init_encoder(int bitr - lame_global_flags *lf; - int bitrateOk = 0; - -- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { -- if (bitrate == bitrate_table[1][i]) -+ for (int br, i = 0; (br = lame_get_bitrate(1, i)) >= 0 && !bitrateOk; i++) { -+ if (br == bitrate) - bitrateOk = 1; - } - Property changes on: head/sysutils/cdrdao/files/patch-utils_toc2mp3.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrdao/files/patch-dao_cdrdao.man =================================================================== --- head/sysutils/cdrdao/files/patch-dao_cdrdao.man (nonexistent) +++ head/sysutils/cdrdao/files/patch-dao_cdrdao.man (revision 472345) @@ -0,0 +1,24 @@ +--- dao/cdrdao.man.orig 2018-05-16 10:46:39 UTC ++++ dao/cdrdao.man +@@ -798,13 +798,9 @@ following locations. The files will be r + .I cdrdao + in that order: + +-1. /etc/cdrdao.conf +- +-2. /etc/defaults/cdrdao +- +-3. /etc/default/cdrdao ++1. %%PREFIX%%/etc/cdrdao.conf + +-4. $HOME/.cdrdao ++2. $HOME/.cdrdao + + + Command line options will overwrite the loaded settings. +@@ -886,4 +882,4 @@ resources may not be released. Use ipcs( + .ft R + .fi + .SH SEE ALSO +-.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8) ++.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) Property changes on: head/sysutils/cdrdao/files/patch-dao_cdrdao.man ___________________________________________________________________ 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 Index: head/sysutils/cdrdao/files/patch-dao_main.cc =================================================================== --- head/sysutils/cdrdao/files/patch-dao_main.cc (nonexistent) +++ head/sysutils/cdrdao/files/patch-dao_main.cc (revision 472345) @@ -0,0 +1,19 @@ +--- dao/main.cc.orig 2018-05-16 10:46:39 UTC ++++ dao/main.cc +@@ -2330,15 +2330,7 @@ int main(int argc, char **argv) + + Settings* settings = new Settings; + +- settingsPath = "/etc/cdrdao.conf"; +- if (settings->read(settingsPath) == 0) +- log_message(3, "Read settings from \"%s\".", settingsPath); +- +- settingsPath = "/etc/defaults/cdrdao"; +- if (settings->read(settingsPath) == 0) +- log_message(3, "Read settings from \"%s\".", settingsPath); +- +- settingsPath = "/etc/default/cdrdao"; ++ settingsPath = "%%PREFIX%%/etc/cdrdao.conf"; + if (settings->read(settingsPath) == 0) + log_message(3, "Read settings from \"%s\".", settingsPath); + Property changes on: head/sysutils/cdrdao/files/patch-dao_main.cc ___________________________________________________________________ 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 Index: head/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul (nonexistent) +++ head/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul (revision 472345) @@ -0,0 +1,32 @@ +--- scsilib/RULES/i386-freebsd-cc.rul.orig 2002-10-15 20:43:39 UTC ++++ scsilib/RULES/i386-freebsd-cc.rul +@@ -24,7 +24,8 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg + ########################################################################### + + CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) ++XCFLAGS:= $(CFLAGS) ++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) + + CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) + COPTS= +@@ -57,14 +58,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE + + FLOAT_OPTIONS= + +-CC= @echo " ==> COMPILING \"$@\""; gcc +-LDCC= @echo " ==> LINKING \"$@\""; gcc +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib ++CCCOM= $(CC) ++LDCC= $(CCCOM) ++DYNLD= $(CCCOM) ++RANLIB= ranlib + ARFLAGS= cr + LORDER= lorder + TSORT= tsort + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M ++MKDEP= $(CCCOM) -M + MKDEP_OUT= Property changes on: head/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul ___________________________________________________________________ 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 Index: head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c (revision 472344) +++ head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c (revision 472345) @@ -1,28 +1,11 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# 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/. -########################################################################### - ---- scsilib/inc/avoffset.c.orig 2009-10-05 11:58:21 UTC +--- scsilib/inc/avoffset.c.orig 2018-05-16 10:46:58 UTC +++ scsilib/inc/avoffset.c @@ -61,7 +61,7 @@ main(ac, av) { int stdir; #ifdef HAVE_SCANSTACK - register struct frame *fp; + volatile struct frame *fp; register int i = 0; register int o = 0; Index: head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c (revision 472344) +++ head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c (revision 472345) @@ -1,37 +1,20 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# 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/. -########################################################################### - --- scsilib/inc/getfp.c.orig 2003-07-12 23:10:47 UTC +++ scsilib/inc/getfp.c @@ -56,7 +56,7 @@ EXPORT void **___fpoff __PR((char *cp)); -EXPORT void ** +EXPORT __noinline void ** getfp() { long **dummy[1]; @@ -73,7 +73,7 @@ getfp() * We need this function to fool GCCs check for returning addresses * from outside the functions local address space. */ -EXPORT void ** +EXPORT __noinline void ** ___fpoff(cp) char *cp; { Index: head/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h (revision 472344) +++ head/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h (revision 472345) @@ -1,17 +1,17 @@ ---- scsilib/include/mconfig.h.orig 2009-10-05 11:58:21 UTC +--- scsilib/include/mconfig.h.orig 2018-05-16 10:46:58 UTC +++ scsilib/include/mconfig.h @@ -72,12 +72,12 @@ extern "C" { * Types/Keywords */ -#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) +#if defined(__aarch64__) || defined(__ia64__) || defined(__mips_n64) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__) #define SIZEOF_LONG_INT 8 #define SIZEOF_CHAR_P 8 #define SIZEOF_UNSIGNED_LONG_INT 8 #define SIZEOF_UNSIGNED_CHAR_P 8 -#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__) +#elif defined(__arm__) || defined(__i386__) || defined(__mips__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__) #define SIZEOF_LONG_INT 4 #define SIZEOF_CHAR_P 4 #define SIZEOF_UNSIGNED_LONG_INT 4 Index: head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c =================================================================== --- head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c (revision 472344) +++ head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c (revision 472345) @@ -1,45 +1,28 @@ -########################################################################### -# This patch was contributed by Dimitry Andric. -########################################################################### -# 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/. -########################################################################### - --- scsilib/libschily/getfp.c.orig 2003-07-12 23:10:47 UTC +++ scsilib/libschily/getfp.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifndef IS_AVOFFSET /* @@ -56,7 +57,7 @@ EXPORT void **___fpoff __PR((char *cp)); -EXPORT void ** +EXPORT __noinline void ** getfp() { long **dummy[1]; @@ -73,7 +74,7 @@ getfp() * We need this function to fool GCCs check for returning addresses * from outside the functions local address space. */ -EXPORT void ** +EXPORT __noinline void ** ___fpoff(cp) char *cp; { Index: head/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc =================================================================== --- head/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc (nonexistent) +++ head/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc (revision 472345) @@ -0,0 +1,10 @@ +--- trackdb/FormatMp3.cc.orig 2018-05-15 13:30:52 UTC ++++ trackdb/FormatMp3.cc +@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit + + // Initialize libao for WAV output; + ao_sample_format out_format; ++ memset(&out_format, 0, sizeof(out_format)); + out_format.bits = 16; + out_format.rate = 44100; + out_format.channels = 2; Property changes on: head/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc ___________________________________________________________________ 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 Index: head/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc =================================================================== --- head/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc (nonexistent) +++ head/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc (revision 472345) @@ -0,0 +1,10 @@ +--- trackdb/FormatOgg.cc.orig 2018-05-15 13:30:52 UTC ++++ trackdb/FormatOgg.cc +@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit + return FS_WRONG_FORMAT; + } + ++ memset(&outFormat_, 0, sizeof(outFormat_)); + outFormat_.bits = 16; + outFormat_.rate = 44100; + outFormat_.channels = 2; Property changes on: head/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc ___________________________________________________________________ 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 Index: head/sysutils/gcdmaster/Makefile =================================================================== --- head/sysutils/gcdmaster/Makefile (revision 472344) +++ head/sysutils/gcdmaster/Makefile (revision 472345) @@ -1,13 +1,12 @@ -# Created by: marius@alchemy.franken.de +# Created by: marius # $FreeBSD$ PORTNAME= gcdmaster -PORTREVISION= 8 COMMENT= GNOME frontend for cdrdao MASTERDIR= ${.CURDIR}/../cdrdao DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile"