Bug 192259 - [stage][PATCH] x11-clocks/intclock: STAGEify, fix with newer perls
Summary: [stage][PATCH] x11-clocks/intclock: STAGEify, fix with newer perls
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-29 23:38 UTC by fullermd
Modified: 2014-07-30 19:18 UTC (History)
1 user (show)

See Also:


Attachments
patch (2.41 KB, patch)
2014-07-29 23:38 UTC, fullermd
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description fullermd 2014-07-29 23:38:34 UTC
Created attachment 145136 [details]
patch

Minor syntax error fix in Makefile.PL, STAGE changes.  Builds clean, installs and runs OK.
Comment 1 John Marino freebsd_committer freebsd_triage 2014-07-30 07:26:41 UTC
looks simple enough, but why are you staying with "{INSTALL} -d" over "${MKDIR}" in the pre-install target?
Comment 2 fullermd 2014-07-30 10:26:43 UTC
On the "it worked, so I didn't touch it" theory   :)
Comment 3 John Marino freebsd_committer freebsd_triage 2014-07-30 10:40:58 UTC
I think $MKDIR is preferable, I'll leave it to whomever claims the ticket (although it might eventually be me since this is so simple and thus easy to knock out)
Comment 4 John Marino freebsd_committer freebsd_triage 2014-07-30 18:11:54 UTC
I was afraid of this (untested):

=========================================================================
====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for directories owned by MTREEs
===> Checking for directories handled by dependencies
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: share/applications/intclock.desktop
Error: Missing: %%DATADIR%%/intclock.png
Error: Missing: %%DATADIR%%/territories.dat
Error: Missing: %%DATADIR%%/zones.dat
Error: Missing: @dirrmtry %%DATADIR%%
===> Error: Plist issues found.
*** Error code 1
Comment 5 fullermd 2014-07-30 18:30:20 UTC
You sure you've got the patch-Makefile.PL?
Comment 6 John Marino freebsd_committer freebsd_triage 2014-07-30 18:36:25 UTC
Yes.  It's not stage-safe
I'm trying to fix it but my first 2 attempts failed.

FYI, in the future at least try "make check-plist" before submitting, that would have caught this.
Comment 7 fullermd 2014-07-30 18:40:50 UTC
I did.

[13:39:17] mortis:~/work/freebsd-hacks/ports/intclock                           (pts/41):{112}% make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for directories owned by MTREEs
===> Checking for directories handled by dependencies
===> Checking for items in pkg-plist which are not in STAGEDIR
===> No pkg-plist issues found (check-plist)

% ll work/stage/usr/local/share/applications/intclock.desktop work/stage/usr/local/share/intclock/*
-rw-r--r--  1 fullermd  wheel    1006 Jul 30 13:39 work/stage/usr/local/share/applications/intclock.desktop
-rw-r--r--  1 fullermd  wheel   20334 Jul 30 13:39 work/stage/usr/local/share/intclock/intclock.png
-rw-r--r--  1 fullermd  wheel  887159 Jul 30 13:39 work/stage/usr/local/share/intclock/territories.dat
-rw-r--r--  1 fullermd  wheel  405752 Jul 30 13:39 work/stage/usr/local/share/intclock/zones.dat
Comment 8 John Marino freebsd_committer freebsd_triage 2014-07-30 18:42:35 UTC
(In reply to fullermd from comment #5)
> You sure you've got the patch-Makefile.PL?

Where is this patch that you apparently have?
Comment 9 John Marino freebsd_committer freebsd_triage 2014-07-30 18:43:42 UTC
FYI, down to here now without a patch:

====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
===> Checking for directories owned by MTREEs
===> Checking for directories handled by dependencies
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: share/applications/intclock.desktop
===> Error: Plist issues found.
*** Error code 1
Comment 10 fullermd 2014-07-30 18:44:08 UTC
Freshly downloaded from this PR and applied to a pristine svn co.

files/patch-Makefile.PL, changes $datadir line, changes foreach, changes the extra_install target.
Comment 11 John Marino freebsd_committer freebsd_triage 2014-07-30 18:48:13 UTC
i see.  Hit the "diff" link and see that it's not present.

I didn't download it for a one line change
Comment 12 John Marino freebsd_committer freebsd_triage 2014-07-30 18:49:46 UTC
okay, you have belt and suspenders here.
The post-patch is changing the same thing as the patch is.  Only one is needed.  I'll try to stick with post-patch
Comment 13 fullermd 2014-07-30 18:50:18 UTC
Oh, yes.  X-ref https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=190724
Comment 14 John Marino freebsd_committer freebsd_triage 2014-07-30 18:51:01 UTC
that's not really fair, I figured out a way that doesn't need the patch.  With your way, you need the patch.
Comment 15 fullermd 2014-07-30 18:55:20 UTC
Oh, yeah, I probably ended up with the post-patch result in the diff (e.g., extract, cp .orig, work, try make, back&forth, then save the diff).

I think I'd leave it all there, if it were me; REINPLACE'ing a file that's also being patched sounds like storing up pain for later.  Better to either do it all one way, or all the other.
Comment 16 John Marino freebsd_committer freebsd_triage 2014-07-30 18:58:02 UTC
no it will spurn me to bypass your PRs. :)
Comment 17 John Marino freebsd_committer freebsd_triage 2014-07-30 18:59:31 UTC
now I have a non-sequitur...
Comment 18 fullermd 2014-07-30 19:08:19 UTC
That's OK.  Nonsequitors make you look otherworldly, like you're communing with a higher plane, invisible to all the lesser beings around you.

At least, that's what I tell people.  Some of them believe it.  I think.
Comment 19 commit-hook freebsd_committer freebsd_triage 2014-07-30 19:17:21 UTC
A commit references this bug:

Author: marino
Date: Wed Jul 30 19:16:25 UTC 2014
New revision: 363507
URL: http://svnweb.freebsd.org/changeset/ports/363507

Log:
  Stage x11-clocks/intclock

  PR:		192259
  Submitted by:	fullermd (over-yonder.net)
  Refinement:	marino

Changes:
  head/x11-clocks/intclock/Makefile
Comment 20 John Marino freebsd_committer freebsd_triage 2014-07-30 19:18:12 UTC
The alignment wasn't strictly necessary but I think it looks better.

That's the no-patch solution.