Skip to content

txt2html: update to 3.0 #27115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

txt2html: update to 3.0 #27115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 38 additions & 23 deletions textproc/txt2html/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in textproc/txt2html/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint txt2html:
Warning: Line 4 contains tab but modeline says tabs should be expanded
Warning: Line 5 contains tab but modeline says tabs should be expanded
Warning: Line 7 contains tab but modeline says tabs should be expanded
Warning: Line 8 contains tab but modeline says tabs should be expanded
Warning: Line 9 contains tab but modeline says tabs should be expanded
Warning: Line 10 contains tab but modeline says tabs should be expanded
Warning: Line 11 contains tab but modeline says tabs should be expanded
Warning: Line 12 contains tab but modeline says tabs should be expanded
Warning: Line 13 contains tab but modeline says tabs should be expanded
Warning: Line 14 contains tab but modeline says tabs should be expanded
Warning: Line 15 contains tab but modeline says tabs should be expanded
Warning: Line 16 contains tab but modeline says tabs should be expanded
Warning: Line 19 contains tab but modeline says tabs should be expanded
Warning: Line 20 contains tab but modeline says tabs should be expanded
Warning: Line 21 contains tab but modeline says tabs should be expanded
Warning: Line 22 contains tab but modeline says tabs should be expanded
Warning: Line 23 contains tab but modeline says tabs should be expanded
Warning: Line 25 contains tab but modeline says tabs should be expanded
Warning: Line 26 contains tab but modeline says tabs should be expanded
Warning: Line 27 contains tab but modeline says tabs should be expanded
Warning: Line 29 contains tab but modeline says tabs should be expanded
Warning: Line 33 contains tab but modeline says tabs should be expanded
Warning: Line 34 contains tab but modeline says tabs should be expanded
Warning: Line 35 contains tab but modeline says tabs should be expanded
Warning: Line 41 contains tab but modeline says tabs should be expanded
Warning: Line 45 contains tab but modeline says tabs should be expanded
Warning: Line 46 contains tab but modeline says tabs should be expanded
Warning: Line 50 contains tab but modeline says tabs should be expanded
Warning: Line 51 contains tab but modeline says tabs should be expanded
Warning: Line 52 contains tab but modeline says tabs should be expanded
Warning: Line 53 contains tab but modeline says tabs should be expanded
Warning: Line 54 contains tab but modeline says tabs should be expanded
Warning: Line 55 contains tab but modeline says tabs should be expanded
Warning: Line 56 contains tab but modeline says tabs should be expanded
Warning: Line 57 has missing newline (at end of file)

Check warning on line 1 in textproc/txt2html/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint txt2html:
Warning: Line 4 contains tab but modeline says tabs should be expanded
Warning: Line 5 contains tab but modeline says tabs should be expanded
Warning: Line 7 contains tab but modeline says tabs should be expanded
Warning: Line 8 contains tab but modeline says tabs should be expanded
Warning: Line 9 contains tab but modeline says tabs should be expanded
Warning: Line 10 contains tab but modeline says tabs should be expanded
Warning: Line 11 contains tab but modeline says tabs should be expanded
Warning: Line 12 contains tab but modeline says tabs should be expanded
Warning: Line 13 contains tab but modeline says tabs should be expanded
Warning: Line 14 contains tab but modeline says tabs should be expanded
Warning: Line 15 contains tab but modeline says tabs should be expanded
Warning: Line 16 contains tab but modeline says tabs should be expanded
Warning: Line 19 contains tab but modeline says tabs should be expanded
Warning: Line 20 contains tab but modeline says tabs should be expanded
Warning: Line 21 contains tab but modeline says tabs should be expanded
Warning: Line 22 contains tab but modeline says tabs should be expanded
Warning: Line 23 contains tab but modeline says tabs should be expanded
Warning: Line 25 contains tab but modeline says tabs should be expanded
Warning: Line 26 contains tab but modeline says tabs should be expanded
Warning: Line 27 contains tab but modeline says tabs should be expanded
Warning: Line 29 contains tab but modeline says tabs should be expanded
Warning: Line 33 contains tab but modeline says tabs should be expanded
Warning: Line 34 contains tab but modeline says tabs should be expanded
Warning: Line 35 contains tab but modeline says tabs should be expanded
Warning: Line 41 contains tab but modeline says tabs should be expanded
Warning: Line 45 contains tab but modeline says tabs should be expanded
Warning: Line 46 contains tab but modeline says tabs should be expanded
Warning: Line 50 contains tab but modeline says tabs should be expanded
Warning: Line 51 contains tab but modeline says tabs should be expanded
Warning: Line 52 contains tab but modeline says tabs should be expanded
Warning: Line 53 contains tab but modeline says tabs should be expanded
Warning: Line 54 contains tab but modeline says tabs should be expanded
Warning: Line 55 contains tab but modeline says tabs should be expanded
Warning: Line 56 contains tab but modeline says tabs should be expanded
Warning: Line 57 has missing newline (at end of file)

