CVS commit: pkgsrc/sysutils/sformat

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/sformat
From: "Michael Baeuerle" <micha%netbsd.org@localhost>
Date: Fri, 21 Apr 2023 14:01:42 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Apr 21 14:01:42 UTC 2023

Modified Files:
        pkgsrc/sysutils/sformat: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/sformat/patches: patch-sformat_datio.c
            patch-sformat_sformat.1
Removed Files:
        pkgsrc/sysutils/sformat/patches: patch-RULES_rules1_dir patch-aa
            patch-include_schily_h patch-lib_stdio_fgetline_c
            patch-libscg_scsitransp_c patch-sformat_defect_c
            patch-sformat_diskfmt_c patch-sformat_io_c
            patch-sformat_makelabel_c

Log Message:
sysutils/sformat: Update to 3.7

Reset maintainer (e-Mail address no longer valid).
Switch to schilytools release.

AN-2023-04-19:
- libschily: no longer provide the symbols fgetline, getline.
  libschily used to provide these symbols as alternative names for
  js_getline and js_fgetline for compatibility with UNOS.  As
  their POSIX-incompatible signature causes problems when linking
  against musl statically, we now no longer provide these symbols
  by default.  Users wishing to restore the old behaviour should
  remove -DNO_GETLINE_COMPAT from CPPOPTS when compiling libschily.

- libschily: accordingly, the man pages getline(3) and fgetline(3)
  have been renamed to js_getline(3) and js_fgetline(3).

- RULES: fix HCC_COM expansion when CCOM=clang.  This fixes builds
  with GNU make when CCOM=clang.
  Submitted by: Nico Sonack.

AN-2021-09-01:
- sformat: Added support for gettext() based translations
  The string "Jörg Schilling" is now separate and in a gettext() call.

AN-2021-07-29:
- sformat: changed open(..., 0) -> open(..., O_RDONLY) for z/OS

  Thanks to a report from Matthew R. Wilson

- sformat:checkmount.c: did use HAVE_SYS_MNTENT_H instead of
  HAVE_SYS_MNTTAB_H as a result of a typo that was introduced with
  the code to #include <sys/mnttab.h>.

  Thanks to a report from Matthew R. Wilson

AN-2018-10-30:
- libschily: ovstrcpy() from various programs has been moved to libschily.
  This affects smake, mkisofs, patch, ved, count, sformat

AN-2018-05-25:
- sformat: The man page used .cs that dos not work with GNU troff because
  of a GNU troff bug. We no longer use this command for nroff. Note that
  the GNU troff bug still applies if you try to print the man page.

- sformat: History and Download sections have been added to the man page

AN-2018-03-01:
- sformat: A new option -randv has been added. This option behaves
  similar to -randrw but does not write to the disk and thus is less
  harmful to already impaired disks.

- sformat: The random tests now use drand48(). This is needed in order
  to get a sufficient coverage for modern large disks.

AN-2017-09-25:
- Sformat: The terminating condition for a manual sector size
  question for Adaptec controllers has been corrected.

AN-2016-01-25:
- sformat: A new option scgopts=list has been introduced.

AN-2015-11-26:
- sformat: diskfmt.c now casts a computation to always result in a long long
  printf() argument.

AN-2015-11-21:
- sformat: fixed a printf() format size problem on Minix3 32 bits.
  Thanks to Heiko Eißfeldt for reporting.

AN-2013-05-10
- Include file reordering in sformat to avoid warnings on older platforms

AN-2011-08-29:
- sformat(1) now compiles and works on Win-DOS using the Microsoft compiler.

AN-2011-08-10:
- sformat now only sets up signal handlers for existing signals to support MSC

