Bug 216236 - graphics/argyllcms: fix hard-coded /usr/local
Summary: graphics/argyllcms: fix hard-coded /usr/local
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Koop Mast
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-01-18 15:48 UTC by John Hein
Modified: 2017-05-23 19:13 UTC (History)
1 user (show)

See Also:
kwm: maintainer-feedback+


Attachments
[patch] remove hard-coded /usr/local occurrences (2.95 KB, patch)
2017-01-18 15:48 UTC, John Hein
no flags Details | Diff
[patch] [v2] remove hard-coded /usr/local occurrences (3.62 KB, patch)
2017-05-09 12:43 UTC, John Hein
no flags Details | Diff
[patch] [v3] remove hard-coded /usr/local occurrences (4.13 KB, patch)
2017-05-12 16:13 UTC, John Hein
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Hein 2017-01-18 15:48:24 UTC
Created attachment 179037 [details]
[patch] remove hard-coded /usr/local occurrences

graphics/argyllcms currently fails if LOCALBASE is not /usr/local.

The attached patch attempts to address that.

QA:
 - portlint ok (no new warnings)
 - stage-qa ok
 - poudriere testport ok (tested on stable-10/64 with LOCALBASE=/usr/loc in make.conf)
Comment 1 John Hein 2017-05-09 12:43:00 UTC
Created attachment 182438 [details]
[patch] [v2] remove hard-coded /usr/local occurrences

Update patch to pass MAKE_ENV (for LOCALBASE) during install.
While here, unmute install commands.
Comment 2 John Hein 2017-05-12 16:13:28 UTC
Created attachment 182546 [details]
[patch] [v3] remove hard-coded /usr/local occurrences

Refresh patch after r440675.
Comment 3 commit-hook freebsd_committer 2017-05-22 19:30:04 UTC
A commit references this bug:

Author: kwm
Date: Mon May 22 19:28:53 UTC 2017
New revision: 441490
URL: https://svnweb.freebsd.org/changeset/ports/441490

Log:
  Fix hardcoded /usr/local.

  * Un-mute install of License.txt

  PR:		216236
  Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>

Changes:
  head/graphics/argyllcms/Makefile
  head/graphics/argyllcms/files/patch-Jambase
  head/graphics/argyllcms/files/patch-Jamtop
  head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h
  head/graphics/argyllcms/files/patch-spectro_dispwin.c
Comment 4 John Hein 2017-05-23 19:13:33 UTC
Thanks, Koop.
Looks like there's one /usr/local missed in Jamtop.

Including the diff directly here for easy visual evidence (won't apply directly due to tabs).

Index: files/patch-Jamtop
===================================================================
--- files/patch-Jamtop  (revision 441513)
+++ files/patch-Jamtop  (working copy)
@@ -43,7 +43,7 @@
             || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
                        if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
 -                       || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
-+                       || [ GLOB $(LOCALBASE)/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
++                       || [ GLOB $(LOCALBASE)/lib : lib$(lcase).so ] || [ GLOB $(LOCALBASE)/lib : lib$(lcase).a ]
                         || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
                         || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
                         || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]