[41602] trunk/dports/devel/hmake

[blb at macports.org]

Revision: 41602
          http://trac.macports.org/changeset/41602
Author:   blb at macports.org
Date:     2008-11-06 18:40:00 -0800 (Thu, 06 Nov 2008)
Log Message:
-----------
devel/hmake - patch configure so CCC is defined before it is used, ticket #16592

Modified Paths:
--------------
    trunk/dports/devel/hmake/Portfile

Added Paths:
-----------
    trunk/dports/devel/hmake/files/
    trunk/dports/devel/hmake/files/patch-configure.diff

Modified: trunk/dports/devel/hmake/Portfile
===================================================================
--- trunk/dports/devel/hmake/Portfile	2008-11-07 01:32:33 UTC (rev 41601)
+++ trunk/dports/devel/hmake/Portfile	2008-11-07 02:40:00 UTC (rev 41602)
@@ -18,6 +18,8 @@
                         sha1 c88e61a86053c2e2f600e534d1c323131b925e12 \
                         rmd160 b9f88e2ee4ed4bb6cc2df3d644864eb5e60c4a60
 
+patchfiles              patch-configure.diff
+
 configure.args          --mandir=${prefix}/share/man/man1
 
 variant ghc conflicts nhc98 description {Build with ghc (default)} {
@@ -37,6 +39,6 @@
     default_variants +ghc
 }
 
-patch {
+post-patch {
     reinplace "s|-lreadline|-I${prefix}/include -L${prefix}/lib -lreadline|g" ${worksrcpath}/configure
 }

Added: trunk/dports/devel/hmake/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/hmake/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/hmake/files/patch-configure.diff	2008-11-07 02:40:00 UTC (rev 41602)
@@ -0,0 +1,36 @@
+--- configure.orig	2008-05-21 10:10:32.000000000 -0600
++++ configure	2008-11-06 19:32:24.000000000 -0700
+@@ -51,6 +51,16 @@
+    exit 1 ;;
+ esac
+ 
++case $MACHINE in
++  *Darwin[56]) CCC=${CC-cc};;
++  *)           CCC=${CC-gcc};;
++esac
++#case $OS in
++# SunOS)  LIBCOMPAT=" -lsocket"  ;;
++# NetBSD) LIBCOMPAT=" -lcompat"  ;;
++# *)      LIBCOMPAT=  ;;
++#esac
++
+ # We need a working `echo' command: at least Solaris2.6 may not have it.
+ case `echo -n hello | wc -c | ( read n ; echo $n )` in
+     5) ;;
+@@ -164,16 +174,6 @@
+   *) ;;
+ esac
+ 
+-case $MACHINE in
+-  *Darwin[56]) CCC=${CC-cc};;
+-  *)           CCC=${CC-gcc};;
+-esac
+-#case $OS in
+-# SunOS)  LIBCOMPAT=" -lsocket"  ;;
+-# NetBSD) LIBCOMPAT=" -lcompat"  ;;
+-# *)      LIBCOMPAT=  ;;
+-#esac
+-
+ # Detect Haskell compilers and choose one for building with.
+ # (Also generates a little script for configuring hmake later.)
+ if [ -d src ]	# Delay this step if it is a binary (src-less) distribution.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081106/b2f364fb/attachment.html>