Bug 130589 - [MAINTAINER] textproc/asciidoc: update to 8.3.3
Summary: [MAINTAINER] textproc/asciidoc: update to 8.3.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-01-15 17:20 UTC by Peter Schuller
Modified: 2009-01-18 02:30 UTC (History)
0 users

See Also:


Attachments
asciidoc-8.3.3.patch (6.58 KB, patch)
2009-01-15 17:20 UTC, Peter Schuller
no flags Details | Diff
asciidoc.patch (5.96 KB, patch)
2009-01-15 18:10 UTC, Dmitry Marakasov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Schuller 2009-01-15 17:20:03 UTC
- Update to 8.3.3
- Port finally uses upstream provided configure script.
- Now depends on bash, since a2x needs it.
- Correctly substitutes interpreter paths in all Python scripts.
- Now installs all available filters as a result of the move to using
  the configure script.
- Still does not handle the vim syntax highlighting mode.

Added file(s):
- files/patch-Makefile

Generated with FreeBSD Port Tools 0.77

Upstream changelog:

Version 8.3.3 (2009-01-02)
--------------------------
This release supercedes 8.3.2.

.Bug fixes
- The broken and confusing numeration and numeration2 numbered list
  attributes have been dropped, use the style attribute instead.


Version 8.3.2 (2009-01-01)
--------------------------
.Additions and changes
- Added Gouichi Iisaka's Graphviz filter to distribution.
- The 'SidebarBlock' element can now be rendered with an 'abstract'
  style.
- Reorganized filters into a separate subdirectory for each filter.
- Updated `Makefile.in` and `MANIFEST` files to reflect new filters
  organization.
- Added 'listing' style to 'LiteralBlock' element so listings with
  nested listing blocks can be rendered as a listing block.
- Changed example 'code' filter to use preferred 'ListingBlock' syntax
  (the old `~` delimited filter syntax is no longer used).
- Implemented 'enumeration' and 'enumeration2' numbered list
  attributes for specifying the list numbering style ('arabic',
  'loweralpha', 'upperalpha', 'lowerroman' and 'upperroman').
- AsciiDoc now recognizes 'upperalpha', 'lowerroman' and 'upperroman'
  numbers in `listdef-numbered2` numbered lists and sets the number
  style based on the style of the first numbered list item
  (alternative to setting 'enumeration2' attribute).
- Updated `formatlistpat` definition in `.vimrc` example in User
  Guide.
- You can now backslash escape system block macros.
- Added 'Pychart' FAQ.
- Drop paragraph 'text' and list 'text', 'index' and 'label' match
  groups from attributes -- they are included in the element's text
  and we don't want them processed a second time as attributes.
- Changed comment line block macro to a passthrough block macro to
  ensure no substitutions.
- A 'subslist' no longer has to be appended to a 'PassthroughBlock'
  macro definition, if omitted no substitutions are performed.
- Code tidy up: replaced deprecated `<>` operator with `!=`.
- Removed unused linuxdoc code.
- Code tidy ups: dropped old types module reference; replaced
  `has_key()` with preferred `in` operator.

.Bug fixes
- Old syntax source highlight filter regression: special characters
  where not escaped in DocBook outputs.
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2009-01-15 17:46:18 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 2 Dmitry Marakasov 2009-01-15 18:10:13 UTC
> Synopsis: [MAINTAINER] textproc/asciidoc: update to 8.3.3
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=130589

I've optimized it a bit, what do you think?

- INSTALL_* macros may be passed to gmake via environment, no need to
  use %%FOOBAR%% in the patch and then reinplace.
  Also name a patch after the file that is actually patched.
- Simplify pre-patch.
  - /usr/bin/env python is pretty legal python shebang, no reason to
    change it to full python path (or is there?)
  - no need to fix config directory path in a2x and asciidoc.py,
    Makefile already does this for us.

Please test those changes.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 3 Dmitry Marakasov freebsd_committer freebsd_triage 2009-01-15 20:52:44 UTC
State Changed
From-To: open->feedback

Awaiting submitters feedback.
Comment 4 Peter Schuller 2009-01-17 09:51:27 UTC
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=130589
> 
> I've optimized it a bit, what do you think?
> 
> - INSTALL_* macros may be passed to gmake via environment, no need to
>   use %%FOOBAR%% in the patch and then reinplace.

Much better, thanks :)

>   Also name a patch after the file that is actually patched.

Thanks, I intended to do this but somehow got the name mixed up.

> - Simplify pre-patch.
>   - /usr/bin/env python is pretty legal python shebang, no reason to
>     change it to full python path (or is there?)
>   - no need to fix config directory path in a2x and asciidoc.py,
>     Makefile already does this for us.

Roger. With respect to changing /usr/bin/env python I wasn't sure what
would be the preferred way to deal with it. I figured changing it was
the safer route since we "control" the Python dependency (i.e., I was
not sure whether it was intended that port install Python scripts
should pick up Python's that a user may have in this PATH).

I'll leave /usr/bin/env:s in the future. In cases where it is
hard-coded (such as /bin/bash), should I, when changing by necessity,
even *prefer* /usr/bin/env python to ${LOCALBASE}/bin/python?

(I now realized PREFIX was wrong anyway and that it should have been
LOCALBASE.)

> Please test those changes.

Tested - works and look good to me.

-- 
/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller@infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey@scode.org
E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org
Comment 5 Dmitry Marakasov 2009-01-18 02:17:46 UTC
* Peter Schuller (peter.schuller@infidyne.com) wrote:

> > - Simplify pre-patch.
> >   - /usr/bin/env python is pretty legal python shebang, no reason to
> >     change it to full python path (or is there?)
> >   - no need to fix config directory path in a2x and asciidoc.py,
> >     Makefile already does this for us.
> 
> Roger. With respect to changing /usr/bin/env python I wasn't sure what
> would be the preferred way to deal with it. I figured changing it was
> the safer route since we "control" the Python dependency (i.e., I was
> not sure whether it was intended that port install Python scripts
> should pick up Python's that a user may have in this PATH).
>
> I'll leave /usr/bin/env:s in the future. In cases where it is
> hard-coded (such as /bin/bash), should I, when changing by necessity,
> even *prefer* /usr/bin/env python to ${LOCALBASE}/bin/python?

Seems like it is actually safer to use full python path, but for
some reason /usr/bin/env python is much more common. Neither way
is `preferred', the rule of thumb is just to leave it as is and
not do unnecessary changes.

> (I now realized PREFIX was wrong anyway and that it should have been
> LOCALBASE.)

Yes, I forgot to mention that.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2009-01-18 02:19:48 UTC
State Changed
From-To: feedback->open

Feedback received
Comment 7 Dmitry Marakasov freebsd_committer freebsd_triage 2009-01-18 02:20:05 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 8 dfilter service freebsd_committer freebsd_triage 2009-01-18 02:20:20 UTC
amdmi3      2009-01-18 02:20:02 UTC

  FreeBSD ports repository

  Modified files:
    textproc/asciidoc    Makefile distinfo pkg-plist 
  Added files:
    textproc/asciidoc/files patch-Makefile.in 
  Log:
  - Update to 8.3.3
  
  PR:             130589
  Submitted by:   Peter Schuller <peter dot schuller at infidyne dot com> (maintainer)
  
  Revision  Changes    Path
  1.9       +13 -47    ports/textproc/asciidoc/Makefile
  1.8       +3 -3      ports/textproc/asciidoc/distinfo
  1.1       +30 -0     ports/textproc/asciidoc/files/patch-Makefile.in (new)
  1.5       +12 -2     ports/textproc/asciidoc/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"