Bug 194317 - [PATCH] graphics/electrix: Fix stage-qa, use options helpers
Summary: [PATCH] graphics/electrix: Fix stage-qa, use options helpers
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: i386 Any
: --- Affects Some People
Assignee: Jason E. Hale
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2014-10-12 13:29 UTC by Jason E. Hale
Modified: 2014-10-27 23:40 UTC (History)
1 user (show)

See Also:
jhale: maintainer-feedback? (olivierd)

Attachments
electrix patch (2.42 KB, patch)
2014-10-12 13:29 UTC, Jason E. Hale 		jhale: maintainer-approval? (olivierd)
 Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jason E. Hale freebsd_committer freebsd_triage 2014-10-12 13:29:32 UTC 
Created attachment 148212 [details]
electrix patch

graphics/electrix errors out on stage-qa because the binary references STAGEDIR.  This is due to PREFIX being defined to include STAGEDIR instead on setting it as DESTDIR in the environment.  It also does not respect CC, CFLAGS, etc.

The attached patch sets up an environment for the waf script to use to fix these issues.

While here:
- Convert to options helpers
- Drop PDF_DESC and PS_DESC because they have standard definitions
- Convert USE_BZIP2 and USE_PYTHON to USES
- Strip binaries
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2014-10-12 13:29:32 UTC 
Auto-assigned to maintainer olivierd@FreeBSD.org
Comment 2 Olivier Duchateau freebsd_committer freebsd_triage 2014-10-12 14:57:19 UTC 
Patch seems good, you can commit changes.
Comment 3 commit-hook freebsd_committer freebsd_triage 2014-10-27 23:37:32 UTC 
A commit references this bug:

Author: jhale
Date: Mon Oct 27 23:36:31 UTC 2014
New revision: 371610
URL: https://svnweb.freebsd.org/changeset/ports/371610

Log:
  - Fix stage-qa error where STAGEDIR was being referenced by the binary
    by setting up MAKE_ENV instead of passing STAGEDIR through PREFIX
  - Respect CC, CFLAGS, LDFLAGS, and MAKE_JOBS
  - Strip binaries
  - Convert USE_BZIP2 to USES
  - Use options helpers (this also fixes a problem where LIB_DEPENDS was
    being over-ridden in the PDF option, effectively cancelling out the
    LIB_DEPENDS for the PS option)
    Note: Did not use <OPT>_CONFIGURE_ENABLE because the configure script
    only understands --disable-<feature>
  - Bump PORTREVISION

  PR:		194317
  Approved by:	olivierd (maintainer)

Changes:
  head/graphics/electrix/Makefile
Comment 4 Jason E. Hale freebsd_committer freebsd_triage 2014-10-27 23:40:22 UTC 
Committed, thanks!  I did change CONFIGURE_ENV to MAKE_ENV since MAKE_ENV already defines CC, CXX, PREFIX, etc.