Bug 156930 - [PATCH] graphics/netpbm: fix upgrade hell, fix parallel build
Summary: [PATCH] graphics/netpbm: fix upgrade hell, fix parallel build
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: Dirk Meyer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-10 17:20 UTC by Matthias Andree
Modified: 2011-05-11 19:19 UTC (History)
1 user (show)

See Also:


Attachments
netpbm-10.35.80_3.patch (2.29 KB, patch)
2011-05-10 17:20 UTC, Matthias Andree
no flags Details | Diff
file.diff (1.10 KB, patch)
2011-05-10 17:20 UTC, Matthias Andree
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Matthias Andree freebsd_committer 2011-05-10 17:20:06 UTC
Hi Dirk,

note that the current shape of netpbm frequently breaks portmaster
upgrades, too, so we should get rid of it as soon as possible.

Find below a patch to fix two major issues in graphics/netpbm:

1. the addition to files/patch-Makefile.common fixes the "compile with
netpbm version installed" problem.  We
can remove the pre-configure check.  I've tested this with the old
10.28 headers in /usr/local/include (taken from a package), broke before
the patch, no ill effects after. Basically we just make sure that
-I$(LOCALBASE)/include comes after all the local includes.

And certainly we don't want to wedge a PORTREVISION-bumped build...

This wasn't too hard, was it?


2. The pre-build line makes it safe to build the whole package
   in parallel. Consequently mark MAKE_JOBS_SAFE. Tested on a real
   quad-core computer (AMD Phenom II X4) several times, no build
   failures.

Port maintainer (dinoex@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
Comment 1 Edwin Groothuis freebsd_committer 2011-05-10 17:20:17 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 matthias.andree 2011-05-10 17:41:23 UTC
If this patch gets committed, 
http://www.freebsd.org/cgi/query-pr.cgi?pr=156577 can be closed, too - 
it contains the relevant problem description (I hadn't been aware that 
it was filed as PR, else I could've added the PR when filing the patch. 
Sorry for that.)

-- 
Matthias Andree
Comment 3 dfilter service freebsd_committer 2011-05-11 05:20:11 UTC
dinoex      2011-05-11 04:19:52 UTC

  FreeBSD ports repository

  Modified files:
    graphics/netpbm      Makefile 
    graphics/netpbm/files patch-Makefile.common 
  Added files:
    graphics/netpbm/files patch-ppmtompeg-Makefile 
  Log:
  - fix build if old version is installed
  PR:             156930
  Submitted by:   Matthias Andree
  
  Revision  Changes    Path
  1.198     +1 -3      ports/graphics/netpbm/Makefile
  1.4       +12 -3     ports/graphics/netpbm/files/patch-Makefile.common
  1.1       +12 -0     ports/graphics/netpbm/files/patch-ppmtompeg-Makefile (new)
_______________________________________________
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"
Comment 4 Dirk Meyer freebsd_committer 2011-05-11 05:34:22 UTC
State Changed
From-To: open->feedback

MAKE_JOBS_SAFE 
Please test the patch
Comment 5 Matthias Andree freebsd_committer 2011-05-11 09:27:41 UTC
Dirk,

one minor nit from "portlint -C":

MAKE_JOBS_SAFE= (in Makefile) wants a tab, not a blank, after the
assignment.

Other than that, the parallel build works for me.  Also, your variant of
my proposed patch works well for me and is more efficient. Thanks!

Best regards
Matthias
Comment 6 Matthias Andree freebsd_committer 2011-05-11 09:28:35 UTC
State Changed
From-To: feedback->open

Feedback given.
Comment 7 dfilter service freebsd_committer 2011-05-11 18:58:17 UTC
dinoex      2011-05-11 17:58:09 UTC

  FreeBSD ports repository

  Modified files:
    graphics/netpbm      Makefile 
  Log:
  - use MAKE_JOBS_SAFE
  PR:             156930
  Submitted by:   Matthias Andree
  
  Revision  Changes    Path
  1.199     +11 -1     ports/graphics/netpbm/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"
Comment 8 Dirk Meyer freebsd_committer 2011-05-11 19:19:49 UTC
State Changed
From-To: open->closed

committed, thanks.