Bug 185989

Summary: [PATCH] print/mp-letter: Deletion of ^M in Makefiles
Product: Ports & Packages Reporter: takefu
Component: Individual Port(s)Assignee: John Marino <marino>
Status: Closed FIXED    
Severity: Affects Only Me CC: marino, obrien, takefu
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
mp-letter-3.0.1.patch
none
mp-a4-3.0.1.patch
none
mp-letter.patch
none
mp-a4.patch none

Description takefu 2014-01-22 09:50:00 UTC 
mp-letter
  Deletion of ^M in Makefiles
  Converting from NO_STAGE to staged
mp-a4
  Converting from NO_STAGE to staged

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

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-22 09:50:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->obrien

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 John Marino freebsd_committer freebsd_triage 2014-07-28 07:58:37 UTC 
same here, encoded patches. 

These are important because they enable stage support which saves them from deletion, can you reformat and resubmit the patches?
Comment 3 takefu 2014-07-28 08:25:14 UTC 
Created attachment 145065 [details]
mp-letter.patch
Comment 4 takefu 2014-07-28 08:25:53 UTC 
Created attachment 145066 [details]
mp-a4.patch
Comment 5 John Marino freebsd_committer freebsd_triage 2014-07-28 10:18:26 UTC 
I don't really like the stage solution on mp-letter.

For one, DESTDIR is already defined so it should have been used instead of redefining STAGEDIR.  secondly, the changes to Makefile.dist are so extensive, it makes more sense to move the installation to a "do-install" target in the makefile I think.

The MASTER_SITES are go, so I had to change it to LOCAL/obrien
Comment 6 commit-hook freebsd_committer freebsd_triage 2014-07-28 11:06:19 UTC 
A commit references this bug:

Author: marino
Date: Mon Jul 28 11:05:20 UTC 2014
New revision: 363130
URL: http://svnweb.freebsd.org/changeset/ports/363130

Log:
  stage print/mp-letter & print/mp-a4

  Also update MASTER_SITES which have disappeared and moving it to
  LOCAL/obrien.  Includes various cleanups like removal of DOS endings
  in the makefile.

  PR:		185989
  Submitted by:	takefu (airport.fm)
  Approved by:	maintainer timeout (6 months), staging blanket

Changes:
  head/print/mp-a4/Makefile
  head/print/mp-letter/Makefile
  head/print/mp-letter/files/patch-Makefile.dist
  head/print/mp-letter/files/patch-aa
  head/print/mp-letter/files/patch-ab
  head/print/mp-letter/files/patch-ae
  head/print/mp-letter/files/patch-header.cc
  head/print/mp-letter/files/patch-input.cc
  head/print/mp-letter/files/patch-main.cc
  head/print/mp-letter/files/patch-print.cc
  head/print/mp-letter/files/patch-print.hh
  head/print/mp-letter/pkg-plist
Comment 7 commit-hook freebsd_committer freebsd_triage 2014-07-28 11:11:22 UTC 
A commit references this bug:

Author: marino
Date: Mon Jul 28 11:10:31 UTC 2014
New revision: 363132
URL: http://svnweb.freebsd.org/changeset/ports/363132

Log:
  print/mp-letter: Remove leftover MAKE_ARGS

  The definition of STAGEDIR isn't necessary, it was left over from an
  earlier version of stage support.

  PR:	185989

Changes:
  head/print/mp-letter/Makefile
Comment 8 John Marino freebsd_committer freebsd_triage 2014-07-28 11:12:40 UTC 
Okay, I met you halfway.

I kept the install target in the vendor makefile, but I simplified it considerably while also using the standard DESTDIR instead of the custom STAGEDIR.