@@ -21,12 +21,7 @@ module Digest where -- -- A few imports, should tidy these up one day. -- -#if __GLASGOW_HASKELL__ >= 608 -import qualified Data.ByteString.Unsafe as B (unsafeUseAsCStringLen) -#else -import qualified Data.ByteString.Base as B (unsafeUseAsCStringLen) -#endif -import qualified Data.ByteString as B +import qualified Data.ByteString.Char8 as B import Foreign import Foreign.C.Types import Numeric (showHex) @@ -53,7 +48,7 @@ ripemd160_digest_length = 20 -- While this md5sum binding will return: -- md5sum :: B.ByteString -> String -md5sum p = unsafePerformIO $ B.unsafeUseAsCStringLen p $ \(ptr,n) -> do +md5sum p = unsafePerformIO $ B.useAsCStringLen p $ \(ptr,n) -> do allocaBytes md5_digest_length $ \digest_ptr -> do digest <- c_md5 ptr (fromIntegral n) digest_ptr go digest 0 [] @@ -74,7 +69,7 @@ md5sum p = unsafePerformIO $ B.unsafeUseAsCStringLen p $ \(ptr,n) -> do #endif sha1sum :: B.ByteString -> String -sha1sum p = unsafePerformIO $ B.unsafeUseAsCStringLen p $ \(ptr,n) -> do +sha1sum p = unsafePerformIO $ B.useAsCStringLen p $ \(ptr,n) -> do allocaBytes sha1_digest_length $ \digest_ptr -> do digest <- c_sha1 ptr (fromIntegral n) digest_ptr go digest 0 [] @@ -95,7 +90,7 @@ sha1sum p = unsafePerformIO $ B.unsafeUseAsCStringLen p $ \(ptr,n) -> do #endif ripemd160sum :: B.ByteString -> String -ripemd160sum p = unsafePerformIO $ B.unsafeUseAsCStringLen p $ \(ptr,n) -> do +ripemd160sum p = unsafePerformIO $ B.useAsCStringLen p $ \(ptr,n) -> do allocaBytes ripemd160_digest_length $ \digest_ptr -> do digest <- c_ripemd160 ptr (fromIntegral n) digest_ptr go digest 0 [] Digest.hs @@ -2,6 +2,7 @@ module Main where import Digest +import qualified Data.Set as DS import Data.Char (intToDigit) import Data.List ( sortBy, groupBy, maximumBy, intercalate, isPrefixOf ) import Data.Maybe ( listToMaybe, fromJust, fromMaybe, isJust ) @@ -228,8 +229,7 @@ checksumURI uri = do let bytes = pack tarballData return [ "md5 " ++ md5sum bytes , "sha1 " ++ sha1sum bytes - , "rmd160 " ++ ripemd160sum bytes - ] + , "rmd160 " ++ ripemd160sum bytes ] simpleVersion :: PackageDisplayInfo -> String simpleVersion = showVersion . packageVersion . fromJust . latestAvailable @@ -275,11 +275,20 @@ portfileEntries ("configure_et_al", _) , "" , "#pre-deactivate { system \"${prefix}/libexec/${name}/unregister.sh\" }" ] -portfileEntries (x, []) = x ++ "\tNYI" -portfileEntries (x, y) = x ++ "\t" ++ y +portfileEntries (x, []) = x +portfileEntries (x, y) = x ++ "\t" ++ y buildDependencies :: PackageDisplayInfo -> String -buildDependencies info = "" +buildDependencies = intercalate " \\\n\t\t" + . DS.toList . DS.fromList + . deps . dependencies + where deps (x:xs) = + let (Dependency depName ver) = x + (PackageName name) = depName + in xlatdep name : deps xs + where xlatdep "base" = "port:ghc" + xlatdep n = "port:hs-" ++ n + deps _ = [] splitString :: String -> String -> [String] splitString = split' [] @@ -323,7 +332,7 @@ buildPortfile info sums , ([], []) , ("checksums", sums) , ([], []) - , ("depends_build", "port:ghc" ++ buildDependencies info) + , ("depends_build", buildDependencies info) , ([], []) , ("configure_et_al", []) ] Main.hs bbb1ab294377913d242c436673edd1dfe66ad021 John Wiegley johnw@newartisans.com http://github.com/jwiegley/hackports/commit/8808178c9d18761ad6fb03b713fa3923afc05f8b 8808178c9d18761ad6fb03b713fa3923afc05f8b 2009-03-22T18:31:19-07:00 2009-03-22T18:31:19-07:00 Package checksums are correctly generated now c32f12719301f915691cdf4f83b9827c4b90548c John Wiegley johnw@newartisans.com