<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115157] trunk/dports/games/xgalaga</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115157">115157</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-27 00:08:34 -0800 (Fri, 27 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>xgalaga: fix destroot failure (#41933)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesxgalagaPortfile">trunk/dports/games/xgalaga/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgamesxgalagafilespatchMakefileindiff">trunk/dports/games/xgalaga/files/patch-Makefile.in.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesxgalagaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/xgalaga/Portfile (115156 => 115157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/xgalaga/Portfile        2013-12-27 03:58:59 UTC (rev 115156)
+++ trunk/dports/games/xgalaga/Portfile        2013-12-27 08:08:34 UTC (rev 115157)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                    xgalaga
</span><span class="cx"> version                 2.1.1.0
</span><del>-revision                1
</del><ins>+revision                2
</ins><span class="cx"> categories              games x11
</span><span class="cx"> license                 GPL-2
</span><span class="cx"> platforms               darwin
</span><span class="lines">@@ -19,7 +19,8 @@
</span><span class="cx">                         sha1    ef40ad833d2434b0643d4c00202bd75ec14b94ac \
</span><span class="cx">                         rmd160  b55a97187b61ffe7c072ecd784cf9a16fe568c26
</span><span class="cx"> 
</span><del>-patchfiles              patch-main.c.diff
</del><ins>+patchfiles              patch-Makefile.in.diff \
+                        patch-main.c.diff
</ins><span class="cx"> 
</span><span class="cx"> depends_lib             port:xorg-libX11 \
</span><span class="cx">                         port:xorg-libXext \
</span><span class="lines">@@ -27,18 +28,38 @@
</span><span class="cx">                         port:xorg-libXt \
</span><span class="cx">                         port:xpm
</span><span class="cx"> 
</span><ins>+# The shipped config.guess and config.sub are too old to recognize OS X.
+# https://sourceforge.net/p/xgalaga/bugs/2/
+pre-configure {
+    copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
+}
</ins><span class="cx"> use_autoconf            yes
</span><span class="cx"> 
</span><del>-configure.pre_args      --prefix=${prefix}/share/${name} \
-                        --exec-prefix=${prefix}/bin \
</del><ins>+# The configure script uses these variables incorrectly, hence the strange values.
+configure.pre_args      --prefix=${prefix}/share/${name}
+configure.args          --exec-prefix=${prefix}/bin \
+                        --mandir=${prefix}/share/man \
</ins><span class="cx">                         --with-xpm-lib=${prefix}/lib
</span><span class="cx"> 
</span><del>-platform darwin {
-    pre-configure {
-        if {[file exists ${prefix}/share/libtool/config/config.guess]} {
-            copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
-        } else {
-            copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
</del><ins>+post-destroot {
+    set docdir ${prefix}/share/doc/${subport}
+    xinstall -d ${destroot}${docdir}
+    xinstall -m 644 -W ${worksrcpath} \
+        CHANGES \
+        CREDITS \
+        README \
+        README.SOUND \
+        ${destroot}${docdir}
+}
+
+pre-activate {
+    # xgalaga &lt;= 2.1.1.0_1 installed its manpage directly into /usr; remove it if found.
+    # https://sourceforge.net/p/xgalaga/bugs/11/
+    foreach filepath {/usr/share/man/xgalaga.6x.gz} {
+        if {[file exists ${filepath}] &amp;&amp; [registry_file_registered ${filepath}] == &quot;0&quot;} {
+            if {[catch {delete ${filepath}}]} {
+                ui_warn &quot;Cannot delete ${filepath}; please remove it manually&quot;
+            }
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgamesxgalagafilespatchMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/games/xgalaga/files/patch-Makefile.in.diff (0 => 115157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/xgalaga/files/patch-Makefile.in.diff                                (rev 0)
+++ trunk/dports/games/xgalaga/files/patch-Makefile.in.diff        2013-12-27 08:08:34 UTC (rev 115157)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+https://sourceforge.net/p/xgalaga/bugs/11/
+https://sourceforge.net/p/xgalaga/patches/4/
+--- Makefile.in.orig        2008-03-05 15:58:16.000000000 -0600
++++ Makefile.in        2013-12-27 01:47:16.000000000 -0600
+@@ -15,8 +15,7 @@
+ bindir = $(exec_prefix)
+ libdir = $(prefix)/lib
+ infodir = $(prefix)/info
+-#mandir = @mandir@
+-mandir = /usr/share/man
++mandir = @mandir@
+ creditsfile = @CREDITSFILE@
+ distversion = 2.1.1.0

+@@ -64,9 +62,8 @@
+         ./mkinstalldirs $(DESTDIR)$(prefix)/levels
+         for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
+         for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
+-        $(INSTALL) CREDITS $(DESTDIR)$(creditsfile)
+-        $(INSTALL) xgalaga.6x.gz $(mandir)/man6/xgalaga.6x.gz
+-        chmod 644 $(mandir)/man6/xgalaga.6x.gz
++        $(INSTALL) xgalaga.6x.gz $(DESTDIR)$(mandir)/man6/xgalaga.6x.gz
++        chmod 644 $(DESTDIR)$(mandir)/man6/xgalaga.6x.gz
+ #        touch $(prefix)/scores
+ #        chmod 666 $(prefix)/scores
+ #       chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores
</ins></span></pre>
</div>
</div>

</body>
</html>