diff options
| author | wiz <wiz@pkgsrc.org> | 2012-06-06 22:19:57 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-06-06 22:19:57 +0000 |
| commit | 1b821229ab3aeeb8351ffb572d01b6aa28cb1f41 (patch) | |
| tree | 3dad4aac2ad086ce337d7d2d2df7403ae48110d7 /fonts | |
| parent | 1108faf47060e8a47bc8989e649924e58f02a0fa (diff) | |
| download | pkgsrc-1b821229ab3aeeb8351ffb572d01b6aa28cb1f41.tar.gz | |
Use hacks file from meta-pkgs/modular-xorg instead of patch for
fixing autoconf + space in variable name issue.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/libfontenc/Makefile | 4 | ||||
| -rw-r--r-- | fonts/libfontenc/distinfo | 3 | ||||
| -rw-r--r-- | fonts/libfontenc/patches/patch-configure | 17 |
3 files changed, 4 insertions, 20 deletions
diff --git a/fonts/libfontenc/Makefile b/fonts/libfontenc/Makefile index 5eff081ec68..1038f17fc51 100644 --- a/fonts/libfontenc/Makefile +++ b/fonts/libfontenc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/06/03 17:21:25 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/06/06 22:19:57 wiz Exp $ # DISTNAME= libfontenc-1.1.1 @@ -17,6 +17,8 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= fontenc.pc.in GNU_CONFIGURE= yes +.include "../../meta-pkgs/modular-xorg/hacks.mk" + .include "../../devel/zlib/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/fonts/libfontenc/distinfo b/fonts/libfontenc/distinfo index 800e6be23e4..43e9dcfb9fe 100644 --- a/fonts/libfontenc/distinfo +++ b/fonts/libfontenc/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2012/06/05 15:27:22 wiz Exp $ +$NetBSD: distinfo,v 1.6 2012/06/06 22:19:58 wiz Exp $ SHA1 (libfontenc-1.1.1.tar.bz2) = 90bdd53d75585dd0f06ad7bc23faccd8a01bb733 RMD160 (libfontenc-1.1.1.tar.bz2) = 237ca9ba30d46666608894a13f974eb76d067b34 Size (libfontenc-1.1.1.tar.bz2) = 289688 bytes -SHA1 (patch-configure) = 7a04ee4e0de43948eb38a35a08fdaac7aba26b55 diff --git a/fonts/libfontenc/patches/patch-configure b/fonts/libfontenc/patches/patch-configure deleted file mode 100644 index bcd1512d8b8..00000000000 --- a/fonts/libfontenc/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2012/06/05 15:27:22 wiz Exp $ - -Fix build breaker in NetBSD<6's sh: -checking if cc -std=gnu99 supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... -eval: 1: Syntax error: Bad substitution - ---- configure.orig 2012-03-03 01:52:25.000000000 +0000 -+++ configure -@@ -13733,7 +13733,7 @@ $as_echo "$supported" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 - $as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } -- cacheid=`$as_echo xorg_cv_cc_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED` -+ cacheid=`$as_echo "xorg_cv_cc_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"` - if { as_var=`$as_echo "$cacheid" | $as_tr_sh`; eval \${$as_var+:} false; }; then : - $as_echo_n "(cached) " >&6 - else |