Revert "Untested x86_64 support":

  It didn't work.

This reverts commit ef84a5b914c14a4571e79f9f6d74fe21d5453d97.

diff --git a/Makefile b/Makefile
index 1a8276cd95095c3cbdc6ad069e65be038f082ccf..691fb8b9b0e99dff0d4df0f833d387113f688d30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,19 +11,17 @@ COMMENT=            Compiler for the functional language Haskell
 DISTFILES=             ${DISTNAME}-src.tar.bz2 \
                                ghc-6.6.1-src.tar.bz2 \
                                ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz \
-                               ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz \
                                ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz
 
 SITES.ghc-6.6.1-src.tar.bz2                                            = http://www.haskell.org/ghc/dist/6.6.1/
 SITES.ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz = http://static.cielonegro.org/archive/
-SITES.ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz = http://static.cielonegro.org/archive/
 SITES.ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz = http://static.cielonegro.org/archive/
 
 .include "../../mk/bsd.prefs.mk"
 
 # Unregisterised HC packages are architecture dependent. We have to
 # create more HC packages to support more architectures.
-ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-powerpc
+ONLY_FOR_PLATFORM= *-*-i386 *-*-powerpc
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                PerlCmd=${PERL5:Q}
@@ -35,8 +33,6 @@ EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 \
 
 .if ${MACHINE_ARCH} == "i386"
 EXTRACT_ONLY += ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz
-.elif ${MACHINE_ARCH} == "x86_64"
-EXTRACT_ONLY += ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz
 .elif ${MACHINE_ARCH} == "powerpc"
 EXTRACT_ONLY += ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz
 .endif
@@ -53,7 +49,7 @@ pre-configure:
        cd ${WRKDIR}/ghc-6.6.1 && \
                ${CHMOD} +x ./distrib/hc-build && \
                ${ENV} ${CONFIGURE_ENV} ./distrib/hc-build -C --disable-readline --enable-hc-boot-unregisterised && \
-               ${FIND} . -type f -and -perm -o+x -and -name '*-inplace' | \
+               ${FIND} . -type f -and -perm +o+x -and -name '*-inplace' | \
                        while read i; do \
                                ${CP} $$i ${BUILDLINK_DIR}/bin/`basename $$i | sed -e 's/-inplace//'`; \
                        done

diff --git a/distinfo b/distinfo
index 1ab3bea666ab9d68ad7ac7bbfb28bf28bdefcb61..4c395574d97f83cb7c4acfa653d72457bc0b2738 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -12,8 +12,5 @@ Size (ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz) = 11335543 bytes
 SHA1 (ghc-6.6.1-src.tar.bz2) = cc1846b4ad607e270721371ce4043b1a017cd10e
 RMD160 (ghc-6.6.1-src.tar.bz2) = 6b82a74559425fe5fe1fa1b67a83433457bae0ad
 Size (ghc-6.6.1-src.tar.bz2) = 4339970 bytes
-SHA1 (ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz) = fab95d687cc77007c99e4bfe148cda6f0c3c0f78
-RMD160 (ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz) = ec3bf24d2afb8858815853f1052b96a0b3f5eed6
-Size (ghc-6.6.1-x86_64-unknown-linux-hc.tar.gz) = 11265659 bytes
 SHA1 (patch-aa) = fd9cd9ec50fab10c81a84d49bc9e43068df2804a
 SHA1 (patch-ab) = 651695a6634b68d9eaa18bc583bf43e73d2d50a1