Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Stuart Henderson wrote (2023-10-21 11:41 CEST): > I'd probably go with this, there doesn't seem any need to install two > copies of the same sample files. Sure, having the files can be a hint that these can be edited. But it's okay to leave them out. I'll commit your diff. > Index: Makefile > === > RCS file: /cvs/ports/sysutils/detox/Makefile,v > retrieving revision 1.6 > diff -u -p -r1.6 Makefile > --- Makefile 27 Sep 2023 17:16:24 - 1.6 > +++ Makefile 21 Oct 2023 09:40:15 - > @@ -1,19 +1,18 @@ > COMMENT =utility designed to clean up filenames > > -DISTNAME = detox-1.2.0 > +V = 1.4.5 > +DISTNAME = detox-${V} > > CATEGORIES = sysutils > > -HOMEPAGE = http://detox.sourceforge.net/ > +HOMEPAGE = https://github.com/dharple/detox > > #BSD > PERMIT_PACKAGE = Yes > > WANTLIB += c > > -SITES = ${SITE_SOURCEFORGE:=detox/} > - > -EXTRACT_SUFX = .tar.bz2 > +SITES = ${HOMEPAGE}/releases/download/v${V}/ > > USE_GMAKE = Yes > > @@ -21,16 +20,6 @@ CONFIGURE_STYLE = gnu > > NO_TEST =Yes > > -do-install: > - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox > - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox > - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin > - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin > - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1 > - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5 > - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5 > - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox > - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox > - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox > +FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/detox > > .include > Index: distinfo > === > RCS file: /cvs/ports/sysutils/detox/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 18 Jan 2015 03:15:09 - 1.2 > +++ distinfo 21 Oct 2023 09:40:15 - > @@ -1,2 +1,2 @@ > -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g= > -SIZE (detox-1.2.0.tar.bz2) = 86118 > +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw= > +SIZE (detox-1.4.5.tar.gz) = 147196 > Index: pkg/PLIST > === > RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pkg/PLIST 11 Mar 2022 19:57:20 - 1.2 > +++ pkg/PLIST 21 Oct 2023 09:40:15 - > @@ -1,11 +1,19 @@ > @bin bin/detox > @bin bin/inline-detox > @man man/man1/detox.1 > +@man man/man1/inline-detox.1 > @man man/man5/detox.tbl.5 > @man man/man5/detoxrc.5 > share/detox/ > share/detox/iso8859_1.tbl > +@comment share/detox/iso8859_1.tbl.sample > +share/detox/safe.tbl > +@comment share/detox/safe.tbl.sample > share/detox/unicode.tbl > +@comment share/detox/unicode.tbl.sample > +share/doc/detox/ > +share/doc/detox/README.md > share/examples/detox/ > share/examples/detox/detoxrc > @sample ${SYSCONFDIR}/detoxrc > +@comment share/examples/detox/detoxrc.sample >
Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
I'd probably go with this, there doesn't seem any need to install two copies of the same sample files. Index: Makefile === RCS file: /cvs/ports/sysutils/detox/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile27 Sep 2023 17:16:24 - 1.6 +++ Makefile21 Oct 2023 09:40:15 - @@ -1,19 +1,18 @@ COMMENT = utility designed to clean up filenames -DISTNAME = detox-1.2.0 +V =1.4.5 +DISTNAME = detox-${V} CATEGORIES = sysutils -HOMEPAGE = http://detox.sourceforge.net/ +HOMEPAGE = https://github.com/dharple/detox #BSD PERMIT_PACKAGE = Yes WANTLIB += c -SITES =${SITE_SOURCEFORGE:=detox/} - -EXTRACT_SUFX = .tar.bz2 +SITES =${HOMEPAGE}/releases/download/v${V}/ USE_GMAKE =Yes @@ -21,16 +20,6 @@ CONFIGURE_STYLE =gnu NO_TEST = Yes -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5 - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox +FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/detox .include Index: distinfo === RCS file: /cvs/ports/sysutils/detox/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo18 Jan 2015 03:15:09 - 1.2 +++ distinfo21 Oct 2023 09:40:15 - @@ -1,2 +1,2 @@ -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g= -SIZE (detox-1.2.0.tar.bz2) = 86118 +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw= +SIZE (detox-1.4.5.tar.gz) = 147196 Index: pkg/PLIST === RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 11 Mar 2022 19:57:20 - 1.2 +++ pkg/PLIST 21 Oct 2023 09:40:15 - @@ -1,11 +1,19 @@ @bin bin/detox @bin bin/inline-detox @man man/man1/detox.1 +@man man/man1/inline-detox.1 @man man/man5/detox.tbl.5 @man man/man5/detoxrc.5 share/detox/ share/detox/iso8859_1.tbl +@comment share/detox/iso8859_1.tbl.sample +share/detox/safe.tbl +@comment share/detox/safe.tbl.sample share/detox/unicode.tbl +@comment share/detox/unicode.tbl.sample +share/doc/detox/ +share/doc/detox/README.md share/examples/detox/ share/examples/detox/detoxrc @sample ${SYSCONFDIR}/detoxrc +@comment share/examples/detox/detoxrc.sample
Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Rafael Sadowski wrote (2023-10-21 10:28 CEST): > On Sat Oct 21, 2023 at 10:15:42AM +0200, Stefan Hagen wrote: > > Ray Kohler wrote (2023-10-20 20:12 CEST): > > > This software moved to https://github.com/dharple/detox a while ago > > > and development restarted.The old site (still around) is still listed > > > in the package DESCR, which surely made it easy to miss the new > > > versions. I haven't tried to build it myself. > > > > Here is an update to detox 1.4.5 from the new upstream site. > > Changes: https://github.com/dharple/detox/releases > > > > Comments/OK? > > > > - Stefan > > > > Index: sysutils/detox/Makefile > > === > > RCS file: /cvs/ports/sysutils/detox/Makefile,v > > retrieving revision 1.6 > > diff -u -p -u -p -r1.6 Makefile > > --- sysutils/detox/Makefile 27 Sep 2023 17:16:24 - 1.6 > > +++ sysutils/detox/Makefile 21 Oct 2023 08:14:14 - > > @@ -1,19 +1,18 @@ > > COMMENT = utility designed to clean up filenames > > > > -DISTNAME = detox-1.2.0 > > +V =1.4.5 > > +DISTNAME = detox-${V} > > > > CATEGORIES = sysutils > > > > -HOMEPAGE = http://detox.sourceforge.net/ > > +HOMEPAGE = https://github.com/dharple/detox > > > > #BSD > > PERMIT_PACKAGE = Yes > > > > WANTLIB += c > > > > -SITES =${SITE_SOURCEFORGE:=detox/} > > - > > -EXTRACT_SUFX = .tar.bz2 > > +SITES =${HOMEPAGE}/releases/download/v${V}/ > > > > USE_GMAKE =Yes > > > > @@ -21,16 +20,10 @@ CONFIGURE_STYLE = gnu > > > > NO_TEST = Yes > > > > -do-install: > > +post-install: > > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox > > - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox > > - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin > > - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin > > - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1 > > - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5 > > - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5 > > - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox > > - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox > > - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox > > + mv ${WRKINST}/etc/detoxrc{,.sample} ${PREFIX}/share/examples/detox/ > > + mv ${PREFIX}/share/detox/{iso8859_1.tbl,safe.tbl,unicode.tbl}.sample \ > > + ${PREFIX}/share/examples/detox/ > > > > .include > > Index: sysutils/detox/distinfo > > === > > RCS file: /cvs/ports/sysutils/detox/distinfo,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 distinfo > > --- sysutils/detox/distinfo 18 Jan 2015 03:15:09 - 1.2 > > +++ sysutils/detox/distinfo 21 Oct 2023 08:14:14 - > > @@ -1,2 +1,2 @@ > > -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g= > > -SIZE (detox-1.2.0.tar.bz2) = 86118 > > +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw= > > +SIZE (detox-1.4.5.tar.gz) = 147196 > > Index: sysutils/detox/pkg/PLIST > > === > > RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 PLIST > > --- sysutils/detox/pkg/PLIST11 Mar 2022 19:57:20 - 1.2 > > +++ sysutils/detox/pkg/PLIST21 Oct 2023 08:14:14 - > > @@ -1,11 +1,19 @@ > > @bin bin/detox > > @bin bin/inline-detox > > @man man/man1/detox.1 > > +@man man/man1/inline-detox.1 > > @man man/man5/detox.tbl.5 > > @man man/man5/detoxrc.5 > > share/detox/ > > share/detox/iso8859_1.tbl > > +share/detox/safe.tbl > > share/detox/unicode.tbl > > +share/doc/detox/ > > +share/doc/detox/README.md > > share/examples/detox/ > > share/examples/detox/detoxrc > > @sample ${SYSCONFDIR}/detoxrc > > +share/examples/detox/detoxrc.sample > > I think this is still missing, isn't it? > > @sample ${SYSCONFDIR}/detoxrc/detoxrc.sample ? Only detoxrc should go to ${SYSCONFDIR}. > > +share/examples/detox/iso8859_1.tbl.sample > @sample ${SYSCONFDIR}/detoxrc/... ? The .sample files are usually installed to share/detox/ next to the default .tbl files. If a customized .tbl file should be used, the path is configured in detoxrc. They're not searched for in /etc (imo). See detoxrc(5) iso8859_1 {filename "/path/to/filename";}; The .sample files can stay in examples/. > > +share/examples/detox/safe.tbl.sample > > +share/examples/detox/unicode.tbl.sample
Re: [update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
On Sat Oct 21, 2023 at 10:15:42AM +0200, Stefan Hagen wrote: > Ray Kohler wrote (2023-10-20 20:12 CEST): > > This software moved to https://github.com/dharple/detox a while ago > > and development restarted.The old site (still around) is still listed > > in the package DESCR, which surely made it easy to miss the new > > versions. I haven't tried to build it myself. > > Here is an update to detox 1.4.5 from the new upstream site. > Changes: https://github.com/dharple/detox/releases > > Comments/OK? > > - Stefan > > Index: sysutils/detox/Makefile > === > RCS file: /cvs/ports/sysutils/detox/Makefile,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 Makefile > --- sysutils/detox/Makefile 27 Sep 2023 17:16:24 - 1.6 > +++ sysutils/detox/Makefile 21 Oct 2023 08:14:14 - > @@ -1,19 +1,18 @@ > COMMENT =utility designed to clean up filenames > > -DISTNAME = detox-1.2.0 > +V = 1.4.5 > +DISTNAME = detox-${V} > > CATEGORIES = sysutils > > -HOMEPAGE = http://detox.sourceforge.net/ > +HOMEPAGE = https://github.com/dharple/detox > > #BSD > PERMIT_PACKAGE = Yes > > WANTLIB += c > > -SITES = ${SITE_SOURCEFORGE:=detox/} > - > -EXTRACT_SUFX = .tar.bz2 > +SITES = ${HOMEPAGE}/releases/download/v${V}/ > > USE_GMAKE = Yes > > @@ -21,16 +20,10 @@ CONFIGURE_STYLE = gnu > > NO_TEST =Yes > > -do-install: > +post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox > - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox > - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin > - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin > - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1 > - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5 > - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5 > - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox > - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox > - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox > + mv ${WRKINST}/etc/detoxrc{,.sample} ${PREFIX}/share/examples/detox/ > + mv ${PREFIX}/share/detox/{iso8859_1.tbl,safe.tbl,unicode.tbl}.sample \ > + ${PREFIX}/share/examples/detox/ > > .include > Index: sysutils/detox/distinfo > === > RCS file: /cvs/ports/sysutils/detox/distinfo,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 distinfo > --- sysutils/detox/distinfo 18 Jan 2015 03:15:09 - 1.2 > +++ sysutils/detox/distinfo 21 Oct 2023 08:14:14 - > @@ -1,2 +1,2 @@ > -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g= > -SIZE (detox-1.2.0.tar.bz2) = 86118 > +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw= > +SIZE (detox-1.4.5.tar.gz) = 147196 > Index: sysutils/detox/pkg/PLIST > === > RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 PLIST > --- sysutils/detox/pkg/PLIST 11 Mar 2022 19:57:20 - 1.2 > +++ sysutils/detox/pkg/PLIST 21 Oct 2023 08:14:14 - > @@ -1,11 +1,19 @@ > @bin bin/detox > @bin bin/inline-detox > @man man/man1/detox.1 > +@man man/man1/inline-detox.1 > @man man/man5/detox.tbl.5 > @man man/man5/detoxrc.5 > share/detox/ > share/detox/iso8859_1.tbl > +share/detox/safe.tbl > share/detox/unicode.tbl > +share/doc/detox/ > +share/doc/detox/README.md > share/examples/detox/ > share/examples/detox/detoxrc > @sample ${SYSCONFDIR}/detoxrc > +share/examples/detox/detoxrc.sample I think this is still missing, isn't it? @sample ${SYSCONFDIR}/detoxrc/detoxrc.sample ? > +share/examples/detox/iso8859_1.tbl.sample @sample ${SYSCONFDIR}/detoxrc/... ? > +share/examples/detox/safe.tbl.sample > +share/examples/detox/unicode.tbl.sample >
[update] sysutils/detox 1.2.0 to 1.4.5 (was: sysutils/detox years out of date)
Ray Kohler wrote (2023-10-20 20:12 CEST): > This software moved to https://github.com/dharple/detox a while ago > and development restarted.The old site (still around) is still listed > in the package DESCR, which surely made it easy to miss the new > versions. I haven't tried to build it myself. Here is an update to detox 1.4.5 from the new upstream site. Changes: https://github.com/dharple/detox/releases Comments/OK? - Stefan Index: sysutils/detox/Makefile === RCS file: /cvs/ports/sysutils/detox/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- sysutils/detox/Makefile 27 Sep 2023 17:16:24 - 1.6 +++ sysutils/detox/Makefile 21 Oct 2023 08:14:14 - @@ -1,19 +1,18 @@ COMMENT = utility designed to clean up filenames -DISTNAME = detox-1.2.0 +V =1.4.5 +DISTNAME = detox-${V} CATEGORIES = sysutils -HOMEPAGE = http://detox.sourceforge.net/ +HOMEPAGE = https://github.com/dharple/detox #BSD PERMIT_PACKAGE = Yes WANTLIB += c -SITES =${SITE_SOURCEFORGE:=detox/} - -EXTRACT_SUFX = .tar.bz2 +SITES =${HOMEPAGE}/releases/download/v${V}/ USE_GMAKE =Yes @@ -21,16 +20,10 @@ CONFIGURE_STYLE = gnu NO_TEST = Yes -do-install: +post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/detox - ${INSTALL_DATA_DIR} ${PREFIX}/share/detox - ${INSTALL_PROGRAM} ${WRKBUILD}/detox ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKBUILD}/inline-detox ${PREFIX}/bin - ${INSTALL_MAN} ${WRKBUILD}/detox.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKBUILD}/detoxrc.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKBUILD}/detox.tbl.5 ${PREFIX}/man/man5 - ${INSTALL_DATA} ${WRKBUILD}/detoxrc ${PREFIX}/share/examples/detox - ${INSTALL_DATA} ${WRKBUILD}/iso8859_1.tbl ${PREFIX}/share/detox - ${INSTALL_DATA} ${WRKBUILD}/unicode.tbl ${PREFIX}/share/detox + mv ${WRKINST}/etc/detoxrc{,.sample} ${PREFIX}/share/examples/detox/ + mv ${PREFIX}/share/detox/{iso8859_1.tbl,safe.tbl,unicode.tbl}.sample \ + ${PREFIX}/share/examples/detox/ .include Index: sysutils/detox/distinfo === RCS file: /cvs/ports/sysutils/detox/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- sysutils/detox/distinfo 18 Jan 2015 03:15:09 - 1.2 +++ sysutils/detox/distinfo 21 Oct 2023 08:14:14 - @@ -1,2 +1,2 @@ -SHA256 (detox-1.2.0.tar.bz2) = q/rZDufT4PxTzjudoyU/moAM3ZLj+MwSoZOUp7Hc2/g= -SIZE (detox-1.2.0.tar.bz2) = 86118 +SHA256 (detox-1.4.5.tar.gz) = uKDtgw8wVPvgl3HSuO2K42Z1KWeMGnPrjlEmk+jHTTw= +SIZE (detox-1.4.5.tar.gz) = 147196 Index: sysutils/detox/pkg/PLIST === RCS file: /cvs/ports/sysutils/detox/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- sysutils/detox/pkg/PLIST11 Mar 2022 19:57:20 - 1.2 +++ sysutils/detox/pkg/PLIST21 Oct 2023 08:14:14 - @@ -1,11 +1,19 @@ @bin bin/detox @bin bin/inline-detox @man man/man1/detox.1 +@man man/man1/inline-detox.1 @man man/man5/detox.tbl.5 @man man/man5/detoxrc.5 share/detox/ share/detox/iso8859_1.tbl +share/detox/safe.tbl share/detox/unicode.tbl +share/doc/detox/ +share/doc/detox/README.md share/examples/detox/ share/examples/detox/detoxrc @sample ${SYSCONFDIR}/detoxrc +share/examples/detox/detoxrc.sample +share/examples/detox/iso8859_1.tbl.sample +share/examples/detox/safe.tbl.sample +share/examples/detox/unicode.tbl.sample
sysutils/detox years out of date
This software moved to https://github.com/dharple/detox a while ago and development restarted.The old site (still around) is still listed in the package DESCR, which surely made it easy to miss the new versions. I haven't tried to build it myself.