svn commit: r561618 - in head/emulators/mtools: . files
Steven Kreuzer
skreuzer at FreeBSD.org
Fri Jan 15 01:09:26 UTC 2021
Author: skreuzer
Date: Fri Jan 15 01:09:24 2021
New Revision: 561618
URL: https://svnweb.freebsd.org/changeset/ports/561618
Log:
Update to 4.0.26
PR: 252531
Submitted by: Mara Sophie Grosch <littlefox at lf-net.org>
Added:
head/emulators/mtools/files/patch-Makefile.in (contents, props changed)
head/emulators/mtools/files/patch-configure (contents, props changed)
head/emulators/mtools/files/patch-mtools.texi (contents, props changed)
head/emulators/mtools/files/patch-scsi.c (contents, props changed)
Deleted:
head/emulators/mtools/files/patch-2
head/emulators/mtools/files/patch-a
head/emulators/mtools/files/patch-c
head/emulators/mtools/files/patch-f
head/emulators/mtools/files/patch-g
Modified:
head/emulators/mtools/Makefile
head/emulators/mtools/distinfo
head/emulators/mtools/pkg-plist
Modified: head/emulators/mtools/Makefile
==============================================================================
--- head/emulators/mtools/Makefile Fri Jan 15 01:05:21 2021 (r561617)
+++ head/emulators/mtools/Makefile Fri Jan 15 01:09:24 2021 (r561618)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mtools
-PORTVERSION= 4.0.10
-PORTREVISION= 6
+PORTVERSION= 4.0.26
CATEGORIES= emulators
MASTER_SITES= GNU
Modified: head/emulators/mtools/distinfo
==============================================================================
--- head/emulators/mtools/distinfo Fri Jan 15 01:05:21 2021 (r561617)
+++ head/emulators/mtools/distinfo Fri Jan 15 01:09:24 2021 (r561618)
@@ -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
Added: head/emulators/mtools/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mtools/files/patch-Makefile.in Fri Jan 15 01:09:24 2021 (r561618)
@@ -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)
Added: head/emulators/mtools/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mtools/files/patch-configure Fri Jan 15 01:09:24 2021 (r561618)
@@ -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
Added: head/emulators/mtools/files/patch-mtools.texi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mtools/files/patch-mtools.texi Fri Jan 15 01:09:24 2021 (r561618)
@@ -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
+
+
Added: head/emulators/mtools/files/patch-scsi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mtools/files/patch-scsi.c Fri Jan 15 01:09:24 2021 (r561618)
@@ -0,0 +1,29 @@
+--- scsi.c.orig 2018-12-02 16:23:26 UTC
++++ scsi.c
+@@ -62,7 +62,7 @@
+ #include <sys/scsicmd.h>
+ #endif
+
+-#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2)
++#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3)
+ #include <camlib.h>
+ #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;
Modified: head/emulators/mtools/pkg-plist
==============================================================================
--- head/emulators/mtools/pkg-plist Fri Jan 15 01:05:21 2021 (r561617)
+++ head/emulators/mtools/pkg-plist Fri Jan 15 01:09:24 2021 (r561618)
@@ -29,6 +29,7 @@ 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
@@ -56,5 +57,6 @@ 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
More information about the svn-ports-all
mailing list