Bug 151108 - net-mgmt/pnp: png files broken because of dos2unix
Summary: net-mgmt/pnp: png files broken because of dos2unix
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: Greg Larkin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-30 11:10 UTC by Youssef Ghorbal
Modified: 2010-09-30 19:30 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Youssef Ghorbal 2010-09-30 11:10:02 UTC
png files shipped with the port (share/pnp/images/*.png) are broken because of dos2unix. A Dos to Unix conversion is launched on all files of the port when it has to be limited to .php only.

$> pwd
/usr/ports/net-mgmt/pnp
$> make extract
===>  Extracting for pnp-0.4.14_1
=> MD5 Checksum OK for pnp-0.4.14.tar.gz.
=> SHA256 Checksum OK for pnp-0.4.14.tar.gz.
$> file work/pnp-0.4.14/share/pnp/images/*.png
[...]
work/pnp-0.4.14/share/pnp/images/ack.png:      PNG image, 16 x 16, 8-bit/color RGBA, non-interlaced
[...]
$> make patch
===>  Patching for pnp-0.4.14_1
===>   Converting DOS text files to UNIX text files
===>  Applying FreeBSD patches for pnp-0.4.14_1
$> file work/pnp-0.4.14/share/pnp/images/*.png
[...]
work/pnp-0.4.14/share/pnp/images/ack.png:      data
[...]

Fix: 

limit the dos2unix to only php files in the Makefile. Something like : 
DOS2UNIX_REGEX= .*\.php
How-To-Repeat: just make patch in the ports directory
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-09-30 11:10:06 UTC
Maintainer of net-mgmt/pnp,

Please note that PR ports/151108 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/151108

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-09-30 11:10:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Eygene Ryabinkin 2010-09-30 11:32:16 UTC
It is glarkin@ who should really fix the code that he introduced
to the port's Makefile:
  http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/pnp/Makefile.diff?r1=1.7;r2=1.8
-- 
Eygene
 _                ___       _.--.   #
 \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
 /  ' `         ,       __.--'      #  to read the on-line manual
 )/' _/     \   `-_,   /            #  while single-stepping the kernel.
 `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
     _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook
    {_.-``-'         {_/            #
Comment 4 Greg Larkin freebsd_committer freebsd_triage 2010-09-30 19:29:23 UTC
State Changed
From-To: feedback->closed

Committed, thank you! 


Comment 5 Greg Larkin freebsd_committer freebsd_triage 2010-09-30 19:29:23 UTC
Responsible Changed
From-To: freebsd-ports-bugs->glarkin

Committed, thank you!
Comment 6 dfilter service freebsd_committer freebsd_triage 2010-09-30 19:29:23 UTC
glarkin     2010-09-30 18:29:12 UTC

  FreeBSD ports repository

  Modified files:
    net-mgmt/pnp         Makefile 
  Log:
  - Fixed PNG file breakage caused by overzealous dos2unix that I
    introduced in a previous commit
  - Fixed portlint warning about LICENSE
  - Bumped PORTREVISION
  
  PR:             ports/151108
  Submitted by:   Youssef Ghorbal <djo at pasteur dot fr>
  Approved by:    Eygene Ryabinkin <rea-fbsd at codelabs dot ru> (maintainer, implicit)
  
  Revision  Changes    Path
  1.9       +4 -2      ports/net-mgmt/pnp/Makefile
_______________________________________________
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"