diff options
| author | joerg <joerg> | 2013-11-13 22:49:31 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-11-13 22:49:31 +0000 |
| commit | aeb1902e4f720212ff7940f899da291f17645629 (patch) | |
| tree | a25540f4a60bc0a18f363dc785ac3d250c0a1098 /lang | |
| parent | c3c51839cdf355af70aa70a9a96d91454796f2d8 (diff) | |
| download | pkgsrc-aeb1902e4f720212ff7940f899da291f17645629.tar.gz | |
Make the newline processing even more aggressive by removing the line
markers first and killing all newlines before splitting up the magic
markers. Fixes build of guile-gnome with Clang. Bump revision.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/guile/Makefile | 4 | ||||
| -rw-r--r-- | lang/guile/distinfo | 4 | ||||
| -rw-r--r-- | lang/guile/patches/patch-libguile_guile-snarf.in | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 2fa5677d0b8..860ce978893 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2013/10/18 15:53:27 roy Exp $ +# $NetBSD: Makefile,v 1.104 2013/11/13 22:49:31 joerg Exp $ DISTNAME= guile-1.8.8 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=guile/} diff --git a/lang/guile/distinfo b/lang/guile/distinfo index e835e4632f5..ef536caae46 100644 --- a/lang/guile/distinfo +++ b/lang/guile/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2013/10/04 18:35:22 joerg Exp $ +$NetBSD: distinfo,v 1.47 2013/11/13 22:49:31 joerg Exp $ SHA1 (guile-1.8.8.tar.gz) = 548d6927aeda332b117f8fc5e4e82c39a05704f9 RMD160 (guile-1.8.8.tar.gz) = 8ac185a72ad8394b14d5377549e5bbf02889faaa @@ -13,4 +13,4 @@ SHA1 (patch-am) = 7a549811ef98f40a6a87f31840109ee2a091489b SHA1 (patch-an) = 89ee76c4e74a7af3a5e2a8e65d889292de1768f1 SHA1 (patch-ao) = b648826c5e951cd98ca6e2cdf48435cbdba096ff SHA1 (patch-libguile_guile-snarf-docs.in) = 392b0774a8d21bc06f2cf741683773b918bc8ffb -SHA1 (patch-libguile_guile-snarf.in) = f2cbf83d7f1bb161599b7c86dc327f8416bbe612 +SHA1 (patch-libguile_guile-snarf.in) = d534adce77040d441b0771efc536bc7e8560365d diff --git a/lang/guile/patches/patch-libguile_guile-snarf.in b/lang/guile/patches/patch-libguile_guile-snarf.in index cdebb7f4b35..395883f7ccb 100644 --- a/lang/guile/patches/patch-libguile_guile-snarf.in +++ b/lang/guile/patches/patch-libguile_guile-snarf.in @@ -1,4 +1,4 @@ -$NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $ +$NetBSD: patch-libguile_guile-snarf.in,v 1.2 2013/11/13 22:49:31 joerg Exp $ --- libguile/guile-snarf.in.orig 2010-12-13 17:24:40.000000000 +0000 +++ libguile/guile-snarf.in @@ -7,8 +7,8 @@ $NetBSD: patch-libguile_guile-snarf.in,v 1.1 2013/10/04 18:35:22 joerg Exp $ echo "/* cpp arguments: $@ */" ; ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true - grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" -+ sed 's,\^ *\^,\ -+&,g' ${temp} | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" ++ grep -v '^#' ${temp} | tr '\n' ' ' | sed 's,\^ *\^,\ ++&,g' | grep "^ *\^ *\^" | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" } ## main |