AN-2009-12-29:
- [...]
  sformat/datio.c:
  [...]
  Do no longer shorten strings using strcpy()/wcscpy() as newer POSIX
  versions claim that overlapping buffers cause undefined.
  results and as the Solaris 64 bit libc starting with Build 125,.
  implements strcpy() using SSE instructions and thus fails with
  overlapping strings.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/sformat/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/sformat/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/sformat/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/sformat/patches/patch-RULES_rules1_dir \
    pkgsrc/sysutils/sformat/patches/patch-aa \
    pkgsrc/sysutils/sformat/patches/patch-lib_stdio_fgetline_c \
    pkgsrc/sysutils/sformat/patches/patch-libscg_scsitransp_c \
    pkgsrc/sysutils/sformat/patches/patch-sformat_defect_c \
    pkgsrc/sysutils/sformat/patches/patch-sformat_diskfmt_c \
    pkgsrc/sysutils/sformat/patches/patch-sformat_io_c \
    pkgsrc/sysutils/sformat/patches/patch-sformat_makelabel_c
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/sformat/patches/patch-include_schily_h
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/sformat/patches/patch-sformat_datio.c \
    pkgsrc/sysutils/sformat/patches/patch-sformat_sformat.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/sformat/Makefile
diff -u pkgsrc/sysutils/sformat/Makefile:1.18 pkgsrc/sysutils/sformat/Makefile:1.19
--- pkgsrc/sysutils/sformat/Makefile:1.18       Sat Aug 19 00:25:19 2017
+++ pkgsrc/sysutils/sformat/Makefile    Fri Apr 21 14:01:41 2023
@@ -1,46 +1,53 @@
-# $NetBSD: Makefile,v 1.18 2017/08/19 00:25:19 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.19 2023/04/21 14:01:41 micha Exp $
 
-DISTNAME=      sformat-3.5
-PKGREVISION=   1
+DISTNAME=      2023-04-19
+PKGNAME=       sformat-3.7
 CATEGORIES=    sysutils
-MASTER_SITES=  ftp://ftp.berlios.de/pub/sformat/
+MASTER_SITES=  https://codeberg.org/schilytools/schilytools/archive/
+DIST_SUBDIR=   schilytools
 
-MAINTAINER=    Andreas.Hallmann%tiscali.de@localhost
-HOMEPAGE=      http://freshmeat.net/projects/sformat
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://codeberg.org/schilytools/schilytools/
 COMMENT=       SCSI disk maintainance, formating, and ultimative repair tool
