Bug 188798 - [PATCH] games/xlogical: maintainer update
Summary: [PATCH] games/xlogical: maintainer update
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: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-19 19:00 UTC by Aaron Baugher
Modified: 2014-06-10 20:55 UTC (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Aaron Baugher 2014-04-19 19:00:00 UTC
[PORTTOOLS: DESCRIBE CHANGES]

Port maintainer (aaron@baugher.biz) is cc'd.

Generated with FreeBSD Port Tools 1.01 (mode: change, diff: SVN)

Fix: 

Maintainer updating port.  Minor update to Makefile to specify 
autotools.--uToTyFMQaIjixHnjvY188aHvYqUaB71ttFFmPL4OjnubD90j
Content-Type: text/plain; name="xlogical-1.0p8.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="xlogical-1.0p8.patch"

Index: Makefile
===================================================================
--- Makefile	(revision 351603)
+++ Makefile	(working copy)
@@ -12,8 +12,11 @@
 MAINTAINER=	aaron@baugher.biz
 COMMENT=	Remake of the classic puzzle game Logical
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+LICENSE=	GPLv2
+
+USES=		tar:bzip2 gmake
+USE_AUTOTOOLS=	aclocal automake autoconf
+AUTOMAKE_ARGS=	--add-missing
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-19 19:00:03 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-19 19:00:03 UTC
Maintainer of games/xlogical,

Please note that PR ports/188798 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188798

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2014-04-19 20:09:41 UTC
Class Changed
From-To: change-request->maintainer-update

fix synopsis and class.
Comment 4 John Marino freebsd_committer freebsd_triage 2014-06-10 13:18:21 UTC
This PR suffers from a lack of a description, e.g. why is it needed.  Portsmon may have the clue, it seems to be broken on F8 and F9.

The patch no longer applied but the remaining changes are simple.
Comment 5 John Marino freebsd_committer freebsd_triage 2014-06-10 17:19:44 UTC
ugg, this port is not STAGEd either!
Add portlint is going crazy with the DOS CR-ended patches and use of OBSOLETE NOPORTDOCS

as stage support is now required by default to commit, it should have been added with the rest of the patch along with portlint checks.

If the vendor makefile supports DESTDIR by default, I'll try to fix it but if it's any kind of complicated I'm kicking it back.
Comment 6 John Marino freebsd_committer freebsd_triage 2014-06-10 17:42:26 UTC
The good news:
This port supports DESTDIR out of the box

The bad news:
This autotools fix has nothing to do fixing F10 and F11 error:
tile_spinner.cpp:49:14: error: use of undeclared identifier 'rand'

So what is the point of the original autotools patch?  It doesn't seem to make any difference according to portsmon.
Comment 7 commit-hook freebsd_committer freebsd_triage 2014-06-10 20:50:43 UTC
A commit references this bug:

Author: marino
Date: Tue Jun 10 20:49:54 UTC 2014
New revision: 357377
URL: http://svnweb.freebsd.org/changeset/ports/357377

Log:
  games/xlogical: stage support and unbreak on F10+

  This port needed a lot more help than the PR indicated:
   * Full stage support
   * DESTDIR had to be patched in, there was only a placeholder
   * It didn't build on clang because there was no header for rand function
   * Almost very patch had DOS carriage returns (stripped)
   * Needed USES+=dos2unix so patches apply (caused revbump)
   * NOPORTDOCS needed to be replaced by PORT_OPTIONS - DOCS
   * post-extract target was muted, as is the norm
   * Previous install patches reworked to fit STAGE support better

  The PR updated:
   * Use of autotools
   * conversion of USE_GMAKE and USE_BZIP2 was done previously
   * GPLv2 license was added

  PR:		188798
  Submitted by:	maintainer (Aaron Baugher)
  Rest by:	marino

Changes:
  head/games/xlogical/Makefile
  head/games/xlogical/files/patch-Makefile.am
  head/games/xlogical/files/patch-gpl.h
  head/games/xlogical/files/patch-graph_images.cpp
  head/games/xlogical/files/patch-images_Makefile.am
  head/games/xlogical/files/patch-install-images
  head/games/xlogical/files/patch-levelmap.cpp
  head/games/xlogical/files/patch-mapedit.cpp
  head/games/xlogical/files/patch-menuentry.cpp
  head/games/xlogical/files/patch-music_Makefile.am
  head/games/xlogical/files/patch-music_files.cpp
  head/games/xlogical/files/patch-sound_Makefile.am
  head/games/xlogical/files/patch-sound_files.cpp
  head/games/xlogical/files/patch-tile__spinner.cpp
Comment 8 John Marino freebsd_committer freebsd_triage 2014-06-10 20:55:55 UTC
I spoke too soon on DESTDIR, apparently there was only a placeholder for that.  I had to patch that in.

I also fixed FreeBSD 10 and FreeBSD 11 failures (new patch).  Weren't you getting error logs weekly because of this?

I really should have kicked this PR back (see the commit log and diffs for all the changes I made, most being necessary) but frankly it was less time for me to finish it off than have several back and forth sessions as it probably would have taken.

It's really important to know that by rule, patches won't be added to non-staged ports unless they include staging support as well.

John