Check warning on line 1 in textproc/txt2html/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint txt2html:
Warning: Line 4 contains tab but modeline says tabs should be expanded
Warning: Line 5 contains tab but modeline says tabs should be expanded
Warning: Line 7 contains tab but modeline says tabs should be expanded
Warning: Line 8 contains tab but modeline says tabs should be expanded
Warning: Line 9 contains tab but modeline says tabs should be expanded
Warning: Line 10 contains tab but modeline says tabs should be expanded
Warning: Line 11 contains tab but modeline says tabs should be expanded
Warning: Line 12 contains tab but modeline says tabs should be expanded
Warning: Line 13 contains tab but modeline says tabs should be expanded
Warning: Line 14 contains tab but modeline says tabs should be expanded
Warning: Line 15 contains tab but modeline says tabs should be expanded
Warning: Line 16 contains tab but modeline says tabs should be expanded
Warning: Line 19 contains tab but modeline says tabs should be expanded
Warning: Line 20 contains tab but modeline says tabs should be expanded
Warning: Line 21 contains tab but modeline says tabs should be expanded
Warning: Line 22 contains tab but modeline says tabs should be expanded
Warning: Line 23 contains tab but modeline says tabs should be expanded
Warning: Line 25 contains tab but modeline says tabs should be expanded
Warning: Line 26 contains tab but modeline says tabs should be expanded
Warning: Line 27 contains tab but modeline says tabs should be expanded
Warning: Line 29 contains tab but modeline says tabs should be expanded
Warning: Line 33 contains tab but modeline says tabs should be expanded
Warning: Line 34 contains tab but modeline says tabs should be expanded
Warning: Line 35 contains tab but modeline says tabs should be expanded
Warning: Line 41 contains tab but modeline says tabs should be expanded
Warning: Line 45 contains tab but modeline says tabs should be expanded
Warning: Line 46 contains tab but modeline says tabs should be expanded
Warning: Line 50 contains tab but modeline says tabs should be expanded
Warning: Line 51 contains tab but modeline says tabs should be expanded
Warning: Line 52 contains tab but modeline says tabs should be expanded
Warning: Line 53 contains tab but modeline says tabs should be expanded
Warning: Line 54 contains tab but modeline says tabs should be expanded
Warning: Line 55 contains tab but modeline says tabs should be expanded
Warning: Line 56 contains tab but modeline says tabs should be expanded
Warning: Line 57 has missing newline (at end of file)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've changed the whitespace of the entire file in addition to making functional changes, making it very hard to identify and review the functional changes. Please separate whitespace-only changes into a separate commit, if they must be done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted the whitespace changes and only included functional changes in my latest commit. Thanks.


PortSystem 1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add another commit with non-functional changes where you fix the whitespace issues (i.e., with spaces in multiples of four).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once this pull request is merged, I will create a new pull request that fixes the whitespace issues and updates the revision to 1.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, there is no need to increase the "recision" but you'll need to correct the whitespace formatting before we'll merge this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @reneeotten,

Would you like me to make a separate commit on top of the one I've already made that includes the whitespace changes? If so, I would be happy to do that.

I'm asking, because normally I just amend my existing commit when fixing issues.

Thanks,

-ranga

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can amend for now. What I meant to say is that normally you would separate functional changes and whitespace changes in two separate commits. However, here you introduce wrong alignment while doing the update so it's fine to correct that and then amend your commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, I have changed the space on this line to a tab to match the existing formatting. Let me know if I should revert this and instead update the lines I added / changed to use the usual formatting.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the whole Portfile should adhere to the correct whitespace....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @reneeotten,

I have pushed a new commit with whitespace changed. Please let me know if this commit is okay.

Thanks,

-ranga

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the white space changes should be in a separate commit, this makes it very unreadable. Please finalize this or close the PR.

PortGroup perl5 1.0
PortGroup github 1.0

name txt2html
version 1.35
github.setup resurrecting-open-source-projects txt2html 3.0 v
github.tarball_from archive
revision 0
categories textproc
license BSD
maintainers nomaintainer
Expand All @@ -17,26 +22,36 @@
(whitespace, typographic layout, etc.), and attempts to \
mark that structure explicitly using HTML.

master_sites sourceforge

extract.suffix .tgz
checksums md5 ba007af9d0681b3f493c84869b147071
checksums rmd160 144e9514e7137f682a738fa25ead029241d0bc31 \
sha256 6a2d23a23dd7d06cac0d383745bf456754da4992b5f2f4536d478a46d3a8e57e \
size 140611

use_configure no
post-configure { reinplace "s|/usr/share/misc|${prefix}/share/${name}|g" \
${worksrcpath}/${name}.pl }

build {}

destroot { system "install -m 755 -d ${destroot}${prefix}/bin"
system "install -m 755 ${worksrcpath}/${name}.pl \
${destroot}${prefix}/bin/${name}"
system "install -m 755 -d \
${destroot}${prefix}/share/${name}"
system "install -m 644 ${worksrcpath}/${name}.dict \
${destroot}${prefix}/share/${name}"
system "install -m 755 -d \
${destroot}${prefix}/share/doc/${name}"
system "install -m 644 ${worksrcpath}/* \
${destroot}${prefix}/share/doc/${name}"
system "rm ${destroot}${prefix}/share/doc/${name}/${name}.*" }
perl5.use_module_build

depends_lib-append \
port:p${perl5.major}-getopt-long \
port:p${perl5.major}-getopt-argvfile \
port:p${perl5.major}-yaml-syck

# Also requires: Pod::Usage, Test::More but those should be in any
# non-obsolete Perl's core modules.

post-patch {
reinplace "s|/usr/bin/env perl|${perl5.bin}|" ${worksrcpath}/scripts/${name}
}

configure {
system -W ${worksrcpath} "'${perl5.bin}' './Build.PL' \
'--install_base' '${prefix}'"
}

post-destroot {
file mkdir ${destroot}${prefix}/lib/perl5/${perl5.major}
move ${destroot}${prefix}/lib/perl5/HTML \
${destroot}${prefix}/lib/perl5/${perl5.major}
move ${destroot}${prefix}/man/man1/txt2html.1pm \
${destroot}${prefix}/share/man/man1
move ${destroot}${prefix}/man/man3/HTML::TextToHTML.3pm \
${destroot}/${prefix}/share/man/man3
}