diff options
| -rw-r--r-- | devel/gettext/Makefile | 12 | ||||
| -rw-r--r-- | devel/gettext/distinfo | 4 | ||||
| -rw-r--r-- | devel/gettext/files/patch-config_ltmain.sh | 53 | ||||
| -rw-r--r-- | devel/gettext/files/patch-gettext-runtime_configure | 19 | ||||
| -rw-r--r-- | devel/gettext/files/patch-gettext-runtime_intl_Makefile.in | 21 | ||||
| -rw-r--r-- | devel/gettext/files/patch-gettext-tools_Makefile.in | 12 | ||||
| -rw-r--r-- | devel/gettext/files/patch-gettext-tools_configure | 21 | ||||
| -rw-r--r-- | devel/gettext/files/patch-gettext-tools_lib_Makefile.in | 18 | ||||
| -rw-r--r-- | devel/gettext/pkg-plist | 12 |
9 files changed, 76 insertions, 96 deletions
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 57c59bacfced..598f2c1952dc 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gettext -PORTVERSION= 0.13.1 -PORTREVISION= 1 +PORTVERSION= 0.14.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gettext @@ -15,9 +14,11 @@ MASTER_SITE_SUBDIR= gettext MAINTAINER= ports@FreeBSD.org COMMENT= GNU gettext package -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_ICONV= yes +LIBTOOLFILES= autoconf-lib-link/configure gettext-runtime/configure \ + gettext-runtime/libasprintf/configure gettext-tools/configure +USE_LIBTOOL_VER=15 +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= ACLOCAL="${TRUE}" \ AUTOCONF="${TRUE}" \ AUTOMAKE="${TRUE}" \ @@ -25,7 +26,8 @@ CONFIGURE_ENV= ACLOCAL="${TRUE}" \ MAKEINFO="makeinfo --no-split" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --mandir=${PREFIX}/man +CONFIGURE_ARGS= --disable-csharp \ + --mandir=${PREFIX}/man INSTALLS_SHLIB= yes .if !defined(WITHOUT_GETTEXT_OPTIONS) diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index fc4824fd526c..aad848b86f57 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,2 +1,2 @@ -MD5 (gettext-0.13.1.tar.gz) = b3477289185e7781527345c14a4565de -SIZE (gettext-0.13.1.tar.gz) = 6458256 +MD5 (gettext-0.14.1.tar.gz) = 78f4b862510beb2e5d43223dd610e77d +SIZE (gettext-0.14.1.tar.gz) = 6550874 diff --git a/devel/gettext/files/patch-config_ltmain.sh b/devel/gettext/files/patch-config_ltmain.sh deleted file mode 100644 index fade35fc2d52..000000000000 --- a/devel/gettext/files/patch-config_ltmain.sh +++ /dev/null @@ -1,53 +0,0 @@ -$FreeBSD$ - ---- config/ltmain.sh.orig Tue Apr 15 19:22:56 2003 -+++ config/ltmain.sh Wed Jun 11 14:15:07 2003 -@@ -1279,7 +1279,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1289,8 +1289,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3001,6 +3009,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5429,10 +5440,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gettext/files/patch-gettext-runtime_configure b/devel/gettext/files/patch-gettext-runtime_configure index 2318d6c70086..bf307ffa93cf 100644 --- a/devel/gettext/files/patch-gettext-runtime_configure +++ b/devel/gettext/files/patch-gettext-runtime_configure @@ -1,13 +1,20 @@ -$FreeBSD$ - ---- gettext-runtime/configure.orig Wed Jun 11 17:21:41 2003 -+++ gettext-runtime/configure Wed Jun 11 17:21:56 2003 -@@ -1875,7 +1875,7 @@ - ac_config_headers="$ac_config_headers config.h" +--- gettext-runtime/configure.orig Thu Jan 29 12:12:42 2004 ++++ gettext-runtime/configure Mon Dec 13 02:57:36 2004 +@@ -1938,7 +1938,7 @@ + docdir='${datadir}/doc/gettext' -test "$mandir" != '${prefix}/man' || mandir='${datadir}/man' +test "$mandir" != '${prefix}/man' || mandir='${prefix}/man' ac_ext=c ac_cpp='$CPP $CPPFLAGS' +@@ -3635,7 +3635,7 @@ + fi + + if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +- BUILDJAVA=yes ++ BUILDJAVA=no + else + BUILDJAVA=no + fi diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in index 17e36a8e30ec..05be764cc626 100644 --- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in +++ b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in @@ -1,7 +1,5 @@ -$FreeBSD$ - ---- gettext-runtime/intl/Makefile.in.orig Wed May 21 06:55:18 2003 -+++ gettext-runtime/intl/Makefile.in Wed Jun 11 14:28:58 2003 +--- gettext-runtime/intl/Makefile.in.orig Sat Jan 17 10:54:06 2004 ++++ gettext-runtime/intl/Makefile.in Mon Dec 13 02:46:25 2004 @@ -52,7 +52,7 @@ YFLAGS = --name-prefix=__gettext @@ -11,7 +9,7 @@ $FreeBSD$ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ -Dset_relocation_prefix=libintl_set_relocation_prefix \ -Drelocate=libintl_relocate \ -@@ -145,7 +145,7 @@ +@@ -152,7 +152,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(LIBTOOL) --mode=link \ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ @@ -20,7 +18,16 @@ $FreeBSD$ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ -no-undefined -@@ -270,22 +270,6 @@ +@@ -162,7 +162,7 @@ + # according to the libtool documentation, section "Library interface versions". + # Maintainers of other packages that include the intl directory must *not* + # change these values. +-LTV_CURRENT=7 ++LTV_CURRENT=6 + LTV_REVISION=0 + LTV_AGE=4 + +@@ -283,22 +283,6 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ @@ -43,7 +50,7 @@ $FreeBSD$ $(mkinstalldirs) $(DESTDIR)$(localedir); \ test -f $(DESTDIR)$(localedir)/locale.alias \ && orig=$(DESTDIR)$(localedir)/locale.alias \ -@@ -369,9 +353,9 @@ +@@ -382,9 +366,9 @@ : ; \ fi if test '@USE_INCLUDED_LIBINTL@' = yes; then \ diff --git a/devel/gettext/files/patch-gettext-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in index 7cbc7bb50d65..a619db7d254b 100644 --- a/devel/gettext/files/patch-gettext-tools_Makefile.in +++ b/devel/gettext/files/patch-gettext-tools_Makefile.in @@ -1,13 +1,11 @@ -$FreeBSD$ - ---- gettext-tools/Makefile.in.orig Sun Nov 30 14:03:22 2003 -+++ gettext-tools/Makefile.in Fri Jan 23 15:24:35 2004 -@@ -214,7 +214,7 @@ +--- gettext-tools/Makefile.in.orig Thu Jan 29 12:13:35 2004 ++++ gettext-tools/Makefile.in Mon Dec 13 02:21:20 2004 +@@ -328,7 +328,7 @@ + target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../config/m4 - -SUBDIRS = doc intl lib libuniname src po projects misc man m4 tests examples +SUBDIRS = intl lib libuniname src po projects misc man m4 - # vms_jackets.h is a header that comes with Compaq's "porting library". # KEEP_CRTL_SETLOCALE tells it to not override the native locale support. + EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextpo.def windows/gettextlib.rc windows/gettextsrc.rc windows/gettextpo.rc diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure index edd232d6d330..971342a41090 100644 --- a/devel/gettext/files/patch-gettext-tools_configure +++ b/devel/gettext/files/patch-gettext-tools_configure @@ -1,15 +1,15 @@ ---- gettext-tools/configure.orig Wed Dec 17 21:09:24 2003 -+++ gettext-tools/configure Sat Aug 28 12:28:03 2004 +--- gettext-tools/configure.orig Thu Jan 29 12:13:22 2004 ++++ gettext-tools/configure Mon Dec 13 02:56:59 2004 @@ -463,7 +463,7 @@ # include <unistd.h> #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LTALLOCA LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT HAVE_BSDXML EMACS lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LTALLOCA LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE STDBOOL_H HAVE__BOOL ALLOCA ALLOCA_H FNMATCH_H MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT HAVE_BSDXML EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. -@@ -1923,7 +1923,7 @@ +@@ -1962,7 +1962,7 @@ docdir='${datadir}/doc/gettext' @@ -18,7 +18,16 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -36072,6 +36072,17 @@ +@@ -3764,7 +3764,7 @@ + fi + + if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +- BUILDJAVA=yes ++ BUILDJAVA=no + else + BUILDJAVA=no + fi +@@ -36704,6 +36704,17 @@ case "$host_os" in diff --git a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in index b617875d7d7e..4644ecaa64e3 100644 --- a/devel/gettext/files/patch-gettext-tools_lib_Makefile.in +++ b/devel/gettext/files/patch-gettext-tools_lib_Makefile.in @@ -1,17 +1,15 @@ -$FreeBSD$ - ---- gettext-tools/lib/Makefile.in.orig Thu May 22 09:41:20 2003 -+++ gettext-tools/lib/Makefile.in Wed Jun 11 14:05:44 2003 -@@ -67,7 +67,7 @@ +--- gettext-tools/lib/Makefile.in.orig Thu Jan 29 12:13:36 2004 ++++ gettext-tools/lib/Makefile.in Mon Dec 13 02:27:59 2004 +@@ -174,7 +174,7 @@ + CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ - -DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(libdir)\" +DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(prefix)/libdata\" DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DVIPS = @DVIPS@ -@@ -317,7 +317,7 @@ +@@ -451,7 +451,7 @@ # Need @LTLIBICONV@ because linebreak.c uses iconv(). libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @@ -19,10 +17,10 @@ $FreeBSD$ + @LTLIBINTL@ @LTLIBICONV@ -no-undefined + # Extra files to be installed. +@@ -725,7 +725,7 @@ -@@ -599,7 +599,7 @@ - - install-data-am: install-gettextsrcDATA + install-data-am: install-examplesconfigDATA install-gettextsrcDATA -install-exec-am: install-exec-local install-libLTLIBRARIES +install-exec-am: install-libLTLIBRARIES diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist index 5561138f9b18..d24a47a4ee55 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext/pkg-plist @@ -27,6 +27,7 @@ lib/libasprintf.a lib/libasprintf.so lib/libasprintf.so.0 lib/libgettextlib-%%VERSION%%.so +lib/libgettextlib.a lib/libgettextlib.so lib/libgettextpo.a lib/libgettextpo.so @@ -68,6 +69,16 @@ share/aclocal/ulonglong.m4 share/aclocal/wchar_t.m4 share/aclocal/wint_t.m4 share/aclocal/xsize.m4 +%%DOCSDIR%%/csharpdoc/GNU_Gettext.html +%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceManager.html +%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceSet.html +%%DOCSDIR%%/csharpdoc/begin.html +%%DOCSDIR%%/csharpdoc/index.html +%%DOCSDIR%%/csharpdoc/namespaces.html +%%DOCSDIR%%/examples/config/csharpcomp.m4 +%%DOCSDIR%%/examples/config/csharpcomp.sh.in +%%DOCSDIR%%/examples/config/csharpexec.m4 +%%DOCSDIR%%/examples/config/csharpexec.sh.in %%DOCSDIR%%/examples/config/gcj.m4 %%DOCSDIR%%/examples/config/javacomp.m4 %%DOCSDIR%%/examples/config/javacomp.sh.in @@ -280,6 +291,7 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo @dirrm %%DOCSDIR%%/javadoc1 @dirrm %%DOCSDIR%%/examples/config @dirrm %%DOCSDIR%%/examples +@dirrm %%DOCSDIR%%/csharpdoc @dirrm %%DOCSDIR%% @dirrm libdata/gettext-tools @unexec rmdir %%LOCALBASE%%/share/locale/be/LC_MESSAGES 2>/dev/null || true |