diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-28 07:23:47 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-28 07:23:47 +0000 |
| commit | 21cbbe4d7261151e78c2c5457f8f2c9cb91ff4cb (patch) | |
| tree | cbfee9871f147b908aed5ab42b0e3a15f1c39735 /sysutils/xcdroast | |
| parent | Per distfile survey, note the fact that the mastersite for this code (diff) | |
Does not build the included version of libintl, use the gettext one.
PR: ports/58375
Submitted By: Simon Barner <barner@in.tum.de>
Notes
Notes:
svn path=/head/; revision=92403
Diffstat (limited to 'sysutils/xcdroast')
| -rw-r--r-- | sysutils/xcdroast/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/xcdroast/files/patch-aclocal.m4 | 43 | ||||
| -rw-r--r-- | sysutils/xcdroast/pkg-plist | 2 |
3 files changed, 49 insertions, 3 deletions
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 5f72ab7eb36d..035e3a563686 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -16,17 +16,22 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./alpha/} MAINTAINER= oliver@FreeBSD.org COMMENT= Another X11 frontend to mkisofs/cdrecord +LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \ + iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ mkisofs:${PORTSDIR}/sysutils/mkisofs USE_X_PREFIX= yes USE_GNOME= gdkpixbuf GNU_CONFIGURE= yes +USE_AUTOCONF_VER= 253 CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" -CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE} +CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE} \ + --with-libintl-prefix=${LOCALBASE} \ + --with-libiconv-prefix=${LOCALBASE} MAN1= xcdroast.1 diff --git a/sysutils/xcdroast/files/patch-aclocal.m4 b/sysutils/xcdroast/files/patch-aclocal.m4 new file mode 100644 index 000000000000..5ead686fcb92 --- /dev/null +++ b/sysutils/xcdroast/files/patch-aclocal.m4 @@ -0,0 +1,43 @@ +--- 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 diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist index 6ec9aea22e06..35a9b5964c27 100644 --- a/sysutils/xcdroast/pkg-plist +++ b/sysutils/xcdroast/pkg-plist @@ -1,5 +1,4 @@ bin/xcdroast -lib/charset.alias lib/xcdroast-0.98/bin/cddbtool lib/xcdroast-0.98/bin/rmtool lib/xcdroast-0.98/bin/vrfytool @@ -32,7 +31,6 @@ share/locale/hu/LC_MESSAGES/xcdroast.mo share/locale/id/LC_MESSAGES/xcdroast.mo share/locale/it/LC_MESSAGES/xcdroast.mo share/locale/ja/LC_MESSAGES/xcdroast.mo -share/locale/locale.alias share/locale/nl/LC_MESSAGES/xcdroast.mo share/locale/no/LC_MESSAGES/xcdroast.mo share/locale/pl/LC_MESSAGES/xcdroast.mo |