+LICENSE=       cddl-1.0
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=            gmake
-TBL?=                  tbl
-
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+=     ARCH=""
-MAKE_ENV+=     MAKEPROG="gmake"
-MAKE_ENV+=     COPTX=${CFLAGS:M*:Q}
-MAKE_ENV+=     LDOPTX=${LDFLAGS:M*:Q}
-
-# Override settings in Makefiles by passing additional settings
-# on the command-line.
-#
-MAKE_FLAGS+=   INS_BASE=${DESTDIR}${LOCALBASE:Q}
-MAKE_FLAGS+=   MANDIR=${PKGMANDIR:Q}
-
-# if we're using a gcc which is named gcc, we need to set CCOM=gcc
-# in MAKE_ENV so the make infrastructure picks the right options.
-.if !empty(CC:M*gcc*)
-MAKE_ENV+=     CCOM="gcc"
-.endif
-
-INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-
-post-extract:
-       ${CP} ${WRKSRC}/RULES/os-freebsd.id ${WRKSRC}/RULES/os-dragonfly.id
-       ${CP} ${WRKSRC}/RULES/os-freebsd.def ${WRKSRC}/RULES/os-dragonfly.def
-.for x in amd64 macppc
-       ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/${x}-netbsd-cc.rul
-       ln -s i386-netbsd-cc.rul ${WRKSRC}/RULES/${x}-netbsd-gcc.rul
-.endfor
+TOOL_DEPENDS+= smake>=1.7:../../devel/smake
+SMAKE=         MAKEFLAGS= smake
+MAKE_FLAGS+=   DESTDIR=${DESTDIR} INS_BASE=${PREFIX} DEFMANBASE=. MANDIR=${PKGMANDIR}
+# Honor CPPFLAGS, CFLAGS and LDFLAGS
+MAKE_FLAGS+=   CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
+
+SFORMAT_DB=    ${PKG_SYSCONFDIR}/sformat.dat
+CONF_FILES=    ${PREFIX}/share/examples/sformat/sformat.dat ${SFORMAT_DB}
+SPECIAL_PERMS+=        ${PREFIX}/share/examples/sformat/sformat.dat ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
+AUTO_MKDIRS=   yes
+
+# Configure config file location
+SUBST_CLASSES+=                fix
+SUBST_STAGE.fix=       pre-configure
+SUBST_FILES.fix+=      sformat/datio.c
+SUBST_FILES.fix+=      sformat/sformat.1
+SUBST_SED.fix=         -e "s,@PKGSRC_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
+SUBST_MESSAGE.fix=     Replace database file path.
+
+# Shared platform specific code for schilytools (provided by smake package)
+.include "../../devel/smake/Makefile.common"
+
+do-configure:
+       cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
+
+do-build:
+       cd ${WRKSRC} && for library in libschily libscg;                \
+       do                                                              \
+               cd ${WRKSRC}/$${library} && ${SMAKE} ${MAKE_FLAGS};     \
+       done
+       cd ${WRKSRC}/sformat && ${SMAKE} ${MAKE_FLAGS}
+
+do-install:
+       cd ${WRKSRC}/sformat && ${SMAKE} ${MAKE_FLAGS} install
+       ${INSTALL_DATA} ${WRKSRC}/sformat/sformat.dat                   \
+               ${DESTDIR}${PREFIX}/share/examples/sformat/sformat.dat
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/sformat/PLIST
diff -u pkgsrc/sysutils/sformat/PLIST:1.1.1.1 pkgsrc/sysutils/sformat/PLIST:1.2
--- pkgsrc/sysutils/sformat/PLIST:1.1.1.1       Thu Dec  2 10:08:03 2004
+++ pkgsrc/sysutils/sformat/PLIST       Fri Apr 21 14:01:41 2023
@@ -1,13 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/02 10:08:03 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/04/21 14:01:41 micha Exp $
 bin/sformat
-etc/sformat.dat
-include/align.h
-include/avoffset.h
-lib/libdeflt.a
-lib/librscg.a
-lib/libscg.a
-lib/libschily.a
-man/man5/makefiles.5
-man/man5/makerules.5
 man/man8/sformat.8
-sbin/rscsi
+share/examples/sformat/sformat.dat

Index: pkgsrc/sysutils/sformat/distinfo
diff -u pkgsrc/sysutils/sformat/distinfo:1.8 pkgsrc/sysutils/sformat/distinfo:1.9
--- pkgsrc/sysutils/sformat/distinfo:1.8        Tue Oct 26 11:20:12 2021
+++ pkgsrc/sysutils/sformat/distinfo    Fri Apr 21 14:01:41 2023
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:20:12 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/04/21 14:01:41 micha Exp $
 
