Index: head/emulators/mtools/Makefile =================================================================== --- head/emulators/mtools/Makefile (revision 561617) +++ head/emulators/mtools/Makefile (revision 561618) @@ -1,63 +1,62 @@ # Created by: jmz # $FreeBSD$ PORTNAME= mtools -PORTVERSION= 4.0.10 -PORTREVISION= 6 +PORTVERSION= 4.0.26 CATEGORIES= emulators MASTER_SITES= GNU MAINTAINER= skreuzer@FreeBSD.org COMMENT= Collection of tools for manipulating MS-DOS files LICENSE= GPLv3 CONFLICTS_INSTALL= multimarkdown-* USES= gmake makeinfo tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_malloc_h=no CONFIGURE_ARGS= --enable-xdf SUB_FILES= pkg-message INFO= mtools OPTIONS_DEFINE= ICONV X11 OPTIONS_DEFAULT=ICONV X11 .include .if ${PORT_OPTIONS:MICONV} USES+= iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} .else CONFIGURE_ENV+= ac_cv_header_iconv_h=no .endif .if ${PORT_OPTIONS:MX11} USES+= xorg USE_XORG= x11 sm ice xau PLIST_SUB+= X11="" .else CONFIGURE_ARGS+= --without-x PLIST_SUB+= X11="@comment " MAKE_ENV+= WITHOUT_X11=yes .endif post-patch: @${REINPLACE_CMD} -e \ 's|^#define MT_SIZE_T size_t|#define MT_SIZE_T off_t|g' \ ${WRKSRC}/llong.h @${REINPLACE_CMD} -e 's|/etc/mtools.conf|${PREFIX}/etc/mtools.conf|g' \ ${WRKSRC}/mformat.c .for f in mtools.5 mtools.texi @${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/${f} .endfor post-install: ${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample .include Index: head/emulators/mtools/distinfo =================================================================== --- head/emulators/mtools/distinfo (revision 561617) +++ head/emulators/mtools/distinfo (revision 561618) @@ -1,2 +1,3 @@ -SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded -SIZE (mtools-4.0.10.tar.bz2) = 381481 +TIMESTAMP = 1610672966 +SHA256 (mtools-4.0.26.tar.bz2) = 539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a +SIZE (mtools-4.0.26.tar.bz2) = 420648 Index: head/emulators/mtools/files/patch-a =================================================================== --- head/emulators/mtools/files/patch-a (revision 561617) +++ head/emulators/mtools/files/patch-a (nonexistent) @@ -1,41 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -72,10 +72,13 @@ - .SUFFIXES: .o .c - .SUFFIXES: .o .c - --MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ -+MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ - mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \ - mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ - mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 -+ifndef WITHOUT_X11 -+MAN1 += floppyd.1 floppyd_installtest.1 -+endif - MAN1EXT = 1 - MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} - MAN5 = mtools.5 -@@ -132,7 +135,7 @@ - xdf_io.c mkmanifest.c - - --SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh -+SCRIPTS = mcheck mxtar mcomp amuFormat.sh - - LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \ - mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \ -@@ -269,11 +272,11 @@ - install-scripts: $(DESTDIR)$(bindir)/mtools - @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) - @for j in $(SCRIPTS) ; do \ -- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ -+ $(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ - echo $(DESTDIR)$(bindir)/$$j ; \ - done -- rm -f $(DESTDIR)$(bindir)/lz -- $(LN_S) uz $(DESTDIR)$(bindir)/lz -+ #rm -f $(DESTDIR)$(bindir)/lz -+ #$(LN_S) uz $(DESTDIR)$(bindir)/lz - - install-man: - @$(top_srcdir)/mkinstalldirs $(MAN1DIR) Property changes on: head/emulators/mtools/files/patch-a ___________________________________________________________________ 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/emulators/mtools/files/patch-2 =================================================================== --- head/emulators/mtools/files/patch-2 (revision 561617) +++ head/emulators/mtools/files/patch-2 (nonexistent) @@ -1,94 +0,0 @@ ---- mtools.conf.orig Sun May 20 20:18:12 2001 -+++ mtools.conf Thu Oct 7 22:14:36 2004 -@@ -1,6 +1,67 @@ - # Example mtools.conf files. Uncomment the lines which correspond to - # your architecture and comment out the "SAMPLE FILE" line below --SAMPLE FILE -+ -+# A note on permissions: a user must have read and write permissions for the -+# devices named here in order to access the DOS file systems. You might give -+# ALL USERS access to ALL FLOPPY DISKS via the command -+# -+# chmod a+rw /dev/fd[0-9]* -+# -+# or you might give SPECIFIC GROUP MEMBERS access to a PARTICULAR FLOPPY DISK -+# via the commands -+# -+# chmod g+rw /dev/fd0 ; chgrp staff /dev/fd0 -+# -+# (and ensure selected people are in a group such as staff). -+ -+ -+# Floppy disks. Here, A: and B: use automatic size detection. -+# -+# Example: To prepare drive A: for use as a 1.44M floppy on FreeBSD: -+# [1] low level format with ......... fdformat -f 1440 /dev/fd0 -+# [2] write a file system with ...... newfs_msdos -f 1440 /dev/fd0 -+# [3] then use mcopy/mdir etc. in the usual way. -+# -+# The mformat command could also be used to build the DOS file system -+# in place of newfs_msdos. -+ -+# # FreeBSD floppy drives -+drive a: file="/dev/fd0" -+drive b: file="/dev/fd1" -+ -+# FreeBSD automatically detects a number of common floppy densities, like -+# 720 KB and 1440 KB MS-DOS formatted media. -+# -+# To change the density of FreeBSD floppy devices to something unusual, -+# use fdcontrol(8). -+ -+# LS120 (ATAPI) floppy disk (extra parameters allow easy mformat) -+# -+# -- Drive L: is an LS120 in 100MB mode (mdir shows 125967576 bytes capacity) -+# -+drive l: file="/dev/afd0" exclusive mformat_only cylinders=963 heads=8 sectors=32 -+# -+# -- Drive M: is an LS120 in 1.4MB mode -+# -+drive m: file="/dev/afd0" exclusive mformat_only cylinders=80 heads=2 sectors=18 -+ -+# SCSI hard disks -+# first disk (da0) slice 1 (s1) -+#drive c: file="/dev/da0s1" -+ -+# IDE hard disks -+# first disk on the first IDE interface (wd0) slice 1 (s1) -+drive c: file="/dev/ad0s1" -+# first disk on the first IDE interface (wd0) slice 3 (s3) -+#drive d: file="/dev/ad0s3" -+# second disk on the first IDE interface (wd1) slice 1 (s1) -+#drive d: file="/dev/ad1s1" -+# first disk on the second IDE interface (wd2) slice 1 (s1) -+drive d: file="/dev/ad2s1" -+ -+# PCEMU floppy boot image -+drive p: file="/usr/local/lib/pcemu/DriveA" -+ - - # # Linux floppy drives - # drive a: file="/dev/fd0" exclusive -@@ -61,4 +122,4 @@ - - # # uncomment the following line to display all file names in lower - # # case by default --# mtools_lower_case=1 -+mtools_lower_case=1 ---- devices.c.orig Thu Oct 7 22:12:00 2004 -+++ devices.c Thu Oct 7 22:16:46 2004 -@@ -790,10 +790,10 @@ - #ifdef OS_freebsd - #define predefined_devices - struct device devices[] = { -- {"/dev/fd0.1440", 'A', FHD312}, -- {"/dev/fd0.720", 'A', FDD312}, -- {"/dev/fd1.1200", 'B', MHD514}, -- {"/dev/sd0s1", 'C', GENHD}, -+ {"/dev/fd0", 'A', FHD312}, -+ {"/dev/fd0", 'A', FDD312}, -+ {"/dev/fd1", 'B', MHD514}, -+ {"/dev/da0s1", 'C', GENHD}, - REMOTE - }; - #endif /* __FreeBSD__ */ Property changes on: head/emulators/mtools/files/patch-2 ___________________________________________________________________ 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/emulators/mtools/files/patch-c =================================================================== --- head/emulators/mtools/files/patch-c (revision 561617) +++ head/emulators/mtools/files/patch-c (nonexistent) @@ -1,11 +0,0 @@ ---- mtools.texi.orig 2009-02-20 05:48:30.000000000 +0900 -+++ mtools.texi 2009-02-20 22:04:41.000000000 +0900 -@@ -36,7 +36,7 @@ - - @dircategory DOS - @direntry --* Mtools: (mtools). Mtools: utilities to access DOS disks in Unix. -+* Mtools: (mtools). Mtools: utilities to access DOS disks in Unix. - @end direntry - - Property changes on: head/emulators/mtools/files/patch-c ___________________________________________________________________ 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/emulators/mtools/files/patch-f =================================================================== --- head/emulators/mtools/files/patch-f (revision 561617) +++ head/emulators/mtools/files/patch-f (nonexistent) @@ -1,30 +0,0 @@ ---- scsi.c.orig Tue Mar 16 03:11:18 1999 -+++ scsi.c Sat Feb 26 00:48:35 2000 -@@ -49,7 +49,7 @@ - #include - #endif - --#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2) -+#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3) - #include - #endif - -@@ -64,7 +64,7 @@ - - int scsi_open(const char *name, int flag, int mode, void **extra_data) - { --#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2) -+#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3) - struct cam_device *cam_dev; - cam_dev = cam_open_device(name, O_RDWR); - *extra_data = (void *) cam_dev; -@@ -224,7 +224,7 @@ - } - - return 0; --#elif (defined OS_freebsd) && (__FreeBSD__ >= 2) -+#elif (defined OS_freebsd) && (__FreeBSD__ >= 3) - #define MSG_SIMPLE_Q_TAG 0x20 /* O/O */ - union ccb *ccb; - int flags; - Property changes on: head/emulators/mtools/files/patch-f ___________________________________________________________________ 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/emulators/mtools/files/patch-g =================================================================== --- head/emulators/mtools/files/patch-g (revision 561617) +++ head/emulators/mtools/files/patch-g (nonexistent) @@ -1,69 +0,0 @@ ---- ../mtools-3.9.6/configure Thu Jun 3 20:51:36 1999 -+++ configure Sun Oct 15 15:32:07 2000 -@@ -2461,10 +2461,10 @@ - host_cpu1=`echo $host_cpu | sed 's/\./_/g'` - host_vendor1=`echo $host_vendor | sed 's/\./_/g'` - HOST_ID="-DCPU_$host_cpu1 -DVENDOR_$host_vendor1 -DOS_$host_os1" --if [ $host_os1 != $host_os2 ] ; then -+if [ "$host_os1" != "$host_os2" ] ; then - HOST_ID="$HOST_ID -DOS_$host_os2" - fi --if [ $host_os1 != $host_os3 ] && [ $host_os2 != $host_os3 ] ; then -+if [ "$host_os1" != "$host_os3" ] && [ "$host_os2" != "$host_os3" ] ; then - HOST_ID="$HOST_ID -DOS_$host_os3" - fi - -@@ -2490,44 +2490,44 @@ - fi - CFLAGS="$CFLAGS $Wall" - else -- if [ $host_os3 = hpux ] ; then -+ if [ "$host_os3" = hpux ] ; then - CPPFLAGS="$CPPFLAGS -Ae" - fi - -- if [ $host_os3 = xenix ] ; then -+ if [ "$host_os3" = xenix ] ; then - CFLAGS="$CFLAGS -M2e" - fi - fi - --if [ $host_os3 = hpux ] ; then -+if [ "$host_os3" = hpux ] ; then - LDFLAGS="$LDFLAGS -z" - fi - - --if [ $host_vendor = linux ] ; then -+if [ "$host_vendor" = linux ] ; then - LDFLAGS="$LDFLAGS -z" - fi - --if [ $host_os3 = xenix ] ; then -+if [ "$host_os3" = xenix ] ; then - LDFLAGS="$LDFLAGS -M2e -i -f 5000" - fi - --if [ $host_os2 = sysv4 ] ; then -+if [ "$host_os2" = sysv4 ] ; then - SHLIB="-lc -L/usr/ucblib -lucb" - else - SHLIB="" - fi - --if [ $host_os3 = isc ] ; then -+if [ "$host_os3" = isc ] ; then - CFLAGS="$CFLAGS -D_SYSV3" - SHLIB="-lc_s" - fi - --if [ $host_os3 = solaris -a x$newVold = xxyes ] ; then -+if [ "$host_os3" = solaris -a x$newVold = xxyes ] ; then - SHLIB="$SHLIB -s -lvolmgt" - fi - --if [ $host_os3 = nextstep ] ; then -+if [ "$host_os3" = nextstep ] ; then - CFLAGS="$CFLAGS -DBSD" - SHLIB="" - fi Property changes on: head/emulators/mtools/files/patch-g ___________________________________________________________________ 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/emulators/mtools/files/patch-Makefile.in =================================================================== --- head/emulators/mtools/files/patch-Makefile.in (nonexistent) +++ head/emulators/mtools/files/patch-Makefile.in (revision 561618) @@ -0,0 +1,41 @@ +--- Makefile.in.orig 2018-12-09 19:54:34 UTC ++++ Makefile.in +@@ -72,10 +72,13 @@ INSTALL_INFO = @INSTALL_INFO@ + .SUFFIXES: .o .c + .SUFFIXES: .o .c + +-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ ++MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ + mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \ + mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ + mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 ++ifndef WITHOUT_X11 ++MAN1 += floppyd.1 floppyd_installtest.1 ++endif + MAN1EXT = 1 + MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} + MAN5 = mtools.5 +@@ -133,7 +136,7 @@ scsi.c signal.c stream.c streamcache.c subdir.c unixdi + xdf_io.c mkmanifest.c + + +-SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh ++SCRIPTS = mcheck mxtar mcomp amuFormat.sh + + LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \ + mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshortname \ +@@ -278,11 +281,11 @@ install-links: $(DESTDIR)$(bindir)/mtools + install-scripts: $(DESTDIR)$(bindir)/mtools + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + @for j in $(SCRIPTS) ; do \ +- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ ++ $(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ + echo $(DESTDIR)$(bindir)/$$j ; \ + done +- rm -f $(DESTDIR)$(bindir)/lz +- cd $(DESTDIR)$(bindir) && $(LN_S) uz lz ++ #rm -f $(DESTDIR)$(bindir)/lz ++ #cd $(DESTDIR)$(bindir) && $(LN_S) uz lz + + install-man: + @$(top_srcdir)/mkinstalldirs $(MAN1DIR) Property changes on: head/emulators/mtools/files/patch-Makefile.in ___________________________________________________________________ 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/emulators/mtools/files/patch-configure =================================================================== --- head/emulators/mtools/files/patch-configure (nonexistent) +++ head/emulators/mtools/files/patch-configure (revision 561618) @@ -0,0 +1,63 @@ +--- configure.orig 2020-11-28 11:54:35 UTC ++++ configure +@@ -5696,10 +5696,10 @@ host_os3=`echo $host_os2 | sed 's/^\([^0-9]*\)[0-9]*$/ + host_cpu1=`echo $host_cpu | sed 's/\./_/g'` + host_vendor1=`echo $host_vendor | sed 's/\./_/g'` + HOST_ID="-DCPU_$host_cpu1 -DVENDOR_$host_vendor1 -DOS_$host_os1" +-if [ $host_os1 != $host_os2 ] ; then ++if [ "$host_os1" != "$host_os2" ] ; then + HOST_ID="$HOST_ID -DOS_$host_os2" + fi +-if [ $host_os1 != $host_os3 ] && [ $host_os2 != $host_os3 ] ; then ++if [ "$host_os1" != "$host_os3" ] && [ "$host_os2" != "$host_os3" ] ; then + HOST_ID="$HOST_ID -DOS_$host_os3" + fi + +@@ -5725,39 +5725,39 @@ if [ "X$GCC" = "Xyes" ] ; then + esac + CFLAGS="$CFLAGS $Wall" + else +- if [ $host_os3 = hpux ] ; then ++ if [ "$host_os3" = hpux ] ; then + CPPFLAGS="$CPPFLAGS -Ae" + fi + +- if [ $host_os3 = xenix ] ; then ++ if [ "$host_os3" = xenix ] ; then + CFLAGS="$CFLAGS -M2e" + fi + fi + +-if [ $host_os3 = hpux ] ; then ++if [ "$host_os3" = hpux ] ; then + LDFLAGS="$LDFLAGS -z" + fi + +-if [ $host_os3 = xenix ] ; then ++if [ "$host_os3" = xenix ] ; then + LDFLAGS="$LDFLAGS -M2e -i -f 5000" + fi + +-if [ $host_os2 = sysv4 ] ; then ++if [ "$host_os2" = sysv4 ] ; then + SHLIB="-lc -L/usr/ucblib -lucb" + else + SHLIB="" + fi + +-if [ $host_os3 = isc ] ; then ++if [ "$host_os3" = isc ] ; then + CFLAGS="$CFLAGS -D_SYSV3" + SHLIB="-lc_s" + fi + +-if [ $host_os3 = solaris -a x$newVold = xxyes ] ; then ++if [ "$host_os3" = solaris -a x$newVold = xxyes ] ; then + SHLIB="$SHLIB -s -lvolmgt" + fi + +-if [ $host_os3 = nextstep ] ; then ++if [ "$host_os3" = nextstep ] ; then + CFLAGS="$CFLAGS -DBSD" + SHLIB="" + fi Property changes on: head/emulators/mtools/files/patch-configure ___________________________________________________________________ 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/emulators/mtools/files/patch-mtools.texi =================================================================== --- head/emulators/mtools/files/patch-mtools.texi (nonexistent) +++ head/emulators/mtools/files/patch-mtools.texi (revision 561618) @@ -0,0 +1,11 @@ +--- mtools.texi.orig 2020-11-26 23:02:51 UTC ++++ mtools.texi +@@ -39,7 +39,7 @@ mtools - utilities to access DOS disks in Unix. + + @dircategory DOS + @direntry +-* Mtools: (mtools). Mtools: utilities to access DOS disks in Unix. ++* Mtools: (mtools). Mtools: utilities to access DOS disks in Unix. + @end direntry + + Property changes on: head/emulators/mtools/files/patch-mtools.texi ___________________________________________________________________ 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/emulators/mtools/files/patch-scsi.c =================================================================== --- head/emulators/mtools/files/patch-scsi.c (nonexistent) +++ head/emulators/mtools/files/patch-scsi.c (revision 561618) @@ -0,0 +1,29 @@ +--- scsi.c.orig 2018-12-02 16:23:26 UTC ++++ scsi.c +@@ -62,7 +62,7 @@ + #include + #endif + +-#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2) ++#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3) + #include + #endif + +@@ -82,7 +82,7 @@ int scsi_max_length(void) + int scsi_open(const char *name, int flag UNUSEDP, int mode UNUSEDP, + void **extra_data UNUSEDP) + { +-#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2) ++#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3) + struct cam_device *cam_dev; + cam_dev = cam_open_device(name, O_RDWR); + *extra_data = (void *) cam_dev; +@@ -245,7 +245,7 @@ int scsi_cmd(int fd, unsigned char *cdb, int cmdlen, s + } + + return 0; +-#elif (defined OS_freebsd) && (__FreeBSD__ >= 2) ++#elif (defined OS_freebsd) && (__FreeBSD__ >= 3) + #define MSG_SIMPLE_Q_TAG 0x20 /* O/O */ + union ccb *ccb; + int flags; Property changes on: head/emulators/mtools/files/patch-scsi.c ___________________________________________________________________ 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/emulators/mtools/pkg-plist =================================================================== --- head/emulators/mtools/pkg-plist (revision 561617) +++ head/emulators/mtools/pkg-plist (revision 561618) @@ -1,60 +1,62 @@ bin/amuFormat.sh %%X11%%bin/floppyd %%X11%%bin/floppyd_installtest bin/mattrib bin/mbadblocks bin/mcat bin/mcd bin/mcheck bin/mclasserase bin/mcomp bin/mcopy bin/mdel bin/mdeltree bin/mdir bin/mdu bin/mformat bin/minfo bin/mkmanifest bin/mlabel bin/mmd bin/mmount bin/mmove bin/mpartition bin/mrd bin/mren bin/mshowfat bin/mtools bin/mtoolstest bin/mtype bin/mxtar bin/mzip +bin/mshortname %%X11%%man/man1/floppyd.1.gz %%X11%%man/man1/floppyd_installtest.1.gz man/man1/mattrib.1.gz man/man1/mbadblocks.1.gz man/man1/mcat.1.gz man/man1/mcd.1.gz man/man1/mclasserase.1.gz man/man1/mcopy.1.gz man/man1/mdel.1.gz man/man1/mdeltree.1.gz man/man1/mdir.1.gz man/man1/mdu.1.gz man/man1/mformat.1.gz man/man1/minfo.1.gz man/man1/mkmanifest.1.gz man/man1/mlabel.1.gz man/man1/mmd.1.gz man/man1/mmount.1.gz man/man1/mmove.1.gz man/man1/mpartition.1.gz man/man1/mrd.1.gz man/man1/mren.1.gz man/man1/mshowfat.1.gz man/man1/mtools.1.gz man/man1/mtoolstest.1.gz man/man1/mtype.1.gz man/man1/mzip.1.gz +man/man1/mshortname.1.gz man/man5/mtools.5.gz @sample etc/mtools.conf.sample