diff options
author | wiz <wiz> | 2007-12-09 23:38:21 +0000 |
---|---|---|
committer | wiz <wiz> | 2007-12-09 23:38:21 +0000 |
commit | c85f5a935a78b9742f968d642e0294320ab8a462 (patch) | |
tree | b2899967f1d12ff992d1da58efafa7c66c3b9111 /sysutils | |
parent | c29e149e70c73d91fc230ca5356354a97c7e9663 (diff) | |
download | pkgsrc-c85f5a935a78b9742f968d642e0294320ab8a462.tar.gz |
Update to 3.9.11, provided by Sergey Svishchev in private mail:
3.9.11 is mostly a maintenance release which fixes a couple of bugs,
and addresses warnings raised by gcc4, and merges some platform-specific
patches (MingW, NetBSD, Redhat/Fedora, Cygwin, Solaris), and other
patches (such as the new amuFormat.sh written in sh).
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/mtools/Makefile | 11 | ||||
-rw-r--r-- | sysutils/mtools/distinfo | 18 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-aa | 131 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ab | 20 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ad | 13 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-af | 50 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ag | 12 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ah | 13 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ai | 13 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-aj | 14 |
10 files changed, 29 insertions, 266 deletions
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index f4fd1733ffd..53095db9aac 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.40 2007/08/17 20:55:34 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2007/12/09 23:38:21 wiz Exp $ -DISTNAME= mtools-3.9.10 -PKGREVISION= 1 +DISTNAME= mtools-3.9.11 CATEGORIES= sysutils -MASTER_SITES= http://www.tux.org/pub/knaff/mtools/ +MASTER_SITES= http://mtools.linux.lu/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= is@NetBSD.org -HOMEPAGE= http://www.tux.org/pub/knaff/mtools/ +HOMEPAGE= http://mtools.linux.lu/ COMMENT= FAT (MS-DOS, Atari) disk access tools PKG_DESTDIR_SUPPORT= user-destdir @@ -16,7 +15,7 @@ NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem GNU_CONFIGURE= YES USE_TOOLS+= gmake makeinfo -INFO_FILES= # PLIST +INFO_FILES= YES .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo index f5b4bce28a5..aeeb9bc2431 100644 --- a/sysutils/mtools/distinfo +++ b/sysutils/mtools/distinfo @@ -1,15 +1,9 @@ -$NetBSD: distinfo,v 1.12 2007/08/17 20:55:34 joerg Exp $ +$NetBSD: distinfo,v 1.13 2007/12/09 23:38:23 wiz Exp $ -SHA1 (mtools-3.9.10.tar.bz2) = f916e54e1bff599946bb1e72601f99096ea79456 -RMD160 (mtools-3.9.10.tar.bz2) = 566d3f3e3c6201cfe750ba05826f8013778f90b9 -Size (mtools-3.9.10.tar.bz2) = 291876 bytes -SHA1 (patch-aa) = 52a43c817253f278edfa7de5466fb3c559a1e22b -SHA1 (patch-ab) = fde9551dcc19393dfd681d9597c88d1b178620a3 +SHA1 (mtools-3.9.11.tar.bz2) = 783f65ce054a25c29bd36d9862e6cf204955026a +RMD160 (mtools-3.9.11.tar.bz2) = 08c473a941b71df2d5dd8402aaab07aa3d09bd29 +Size (mtools-3.9.11.tar.bz2) = 272714 bytes +SHA1 (patch-aa) = 0979e8007e0ca1b6702aefe62c16b7eb29d5b9a5 +SHA1 (patch-ab) = 053db1130dca004fb3b2ece780f69a7d8c1f30c0 SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e -SHA1 (patch-ad) = d599f6b184c6da84abf4392b44d243b7b62bac3e SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb -SHA1 (patch-af) = 7bb55c2c48987043b18532e56e4236d22342ca60 -SHA1 (patch-ag) = 9f8b3777ba34d986580af3fc9d06b84e5548e6fa -SHA1 (patch-ah) = b43f06d990e029c753659b792c4b8ec17bfbffe5 -SHA1 (patch-ai) = 8cf7cd793645ad16120faf0edd1cff2f7cb50c1c -SHA1 (patch-aj) = 176ebd3c80b9daa65765e939accbbfe31af92b96 diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa index 906f9d2aede..806f4c1ff2c 100644 --- a/sysutils/mtools/patches/patch-aa +++ b/sysutils/mtools/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ +$NetBSD: patch-aa,v 1.11 2007/12/09 23:38:24 wiz Exp $ ---- Makefile.in.orig 2004-02-28 20:06:35.000000000 +0100 +--- Makefile.in.orig 2006-02-28 08:55:15.000000000 +0000 +++ Makefile.in @@ -11,7 +11,6 @@ USERCFLAGS = USERLDFLAGS = @@ -27,125 +27,12 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ 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 -@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html - - # Don't cd, to avoid breaking install-sh references. - install-info: info -- $(top_srcdir)/mkinstalldirs $(infodir) -+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir) - if test -f mtools.info; then \ - for i in mtools.info*; do \ -- $(INSTALL_DATA) $$i $(infodir)/$$i; \ -+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \ - done; \ - else \ - for i in $(srcdir)/mtools.info*; do \ -- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ -+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ - done; \ - fi; \ - if [ -n "$(INSTALL_INFO)" ] ; then \ - if [ -f $(infodir)/dir.info ] ; then \ -- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ -+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \ - fi; \ - if [ -f $(infodir)/dir ] ; then \ -- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ -+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \ - fi; \ - fi - - uninstall-info: - cd $(infodir) && rm -f mtools.info* - --install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \ -- $(bindir)/mkmanifest install-scripts install-info -+install: ${DESTDIR}$(bindir)/mtools @BINFLOPPYD@ install-man install-links \ -+ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info - - uninstall: uninstall-bin uninstall-man uninstall-links \ - uninstall-scripts -@@ -228,52 +228,52 @@ distclean: clean texclean - maintainer-clean: distclean - - --$(bindir)/floppyd: floppyd -- $(top_srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd -- --$(bindir)/floppyd_installtest: floppyd_installtest -- $(top_srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest -- --$(bindir)/mtools: mtools -- $(top_srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) mtools $(bindir)/mtools -- --$(bindir)/mkmanifest: mkmanifest -- $(top_srcdir)/mkinstalldirs $(bindir) -- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest -+${DESTDIR}$(bindir)/floppyd: floppyd -+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) -+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd -+ -+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest -+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) -+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest -+ -+${DESTDIR}$(bindir)/mtools: mtools -+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) -+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools -+ -+${DESTDIR}$(bindir)/mkmanifest: mkmanifest -+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) -+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest - - #$(ETCDIR)/mtools: mtools.etc - # cp mtools.etc $(ETCDIR)/mtools - --install-links: $(bindir)/mtools -+install-links: ${DESTDIR}$(bindir)/mtools - @for j in $(LINKS); do \ -- rm -f $(bindir)/$$j ; \ -- $(LN_S) mtools $(bindir)/$$j ; \ -- echo $(bindir)/$$j ; \ -+ rm -f ${DESTDIR}$(bindir)/$$j ; \ -+ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \ -+ echo ${DESTDIR}$(bindir)/$$j ; \ - done - - ## "z" is the older version of "gz"; the name is just *too* short --install-scripts: $(bindir)/mtools -- @$(top_srcdir)/mkinstalldirs $(bindir) -+install-scripts: ${DESTDIR}$(bindir)/mtools -+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) +@@ -257,7 +257,7 @@ install-links: $(DESTDIR)$(bindir)/mtool + install-scripts: $(DESTDIR)$(bindir)/mtools + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) @for j in $(SCRIPTS) ; do \ -- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \ -- echo $(bindir)/$$j ; \ -+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \ -+ echo ${DESTDIR}$(bindir)/$$j ; \ +- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ ++ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ + echo $(DESTDIR)$(bindir)/$$j ; \ done -- rm -f $(bindir)/lz -- $(LN_S) uz $(bindir)/lz -+ rm -f ${DESTDIR}$(bindir)/lz -+ $(LN_S) uz ${DESTDIR}$(bindir)/lz - - install-man: -- @$(top_srcdir)/mkinstalldirs $(MAN1DIR) -+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR) - @for j in $(MAN1); do \ -- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \ -- echo $(MAN1DIR)/$$j ; \ -+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \ -+ echo ${DESTDIR}$(MAN1DIR)/$$j ; \ - done -- @$(top_srcdir)/mkinstalldirs $(MAN5DIR) -+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR) - @for j in $(MAN5); do \ -- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \ -- echo $(MAN5DIR)/$$j ; \ -+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \ -+ echo ${DESTDIR}$(MAN5DIR)/$$j ; \ - done - - uninstall-bin: + rm -f $(DESTDIR)$(bindir)/lz diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab index 8252983adf1..35626ccd69f 100644 --- a/sysutils/mtools/patches/patch-ab +++ b/sysutils/mtools/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $ +$NetBSD: patch-ab,v 1.10 2007/12/09 23:38:31 wiz Exp $ ---- configure.orig 2005-02-28 23:10:33.000000000 +0100 +--- configure.orig 2006-02-27 16:36:50.000000000 +0000 +++ configure -@@ -5938,7 +5938,7 @@ if [ $host_os3 = hpux ] ; then +@@ -5940,7 +5940,7 @@ if [ $host_os3 = hpux ] ; then fi @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $ LDFLAGS="$LDFLAGS -z" fi -@@ -6221,7 +6221,7 @@ else +@@ -6223,7 +6223,7 @@ else # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $ # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in -@@ -7281,7 +7281,7 @@ fi +@@ -7283,7 +7283,7 @@ fi # Check for libraries that X11R6 Xt/Xaw programs need. ac_save_LDFLAGS=$LDFLAGS @@ -29,18 +29,16 @@ $NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. -@@ -7737,7 +7737,9 @@ if test X$use_floppyd = Xyes; then - exit 1 +@@ -7740,6 +7740,8 @@ if test X$use_floppyd = Xyes; then fi FLOPPYD="floppyd floppyd_installtest" -- BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest" -+ BINFLOPPYD="\${DESTDIR}\$(bindir)/floppyd \${DESTDIR}\$(bindir)/floppyd_installtest" + BINFLOPPYD="\$(DESTDIR)\$(bindir)/floppyd \$(DESTDIR)\$(bindir)/floppyd_installtest" + MANFLOPPYD="floppyd.1" + MANFLOPPYD_INSTTEST="floppyd_installtest.1" cat >>confdefs.h <<\_ACEOF #define USE_FLOPPYD 1 -@@ -7746,6 +7748,8 @@ _ACEOF +@@ -7748,6 +7750,8 @@ _ACEOF else FLOPPYD= BINFLOPPYD= @@ -49,7 +47,7 @@ $NetBSD: patch-ab,v 1.9 2007/08/17 20:55:34 joerg Exp $ fi -@@ -8401,6 +8407,8 @@ s,@X_LIBS@,$X_LIBS,;t t +@@ -8403,6 +8407,8 @@ s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@FLOPPYD@,$FLOPPYD,;t t s,@BINFLOPPYD@,$BINFLOPPYD,;t t diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad deleted file mode 100644 index 498f5974a89..00000000000 --- a/sysutils/mtools/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2005/04/04 08:56:18 adam Exp $ - ---- devices.c.orig 2003-05-24 20:54:27.000000000 +0000 -+++ devices.c -@@ -807,7 +807,7 @@ struct device devices[] = { - #endif /* __FreeBSD__ */ - - /*** /jes -- for ALR 486 DX4/100 ***/ --#if defined(OS_netbsd) -+#if defined(OS_netbsd) || defined(OS_netbsdelf) - #define predefined_devices - struct device devices[] = { - {"/dev/rfd0a", 'A', FHD312}, diff --git a/sysutils/mtools/patches/patch-af b/sysutils/mtools/patches/patch-af deleted file mode 100644 index 91eb84781a3..00000000000 --- a/sysutils/mtools/patches/patch-af +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-af,v 1.2 2006/03/25 19:50:20 joerg Exp $ - ---- init.c.orig 2002-05-01 09:57:02.000000000 +0000 -+++ init.c -@@ -14,9 +14,6 @@ - #include "xdf_io.h" - #include "buffer.h" - --extern int errno; -- -- - #define FULL_CYL - - unsigned int num_clus; /* total number of cluster */ -@@ -27,15 +24,30 @@ unsigned int num_clus; /* total number - */ - static int read_boot(Stream_t *Stream, struct bootsector * boot, int size) - { -+ int rc; -+ char *buf; -+ -+ buf = (char *)boot; -+ - /* read the first sector, or part of it */ - if(!size) - size = BOOTSIZE; -- if(size > 1024) -- size = 1024; - -- if (force_read(Stream, (char *) boot, 0, size) != size) -- return -1; -- return 0; -+ if (size > sizeof(struct bootsector)) { -+ buf = malloc(size); -+ if (!buf) -+ return(-1); -+ } -+ -+ rc = 0; -+ if (force_read(Stream, buf, 0, size) != size) -+ rc = -1; -+ -+ if (buf != (char *)boot) { -+ memcpy(boot, buf, sizeof(struct bootsector)); -+ free(buf); -+ } -+ return rc; - } - - static int fs_flush(Stream_t *Stream) diff --git a/sysutils/mtools/patches/patch-ag b/sysutils/mtools/patches/patch-ag deleted file mode 100644 index f9977d3e41f..00000000000 --- a/sysutils/mtools/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/03/25 19:50:20 joerg Exp $ - ---- sysincludes.h.orig 2006-03-25 18:06:25.000000000 +0000 -+++ sysincludes.h -@@ -221,7 +221,6 @@ extern int ioctl(int fildes, int request - #include <sys/stat.h> - - #include <errno.h> --extern int errno; - - #include <pwd.h> - diff --git a/sysutils/mtools/patches/patch-ah b/sysutils/mtools/patches/patch-ah deleted file mode 100644 index ca5a566807c..00000000000 --- a/sysutils/mtools/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/03/25 19:50:20 joerg Exp $ - ---- mformat.c.orig 2006-03-25 18:10:18.000000000 +0000 -+++ mformat.c -@@ -37,8 +37,6 @@ - #endif - - --extern int errno; -- - static int init_geometry_boot(struct bootsector *boot, struct device *dev, - int sectors0, int rate_0, int rate_any, - unsigned long *tot_sectors, int keepBoot) diff --git a/sysutils/mtools/patches/patch-ai b/sysutils/mtools/patches/patch-ai deleted file mode 100644 index 9df5fb37501..00000000000 --- a/sysutils/mtools/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/10/13 13:04:31 is Exp $ - ---- vfat.c.orig 2005-02-13 15:40:17.000000000 +0100 -+++ vfat.c -@@ -238,7 +238,7 @@ int write_vfat(Stream_t *Dir, char *shor - printf("Wrote checksum=%d for shortname %s.\n", - vse->sum,shortname); - #endif -- num_vses = strlen(longname)/VSE_NAMELEN + 1; -+ num_vses = (strlen(longname) + VSE_NAMELEN - 1)/VSE_NAMELEN; - for (vse_id = num_vses; vse_id; --vse_id) { - int end = 0; - diff --git a/sysutils/mtools/patches/patch-aj b/sysutils/mtools/patches/patch-aj deleted file mode 100644 index bb5d555ffa5..00000000000 --- a/sysutils/mtools/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/10/13 13:04:31 is Exp $ - ---- mk_direntry.c.orig 2005-02-28 00:17:45.000000000 +0100 -+++ mk_direntry.c -@@ -227,7 +227,8 @@ static void clear_scan(char *longname, i - s->free_end = s->got_slots = s->free_start = 0; - - if (use_longname & 1) -- s->size_needed = 2 + (strlen(longname)/VSE_NAMELEN); -+ s->size_needed = 1 + -+ (strlen(longname) + VSE_NAMELEN - 1)/VSE_NAMELEN; - else - s->size_needed = 1; - } |