-BLAKE2s (sformat-3.5.tar.gz) = 4c61c2bd5aa4e66b7199fe2669e255a35fb96bc66ca53b2b131f932873928c56
-SHA512 (sformat-3.5.tar.gz) = 6dc90e16d396165625816cb5e7252772ed92e9a06aeac49e10c642886491dd9a7eb3f60b60d584e952d23704a175333a8c8fb2b93fa8d3b447f60d555b048fa3
-Size (sformat-3.5.tar.gz) = 526375 bytes
-SHA1 (patch-RULES_rules1_dir) = 25b5f88d65b4d8265417bc97cee63f6346e3b008
-SHA1 (patch-aa) = e398bc734a7bc48668a0b61d3535c0d87b1a4ccf
-SHA1 (patch-include_schily_h) = 56eb9cf6f87623bcca5d4d83ab27deeee237bc07
-SHA1 (patch-lib_stdio_fgetline_c) = 0d9aacf5cebc70522b085d71ef90f9665d8c5d6a
-SHA1 (patch-libscg_scsitransp_c) = 889ec76b497782ffd42ef13214f0e1ab3187ceaf
-SHA1 (patch-sformat_defect_c) = 20ba1dfd1f671e216fd04e8dfbf02e6ca605ebf3
-SHA1 (patch-sformat_diskfmt_c) = bd86beb7d9590c32c75c158c9fb13cff8d60a3e3
-SHA1 (patch-sformat_io_c) = a0a27221e7151feac100c7fc3eb567f4555a6e1b
-SHA1 (patch-sformat_makelabel_c) = 84bbf9666fdabbcd65476a2e0389169723252327
+BLAKE2s (schilytools/2023-04-19.tar.gz) = 61bd4ce5c989eacd5ffffc8e6dd5435ba3594573c310405f2ff78bd52194b1e6
+SHA512 (schilytools/2023-04-19.tar.gz) = 79e5d59ad84fefd32b689dc60db42cb522bfb2c544e7f5b8c2b85c3597c758519071ec043532d3e9e8b745bf4ff1ad32b4e1103eaac391282435e42a2ef94de5
+Size (schilytools/2023-04-19.tar.gz) = 5896292 bytes
+SHA1 (patch-sformat_datio.c) = d1e1a8fa8906f69ae183fcee07a0d2d695c0e015
+SHA1 (patch-sformat_sformat.1) = bd125a26de0412af23198eb26419ac8333ab6a2f

Added files:

Index: pkgsrc/sysutils/sformat/patches/patch-sformat_datio.c
diff -u /dev/null pkgsrc/sysutils/sformat/patches/patch-sformat_datio.c:1.1
--- /dev/null   Fri Apr 21 14:01:42 2023
+++ pkgsrc/sysutils/sformat/patches/patch-sformat_datio.c       Fri Apr 21 14:01:42 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-sformat_datio.c,v 1.1 2023/04/21 14:01:42 micha Exp $
+
+Search database only in current directory and PKG_SYSCONFDIR
+
+--- sformat/datio.c.orig       2023-01-12 14:25:40.000000000 +0000
++++ sformat/datio.c
+@@ -79,12 +79,7 @@ EXPORT      int     datfileerr      __PR((char *, ...)
+ 
+ char  *datpath[] = {
+               "",
+-              "/opt/schily/etc/",
+-              "/usr/bert/etc/",
+-              "/etc/",
+-              "/usr/etc/",
+-              "/opt/csw/etc/",
+-              "/opt/schily/etc/",
++              "@PKGSRC_SYSCONFDIR@/",
+               NULL
+       };
+ 
Index: pkgsrc/sysutils/sformat/patches/patch-sformat_sformat.1
diff -u /dev/null pkgsrc/sysutils/sformat/patches/patch-sformat_sformat.1:1.1
--- /dev/null   Fri Apr 21 14:01:42 2023
+++ pkgsrc/sysutils/sformat/patches/patch-sformat_sformat.1     Fri Apr 21 14:01:42 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-sformat_sformat.1,v 1.1 2023/04/21 14:01:42 micha Exp $
+
+Search database only in current directory and PKG_SYSCONFDIR
+
+--- sformat/sformat.1.orig     2023-01-30 14:39:40.055988371 +0000
++++ sformat/sformat.1
+@@ -157,7 +157,7 @@ If no file of the appropriate name was f
+ .B sformat
+ looks in the following path:
+ .br
+-.I /opt schily/etc,  /etc,  /usr/etc.
++.I @PKGSRC_SYSCONFDIR@.
+ .br
+ .ne 3
+ .TP
+@@ -1370,7 +1370,7 @@ the end of this partition and the end of
+ .SH FILES
+ .PP
+ .TP 20
+-.B /opt/schily/etc/sformat.dat
++.B @PKGSRC_SYSCONFDIR@/sformat.dat
+ A database with mode pages and disk partitions for disks.
+ .\" .SH "SEE ALSO"
+ .\" .SH DIAGNOSTICS

Prev by Date: CVS commit: pkgsrc/www/apache24
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www/apache24
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index