[115157] trunk/dports/games/xgalaga

ryandesign at macports.org ryandesign at macports.org
Fri Dec 27 00:08:34 PST 2013


Revision: 115157
          https://trac.macports.org/changeset/115157
Author:   ryandesign at macports.org
Date:     2013-12-27 00:08:34 -0800 (Fri, 27 Dec 2013)
Log Message:
-----------
xgalaga: fix destroot failure (#41933)

Modified Paths:
--------------
    trunk/dports/games/xgalaga/Portfile

Added Paths:
-----------
    trunk/dports/games/xgalaga/files/patch-Makefile.in.diff

Modified: trunk/dports/games/xgalaga/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
 
 name                    xgalaga
 version                 2.1.1.0
-revision                1
+revision                2
 categories              games x11
 license                 GPL-2
 platforms               darwin
@@ -19,7 +19,8 @@
                         sha1    ef40ad833d2434b0643d4c00202bd75ec14b94ac \
                         rmd160  b55a97187b61ffe7c072ecd784cf9a16fe568c26
 
-patchfiles              patch-main.c.diff
+patchfiles              patch-Makefile.in.diff \
+                        patch-main.c.diff
 
 depends_lib             port:xorg-libX11 \
                         port:xorg-libXext \
@@ -27,18 +28,38 @@
                         port:xorg-libXt \
                         port:xpm
 
+# 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}
+}
 use_autoconf            yes
 
-configure.pre_args      --prefix=${prefix}/share/${name} \
-                        --exec-prefix=${prefix}/bin \
+# 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 \
                         --with-xpm-lib=${prefix}/lib
 
-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}
+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 <= 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}] && [registry_file_registered ${filepath}] == "0"} {
+            if {[catch {delete ${filepath}}]} {
+                ui_warn "Cannot delete ${filepath}; please remove it manually"
+            }
         }
     }
 }

Added: trunk/dports/games/xgalaga/files/patch-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,26 @@
+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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131227/0b1699aa/attachment.html>


More information about the macports-changes mailing list