diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-07-19 14:10:42 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-07-19 14:10:42 +0000 |
| commit | 32fa489d38a8f274d185967a716c6db98fb1d7ff (patch) | |
| tree | fb19b8f9e9566af33de3ca7aff0112b412926cfe /audio/gqmpeg-devel | |
| parent | - Don't generate catalog chain and minor cleanups (diff) | |
Remove kludge and fix -lintl detection.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=63246
Diffstat (limited to 'audio/gqmpeg-devel')
| -rw-r--r-- | audio/gqmpeg-devel/Makefile | 5 | ||||
| -rw-r--r-- | audio/gqmpeg-devel/files/patch-aclocal.m4 | 46 |
2 files changed, 47 insertions, 4 deletions
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index e5b01ee67ce9..ed0042a839c6 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -47,11 +47,8 @@ pre-everything:: @${ECHO_MSG} .endif -post-patch: - @${FIND} ${WRKSRC} -name 'Makefile.in*' | ${XARGS} ${REINPLACE_CMD} \ - -E -e 's|(SUBDIRS[[:space:]]+=.*)intl|\1| ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ;' .if defined(WITH_MPG321) +post-patch: @${REINPLACE_CMD} -E -e \ 's/^(#define MPG123_BINARY "mpg)123"/\1321"/' \ ${WRKSRC}/src/io_mpg123.c diff --git a/audio/gqmpeg-devel/files/patch-aclocal.m4 b/audio/gqmpeg-devel/files/patch-aclocal.m4 new file mode 100644 index 000000000000..d9d89fd88eee --- /dev/null +++ b/audio/gqmpeg-devel/files/patch-aclocal.m4 @@ -0,0 +1,46 @@ + +$FreeBSD$ + +--- aclocal.m4.orig Wed Jul 17 20:48:30 2002 ++++ aclocal.m4 Thu Jul 18 16:38:49 2002 +@@ -545,7 +545,7 @@ + rm -f conf.gdk_pixbuftest + ]) + +-# gettext.m4 serial 13 (gettext-0.11.1) ++# gettext.m4 serial 14 (gettext-0.11.2) + dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU + dnl General Public License. As a special exception to the GNU General +@@ -689,14 +689,13 @@ + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include <libintl.h> + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; + extern + #ifdef __cplusplus + "C" + #endif + const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. +@@ -704,14 +703,13 @@ + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include <libintl.h> + extern int _nl_msg_cat_cntr; +-extern int *_nl_domain_bindings; + extern + #ifdef __cplusplus + "C" + #endif + const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes |