[Midnightbsd-cvs] mports [24763] trunk/sysutils/cdrdao: update cdrdao to 1.2.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jan 6 12:50:05 EST 2019
Revision: 24763
http://svnweb.midnightbsd.org/mports/?rev=24763
Author: laffer1
Date: 2019-01-06 12:50:04 -0500 (Sun, 06 Jan 2019)
Log Message:
-----------
update cdrdao to 1.2.4
Modified Paths:
--------------
trunk/sysutils/cdrdao/Makefile
trunk/sysutils/cdrdao/distinfo
Added Paths:
-----------
trunk/sysutils/cdrdao/files/patch-configure
trunk/sysutils/cdrdao/files/patch-dao_cdrdao.man
trunk/sysutils/cdrdao/files/patch-dao_main.cc
trunk/sysutils/cdrdao/files/patch-scsilib-libscg_scsihack.c
trunk/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
trunk/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c
trunk/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
trunk/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
trunk/sysutils/cdrdao/files/patch-scsilib_libschily_format.c
trunk/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c
trunk/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc
trunk/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc
Removed Paths:
-------------
trunk/sysutils/cdrdao/files/patch-dao::cdrdao.man
trunk/sysutils/cdrdao/files/patch-dao::main.cc
trunk/sysutils/cdrdao/files/patch-mbsd
trunk/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
trunk/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk
trunk/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc
trunk/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc
trunk/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc
Modified: trunk/sysutils/cdrdao/Makefile
===================================================================
--- trunk/sysutils/cdrdao/Makefile 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/Makefile 2019-01-06 17:50:04 UTC (rev 24763)
@@ -2,11 +2,10 @@
# $FreeBSD: ports/sysutils/cdrdao/Makefile,v 1.62 2010/06/06 20:39:20 naddy Exp $
PORTNAME?= cdrdao
-PORTVERSION= 1.2.3
-PORTREVISION?= 1
+PORTVERSION= 1.2.4
+PORTREVISION?= 0
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= cdrdao/cdrdao/${PORTVERSION}
+MASTER_SITES= SF/cdrdao
DISTNAME= cdrdao-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
@@ -14,12 +13,13 @@
LICENSE= gpl2
-USES= gmake tar:bzip2
+USES= compiler:c++11-lang gmake tar:bzip2
GNU_CONFIGURE= yes
+USE_CXXSTD= c++11
-MP3OGG_LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao \
- libmad.so:${PORTSDIR}/audio/libmad \
- libvorbis.so:${PORTSDIR}/audio/libvorbis
+MP3OGG_LIB_DEPENDS= libao.so:audio/libao \
+ libmad.so:audio/libmad \
+ libvorbis.so:audio/libvorbis
.if ${PORTNAME} == "cdrdao"
OPTIONS_DEFINE= DOCS TOC2MP3 MP3OGG
@@ -33,18 +33,18 @@
.if ${PORTNAME} == "gcdmaster"
USES+= pkgconfig shared-mime-info
-WANT_GNOME= yes
GCONF_SCHEMAS= gcdmaster.schemas
LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \
- libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
-RUN_DEPENDS+= ${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
- ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
+ 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:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+= --with-lame-include=${LOCALBASE}/include \
+LIB_DEPENDS+= libmp3lame.so:audio/lame
+CONFIGURE_ARGS+= --disable-lame-test \
+ --with-lame-include=${LOCALBASE}/include \
--with-lame-lib=${LOCALBASE}/lib
PLIST_SUB+= TOC2MP3=""
.else
@@ -65,18 +65,20 @@
.endif
.endif
+.include <bsd.port.pre.mk>
+
CONFIGURE_ARGS+= --without-pcctsbin --without-pcctsinc \
--with-posix-threads=no --with-scglib
-MAKE_ENV= CCOM=cc LANG=C
-SCSILIBTARGET= ${ARCH}-freebsd-cc
+MAKE_ENV= CCOM=cc
+SCSILIBXARCH!= ${UNAME} -m
-.include <bsd.port.pre.mk>
-
post-extract:
- @(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-midnightbsd.id)
-.if ${SCSILIBTARGET} != "i386-freebsd-cc"
- @${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
- ${WRKSRC}/scsilib/RULES/${SCSILIBTARGET}.rul
+ @(cd ${WRKSRC}/scsilib/RULES && ${CP} -p os-freebsd.id os-midnightbsd.id)
+.if ${SCSILIBXARCH} != "i386"
+ ${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
+ ${WRKSRC}/scsilib/RULES/${SCSILIBXARCH}-${OPSYS:tl}-cc.rul
+ ${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
+ ${WRKSRC}/scsilib/RULES/${SCSILIBXARCH}-freebsd-cc.rul
.endif
post-patch:
@@ -85,21 +87,18 @@
55readcd 55scgcheck 55scgskeleton 55rscsi 85man
@${RM} ${WRKSRC}/scsilib/TARGETS/${i}
.endfor
-.for i in include/schily.h libschily/fexec.c
- @${REINPLACE_CMD} -e 's|fexecve|js_fexecve|g' ${WRKSRC}/scsilib/${i}
-.endfor
.if ${PORTNAME} == "gcdmaster"
@${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \
- ${WRKSRC}/xdao/Makefile.in
+ ${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}
@@ -111,49 +110,51 @@
.endfor
.endif
+.if ${PORTNAME} == "gcdmaster"
do-install:
-.if ${PORTNAME} == "gcdmaster"
- @${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${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
- @${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin
- @${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \
+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
+ ${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 \
+ ${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers \
${STAGEDIR}${DATADIR}/drivers
.if ${PORT_OPTIONS:MTOC2MP3}
@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}${PREFIX}/bin
@@ -160,7 +161,7 @@
.endif
@${MKDIR} ${DOCSDIR}
.for i in CREDITS ChangeLog README README.PlexDAE
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
Modified: trunk/sysutils/cdrdao/distinfo
===================================================================
--- trunk/sysutils/cdrdao/distinfo 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/distinfo 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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
Added: trunk/sysutils/cdrdao/files/patch-configure
===================================================================
--- trunk/sysutils/cdrdao/files/patch-configure (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-configure 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,38 @@
+--- configure.orig 2019-01-06 12:47:35.829685000 -0500
++++ configure 2019-01-06 12:48:11.888740000 -0500
+@@ -7436,7 +7436,7 @@
+ scsilib_objs="ScsiIf-lib.o"
+
+ case "$host" in
+- *-freebsd* | *-kfreebsd*-gnu)
++ *-freebsd* | *-kfreebsd*-gnu | *-midnightbsd*)
+ scsilib_libs="$scsilib_libs -lcam"
+ ;;
+ esac
+@@ -7454,7 +7454,7 @@
+ scsilib_objs="ScsiIf-linux.o sg_err.o"
+ ;;
+
+- *-freebsd* | *-kfreebsd*-gnu)
++ *-freebsd* | *-kfreebsd*-gnu | *-midnightbsd*)
+ scsilib_libs="-lcam"
+ scsilib_objs="ScsiIf-freebsd-cam.o"
+ ;;
+@@ -7492,7 +7492,7 @@
+ esac
+
+ case "$host" in
+- *-freebsd*)
++ *-freebsd* | *-midnightbsd*)
+ if test "$use_pthreads" = yes; then
+ LDFLAGS="-pthread $LDFLAGS"
+ thread_libs=""
+@@ -7508,7 +7508,7 @@
+ esac
+
+ case "$host" in
+- *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris*)
++ *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris* | *-midnightbsd*)
+ sound_if_obj=SoundIF-ao.o
+ ;;
+
Property changes on: trunk/sysutils/cdrdao/files/patch-configure
___________________________________________________________________
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
Deleted: trunk/sysutils/cdrdao/files/patch-dao::cdrdao.man
===================================================================
--- trunk/sysutils/cdrdao/files/patch-dao::cdrdao.man 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-dao::cdrdao.man 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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)
Deleted: trunk/sysutils/cdrdao/files/patch-dao::main.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-dao::main.cc 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-dao::main.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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);
-
Added: trunk/sysutils/cdrdao/files/patch-dao_cdrdao.man
===================================================================
--- trunk/sysutils/cdrdao/files/patch-dao_cdrdao.man (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-dao_cdrdao.man 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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: trunk/sysutils/cdrdao/files/patch-dao_cdrdao.man
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-dao_main.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-dao_main.cc (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-dao_main.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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: trunk/sysutils/cdrdao/files/patch-dao_main.cc
___________________________________________________________________
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
Deleted: trunk/sysutils/cdrdao/files/patch-mbsd
===================================================================
--- trunk/sysutils/cdrdao/files/patch-mbsd 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-mbsd 2019-01-06 17:50:04 UTC (rev 24763)
@@ -1,353 +0,0 @@
-diff -urN scsilib.orig/RULES/amd64-midnightbsd-cc.rul scsilib/RULES/amd64-midnightbsd-cc.rul
---- scsilib.orig/RULES/amd64-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/amd64-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,71 @@
-+#ident "@(#)amd64-midnightbsd-cc.rul 1.4 02/10/15 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# Platform dependent MACROS for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+include $(SRCROOT)/$(RULESDIR)/rules.prg
-+###########################################################################
-+
-+CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-+XCFLAGS:= $(CFLAGS)
-+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
-+
-+CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-+COPTS=
-+CWOPTS= -Wall -Wtraditional \
-+ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
-+COPTOPT= -O
-+KDEFINES= -DKERNEL -D_KERNEL
-+COPTDYN= -fpic
-+COPTGPROF= -pg
-+
-+LIB_PREFIX= lib
-+LIB_SUFFIX= .a
-+SHL_SUFFIX= .so.1.0
-+
-+#LIB_SOCKET= -lsocket -lnsl -ldl
-+LIB_SOCKET=
-+LIB_MATH= -lm
-+#LIB_KVM= -lkvm
-+LIB_KVM=
-+
-+LIBS_PATH= -L$(OLIBSDIR)
-+
-+LDFLAGS= $(LDOPTS) $(LDOPTX)
-+LDLIBS= $(LIBS) $(LIBX)
-+
-+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-+LDOPTS= $(LIBS_PATH) $(LDPATH)
-+LDOPTDYN= -shared -Wl,-soname,$(TARGET)
-+LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-+
-+FLOAT_OPTIONS=
-+
-+CCCOM= $(CC)
-+LDCC= $(CCCOM)
-+DYNLD= $(CCCOM)
-+RANLIB= ranlib
-+ARFLAGS= cr
-+LORDER= lorder
-+TSORT= tsort
-+
-+RMDEP= :
-+MKDEP= $(CCCOM) -M
-+MKDEP_OUT=
-diff -urN scsilib.orig/RULES/i386-midnightbsd-cc.rul scsilib/RULES/i386-midnightbsd-cc.rul
---- scsilib.orig/RULES/i386-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/i386-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,71 @@
-+#ident "@(#)i386-freebsd-cc.rul 1.4 02/10/15 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# Platform dependent MACROS for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+include $(SRCROOT)/$(RULESDIR)/rules.prg
-+###########################################################################
-+
-+CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-+XCFLAGS:= $(CFLAGS)
-+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
-+
-+CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-+COPTS=
-+CWOPTS= -Wall -Wtraditional \
-+ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
-+COPTOPT= -O
-+KDEFINES= -DKERNEL -D_KERNEL
-+COPTDYN= -fpic
-+COPTGPROF= -pg
-+
-+LIB_PREFIX= lib
-+LIB_SUFFIX= .a
-+SHL_SUFFIX= .so.1.0
-+
-+#LIB_SOCKET= -lsocket -lnsl -ldl
-+LIB_SOCKET=
-+LIB_MATH= -lm
-+#LIB_KVM= -lkvm
-+LIB_KVM=
-+
-+LIBS_PATH= -L$(OLIBSDIR)
-+
-+LDFLAGS= $(LDOPTS) $(LDOPTX)
-+LDLIBS= $(LIBS) $(LIBX)
-+
-+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-+LDOPTS= $(LIBS_PATH) $(LDPATH)
-+LDOPTDYN= -shared -Wl,-soname,$(TARGET)
-+LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-+
-+FLOAT_OPTIONS=
-+
-+CCCOM= $(CC)
-+LDCC= $(CCCOM)
-+DYNLD= $(CCCOM)
-+RANLIB= ranlib
-+ARFLAGS= cr
-+LORDER= lorder
-+TSORT= tsort
-+
-+RMDEP= :
-+MKDEP= $(CCCOM) -M
-+MKDEP_OUT=
-diff -urN scsilib.orig/RULES/os-midnightbsd.def scsilib/RULES/os-midnightbsd.def
---- scsilib.orig/RULES/os-midnightbsd.def Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/os-midnightbsd.def Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,23 @@
-+#ident "@(#)os-midnightbsd.def 1.1 97/02/11 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# Global os definitions for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+MANSTYLE= bsd
-diff -urN scsilib.orig/RULES/os-midnightbsd.id scsilib/RULES/os-midnightbsd.id
---- scsilib.orig/RULES/os-midnightbsd.id Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/os-midnightbsd.id Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,24 @@
-+#ident "@(#)os-midnightbsd.id 1.1 97/02/11 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# OS specific MACRO definitions for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+O_ARCH= midnightbsd
-+-O_ARCH= -$(O_ARCH)
-diff -urN scsilib.orig/RULES/sparc64-midnightbsd-cc.rul scsilib/RULES/sparc64-midnightbsd-cc.rul
---- scsilib.orig/RULES/sparc64-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/sparc64-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,70 @@
-+#ident "@(#)i386-freebsd-cc.rul 1.4 02/10/15 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# Platform dependent MACROS for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+include $(SRCROOT)/$(RULESDIR)/rules.prg
-+###########################################################################
-+
-+CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-+CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-+
-+CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-+COPTS=
-+CWOPTS= -Wall -Wtraditional \
-+ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
-+COPTOPT= -O
-+KDEFINES= -DKERNEL -D_KERNEL
-+COPTDYN= -fpic
-+COPTGPROF= -pg
-+
-+LIB_PREFIX= lib
-+LIB_SUFFIX= .a
-+SHL_SUFFIX= .so.1.0
-+
-+#LIB_SOCKET= -lsocket -lnsl -ldl
-+LIB_SOCKET=
-+LIB_MATH= -lm
-+#LIB_KVM= -lkvm
-+LIB_KVM=
-+
-+LIBS_PATH= -L$(OLIBSDIR)
-+
-+LDFLAGS= $(LDOPTS) $(LDOPTX)
-+LDLIBS= $(LIBS) $(LIBX)
-+
-+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-+LDOPTS= $(LIBS_PATH) $(LDPATH)
-+LDOPTDYN= -shared -Wl,-soname,$(TARGET)
-+LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-+
-+FLOAT_OPTIONS=
-+
-+CC= @echo " ==> COMPILING \"$@\""; gcc
-+LDCC= @echo " ==> LINKING \"$@\""; gcc
-+DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
-+RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+ARFLAGS= cr
-+LORDER= lorder
-+TSORT= tsort
-+
-+RMDEP= :
-+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP_OUT=
-diff -urN scsilib.orig/RULES/sparc64-midnightbsd-gcc.rul scsilib/RULES/sparc64-midnightbsd-gcc.rul
---- scsilib.orig/RULES/sparc64-midnightbsd-gcc.rul Wed Dec 31 19:00:00 1969
-+++ scsilib/RULES/sparc64-midnightbsd-gcc.rul Sat Apr 7 19:34:11 2007
-@@ -0,0 +1,70 @@
-+#ident "@(#)i386-freebsd-gcc.rul 1.4 02/10/15 "
-+###########################################################################
-+# Written 1997 by J. Schilling
-+###########################################################################
-+#
-+# Platform dependent MACROS for MidnightBSD
-+#
-+###########################################################################
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; see the file COPYING. If not, write to
-+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+###########################################################################
-+include $(SRCROOT)/$(RULESDIR)/rules.prg
-+###########################################################################
-+
-+CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-+CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-+
-+CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
-+COPTS=
-+CWOPTS= -Wall -Wtraditional \
-+ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
-+COPTOPT= -O
-+KDEFINES= -DKERNEL -D_KERNEL
-+COPTDYN= -fpic
-+COPTGPROF= -pg
-+
-+LIB_PREFIX= lib
-+LIB_SUFFIX= .a
-+SHL_SUFFIX= .so.1.0
-+
-+#LIB_SOCKET= -lsocket -lnsl -ldl
-+LIB_SOCKET=
-+LIB_MATH= -lm
-+#LIB_KVM= -lkvm
-+LIB_KVM=
-+
-+LIBS_PATH= -L$(OLIBSDIR)
-+
-+LDFLAGS= $(LDOPTS) $(LDOPTX)
-+LDLIBS= $(LIBS) $(LIBX)
-+
-+#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
-+LDOPTS= $(LIBS_PATH) $(LDPATH)
-+LDOPTDYN= -shared -Wl,-soname,$(TARGET)
-+LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
-+
-+FLOAT_OPTIONS=
-+
-+CC= @echo " ==> COMPILING \"$@\""; gcc
-+LDCC= @echo " ==> LINKING \"$@\""; gcc
-+DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
-+RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+ARFLAGS= cr
-+LORDER= lorder
-+TSORT= tsort
-+
-+RMDEP= :
-+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP_OUT=
Added: trunk/sysutils/cdrdao/files/patch-scsilib-libscg_scsihack.c
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib-libscg_scsihack.c (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib-libscg_scsihack.c 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,11 @@
+--- scsilib/libscg/scsihack.c.orig 2019-01-06 12:39:39.322472000 -0500
++++ scsilib/libscg/scsihack.c 2019-01-06 12:40:01.004378000 -0500
+@@ -129,7 +129,7 @@
+
+ #endif /* linux */
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__)
+ #define SCSI_IMPL /* We have a SCSI implementation for *BSD */
+
+ #include "scsi-bsd.c"
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib-libscg_scsihack.c
___________________________________________________________________
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
Deleted: trunk/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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=
Deleted: trunk/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk 2019-01-06 17:50:04 UTC (rev 24763)
@@ -1,8 +0,0 @@
---- scsilib/inc/avoffset.mk.orig Sun Jul 13 00:55:06 2003
-+++ scsilib/inc/avoffset.mk Fri Aug 25 13:34:32 2006
-@@ -15,3 +15,5 @@
- ###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.inc
- ###########################################################################
-+
-+.IGNORE: $(PTARGET)
Added: trunk/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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: trunk/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,11 @@
+--- 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;
+
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,20 @@
+--- 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;
+ {
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,17 @@
+--- 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
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-scsilib_libschily_format.c
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_libschily_format.c (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_libschily_format.c 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,28 @@
+--- scsilib/libschily/format.c.orig 2003-10-18 13:26:50 UTC
++++ scsilib/libschily/format.c
+@@ -166,6 +166,7 @@ format(fun, farg, fmt, args)
+ Ulong res;
+ char *rfmt;
+ f_args fa;
++ va_list vl;
+
+ fa.outf = fun;
+ fa.farg = farg;
+@@ -432,6 +433,7 @@ format(fun, farg, fmt, args)
+ case 'r': /* recursive printf */
+ case 'R': /* recursive printf */
+ rfmt = va_arg(args, char *);
++ va_copy(vl, args);
+ /*
+ * I don't know any portable way to get an arbitrary
+ * C object from a var arg list so I use a
+@@ -446,7 +448,8 @@ format(fun, farg, fmt, args)
+ * It would be nice to have something like
+ * __va_arg_list() in stdarg.h
+ */
+- count += format(fun, farg, rfmt, __va_arg_list(args));
++ count += format(fun, farg, rfmt, vl);
++ va_end(vl);
+ continue;
+
+ case 'n':
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib_libschily_format.c
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c
===================================================================
--- trunk/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c 2019-01-06 17:50:04 UTC (rev 24763)
@@ -0,0 +1,28 @@
+--- scsilib/libschily/getfp.c.orig 2003-07-12 23:10:47 UTC
++++ scsilib/libschily/getfp.c
+@@ -23,6 +23,7 @@
+ #include <mconfig.h>
+ #include <standard.h>
+ #include <schily.h>
++#include <sys/cdefs.h>
+
+ #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;
+ {
Property changes on: trunk/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c
___________________________________________________________________
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
Deleted: trunk/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-trackdb::FormatMp3.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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;
Deleted: trunk/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-trackdb::FormatOgg.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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;
Added: trunk/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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: trunk/sysutils/cdrdao/files/patch-trackdb_FormatMp3.cc
___________________________________________________________________
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
Added: trunk/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc (rev 0)
+++ trunk/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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: trunk/sysutils/cdrdao/files/patch-trackdb_FormatOgg.cc
___________________________________________________________________
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
Deleted: trunk/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc
===================================================================
--- trunk/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc 2019-01-05 20:37:34 UTC (rev 24762)
+++ trunk/sysutils/cdrdao/files/patch-xdao::SoundIF-ao.cc 2019-01-06 17:50:04 UTC (rev 24763)
@@ -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;
More information about the Midnightbsd-cvs
mailing list