View | Details | Raw Unified | Return to bug 108559
Collapse All | Expand All

(-)gettext/Makefile (-8 / +10 lines)
Lines 2-13 Link Here
2
# Date created:        16 March 1998
2
# Date created:        16 March 1998
3
# Whom:                Yukihiro Nakai <Nakai@technologist.com>
3
# Whom:                Yukihiro Nakai <Nakai@technologist.com>
4
#
4
#
5
# $FreeBSD: ports/devel/gettext/Makefile,v 1.74 2006/02/23 10:35:39 ade Exp $
5
# $FreeBSD$
6
#
6
#
7
7
8
PORTNAME=	gettext
8
PORTNAME=	gettext
9
PORTVERSION=	0.14.5
9
PORTVERSION=	0.16.1
10
PORTREVISION=	2
11
CATEGORIES=	devel
10
CATEGORIES=	devel
12
MASTER_SITES=	${MASTER_SITE_GNU}
11
MASTER_SITES=	${MASTER_SITE_GNU}
13
MASTER_SITE_SUBDIR=	gettext
12
MASTER_SITE_SUBDIR=	gettext
Lines 19-24 Link Here
19
LIBTOOLFILES=	autoconf-lib-link/configure gettext-runtime/configure \
18
LIBTOOLFILES=	autoconf-lib-link/configure gettext-runtime/configure \
20
		gettext-runtime/libasprintf/configure gettext-tools/configure
19
		gettext-runtime/libasprintf/configure gettext-tools/configure
21
USE_AUTOTOOLS=	libtool:15
20
USE_AUTOTOOLS=	libtool:15
21
22
USE_LDCONFIG=	yes
23
22
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
24
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
23
CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
25
CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
24
		AUTOCONF="${TRUE}" \
26
		AUTOCONF="${TRUE}" \
Lines 29-41 Link Here
29
		LDFLAGS="-L${LOCALBASE}/lib" \
31
		LDFLAGS="-L${LOCALBASE}/lib" \
30
		EMACS="no"
32
		EMACS="no"
31
CONFIGURE_ARGS=	--disable-csharp \
33
CONFIGURE_ARGS=	--disable-csharp \
32
		--mandir=${PREFIX}/man
34
		--mandir=${MANPREFIX}/man \
33
INSTALLS_SHLIB=	yes
35
		--infodir=${PREFIX}/${INFO_PATH}
34
36
35
.if !defined(WITHOUT_GETTEXT_OPTIONS)
36
OPTIONS=	EXAMPLES "install example files" off \
37
OPTIONS=	EXAMPLES "install example files" off \
37
		HTMLMAN "install man pages in HTML format" off
38
		HTMLMAN "install man pages in HTML format" off
38
.endif
39
39
PLIST=		${WRKDIR}/plist
40
PLIST=		${WRKDIR}/plist
40
PLISTU=		${WRKDIR}/plist-unsorted
41
PLISTU=		${WRKDIR}/plist-unsorted
41
PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
42
PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
Lines 86-92 Link Here
86
	@${RM} -f ${PLISTU}
87
	@${RM} -f ${PLISTU}
87
	@${TOUCH} ${PLISTU}
88
	@${TOUCH} ${PLISTU}
88
.if !defined (NOPORTDOCS)
89
.if !defined (NOPORTDOCS)
89
.for ii in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 foot toc
90
.for ii in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 foot toc
90
	${ECHO_CMD} %%DOCSDIR%%/gettext_${ii}.html >> ${PLISTU}
91
	${ECHO_CMD} %%DOCSDIR%%/gettext_${ii}.html >> ${PLISTU}
91
.endfor
92
.endfor
92
.endif
93
.endif
Lines 115-120 Link Here
115
.endfor
116
.endfor
116
	${MKDIR} ${X11BASE}/share/locale
117
	${MKDIR} ${X11BASE}/share/locale
117
	cd ${WRKSRC}/gettext-tools/doc && make install-info-am
118
	cd ${WRKSRC}/gettext-tools/doc && make install-info-am
119
	cd ${WRKSRC}/gettext-runtime/libasprintf && make install-info-am
118
.if !defined (NOPORTDOCS)
120
.if !defined (NOPORTDOCS)
119
	cd ${WRKSRC}/gettext-runtime/doc && make install-data
121
	cd ${WRKSRC}/gettext-runtime/doc && make install-data
120
	cd ${WRKSRC}/gettext-tools/doc && make install-data-local
122
	cd ${WRKSRC}/gettext-tools/doc && make install-data-local
(-)gettext/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (gettext-0.14.5.tar.gz) = e2f6581626a22a0de66dce1d81d00de3
1
MD5 (gettext-0.16.1.tar.gz) = 3d9ad24301c6d6b17ec30704a13fe127
2
SHA256 (gettext-0.14.5.tar.gz) = a8aea89f4c187f5ba57d39e68f47a4c7f4752bdd0642fe89e3e941d6378907ab
2
SHA256 (gettext-0.16.1.tar.gz) = 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
3
SIZE (gettext-0.14.5.tar.gz) = 7105715
3
SIZE (gettext-0.16.1.tar.gz) = 8539634
(-)gettext/files/patch-ad (-14 lines)
Lines 1-14 Link Here
1
--- gettext-tools/misc/Makefile.in.orig	Mon Mar 14 07:24:11 2005
2
+++ gettext-tools/misc/Makefile.in	Mon Mar 14 20:40:33 2005
3
@@ -447,11 +447,9 @@
4
 	  list='$(lisp_LISP)'; for p in $$list; do \
5
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6
 	    f=$(am__strip_dir) \
7
-	    echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
8
 	    $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \
9
 	    if test -f $${p}c; then \
10
 	      echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
11
-	      $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \
12
 	    else : ; fi; \
13
 	  done; \
14
 	else : ; fi
(-)gettext/files/patch-ak (-13 lines)
Lines 1-13 Link Here
1
$FreeBSD: ports/devel/gettext/files/patch-ak,v 1.4 2005/05/13 03:51:07 ahze Exp $
2
3
--- gettext-tools/misc/po-mode.el.orig	Sun Jan 23 22:35:10 2000
4
+++ gettext-tools/misc/po-mode.el	Sun Jan 23 22:35:39 2000
5
@@ -330,7 +330,7 @@
6
   :type 'face
7
   :group 'po)
8
 
9
-(defcustom po-gzip-uuencode-command "gzip -9 | uuencode -m"
10
+(defcustom po-gzip-uuencode-command "gzip -9 | uuencode"
11
   "*The filter to use for preparing a mail invoice of the PO file.
12
 Normally \"gzip -9 | uuencode -m\", remove the -9 for lesser compression,
13
 or remove the -m if you are not using the GNU version of `uuencode'."
(-)gettext/files/patch-gettext-runtime_configure (-20 lines)
Lines 1-20 Link Here
1
--- gettext-runtime/configure.orig	Thu Jan 29 12:12:42 2004
2
+++ gettext-runtime/configure	Mon Dec 13 02:57:36 2004
3
@@ -1938,7 +1938,7 @@
4
 
5
 docdir='${datadir}/doc/gettext'
6
 
7
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
8
+test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
9
 
10
 ac_ext=c
11
 ac_cpp='$CPP $CPPFLAGS'
12
@@ -3635,7 +3635,7 @@
13
 fi
14
 
15
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
16
-  BUILDJAVA=yes
17
+  BUILDJAVA=no
18
 else
19
   BUILDJAVA=no
20
 fi
(-)gettext/files/patch-gettext-runtime_gnulib-lib_Makefile.in (+40 lines)
Line 0 Link Here
1
--- gettext-runtime/gnulib-lib/Makefile.in.orig	Mon Nov 27 17:34:13 2006
2
+++ gettext-runtime/gnulib-lib/Makefile.in	Tue Jan 30 16:25:29 2007
3
@@ -363,8 +363,8 @@
4
 AM_CPPFLAGS = -I$(top_builddir)/intl -I$(top_srcdir)/intl \
5
 	-DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 \
6
 	-DEXEEXT=\"$(EXEEXT)\"
7
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
8
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
9
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
10
+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
11
 all: $(BUILT_SOURCES)
12
 	$(MAKE) $(AM_MAKEFLAGS) all-am
13
 
14
@@ -561,7 +561,7 @@
15
 
16
 install-dvi: install-dvi-am
17
 
18
-install-exec-am: install-exec-local
19
+install-exec-am: 
20
 
21
 install-html: install-html-am
22
 
23
@@ -678,7 +678,7 @@
24
 	} > $@-t
25
 	mv -f $@-t $@
26
 
27
-# We need the following in order to install a simple file in $(libdir)
28
+# We need the following in order to install a simple file in $(prefix)/libdata
29
 # which is shared with other installed packages. We use a list of referencing
30
 # packages so that "make uninstall" will remove the file if and only if it
31
 # is not used by another installed package.
32
@@ -687,7 +687,7 @@
33
 
34
 all-local: charset.alias ref-add.sed ref-del.sed
35
 install-exec-local: all-local
36
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
37
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata
38
 	if test -f $(charset_alias); then \
39
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
40
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
(-)gettext/files/patch-gettext-runtime_intl_Makefile.in (-23 / +14 lines)
Lines 1-37 Link Here
1
--- gettext-runtime/intl/Makefile.in.orig	Mon Apr 11 14:34:59 2005
1
--- gettext-runtime/intl/Makefile.in.orig	Mon Nov 27 17:02:00 2006
2
+++ gettext-runtime/intl/Makefile.in	Mon Apr 18 19:10:08 2005
2
+++ gettext-runtime/intl/Makefile.in	Tue Jan 30 14:10:59 2007
3
@@ -52,7 +52,7 @@
3
@@ -76,7 +76,7 @@
4
 YFLAGS = --name-prefix=__gettext
4
 # -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
5
 
5
 # -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
6
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
6
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
7
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
7
--DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
8
+-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL \
8
+-DLIBDIR=\"$(prefix)/libdata\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
9
 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
9
 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
10
 -Dset_relocation_prefix=libintl_set_relocation_prefix \
10
 -Dset_relocation_prefix=libintl_set_relocation_prefix \
11
 -Drelocate=libintl_relocate \
11
 -Drelocate=libintl_relocate \
12
@@ -154,7 +154,7 @@
12
@@ -189,7 +189,7 @@
13
 libintl.la libgnuintl.la: $(OBJECTS)
13
 libintl.la libgnuintl.la: $(OBJECTS)
14
 	$(LIBTOOL) --mode=link \
14
 	$(LIBTOOL) --mode=link \
15
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
15
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
16
-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
16
-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
17
+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) \
17
+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ \
18
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
18
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
19
 	  -rpath $(libdir) \
19
 	  -rpath $(libdir) \
20
 	  -no-undefined
20
 	  -no-undefined
21
@@ -164,7 +164,7 @@
21
@@ -344,22 +344,6 @@
22
 # according to the libtool documentation, section "Library interface versions".
23
 # Maintainers of other packages that include the intl directory must *not*
24
 # change these values.
25
-LTV_CURRENT=7
26
+LTV_CURRENT=6
27
 LTV_REVISION=3
28
 LTV_AGE=4
29
 
30
@@ -288,22 +288,6 @@
31
 	  : ; \
22
 	  : ; \
32
 	fi
23
 	fi
33
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
24
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
34
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
25
-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
35
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
26
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
36
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
27
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
37
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
28
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
Lines 47-56 Link Here
47
-	      rm -f $$temp; \
38
-	      rm -f $$temp; \
48
-	    fi; \
39
-	    fi; \
49
-	  fi; \
40
-	  fi; \
50
 	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
41
 	  $(mkdir_p) $(DESTDIR)$(localedir); \
51
 	  test -f $(DESTDIR)$(localedir)/locale.alias \
42
 	  test -f $(DESTDIR)$(localedir)/locale.alias \
52
 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
43
 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
53
@@ -389,9 +373,9 @@
44
@@ -445,9 +429,9 @@
54
 	  : ; \
45
 	  : ; \
55
 	fi
46
 	fi
56
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
47
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
(-)gettext/files/patch-gettext-tools_Makefile.in (-10 / +10 lines)
Lines 1-11 Link Here
1
--- gettext-tools/Makefile.in.orig	Mon Apr 11 15:15:55 2005
1
--- gettext-tools/Makefile.in.orig	Mon Nov 27 17:34:56 2006
2
+++ gettext-tools/Makefile.in	Mon Apr 18 19:12:07 2005
2
+++ gettext-tools/Makefile.in	Tue Jan 30 14:25:24 2007
3
@@ -348,7 +348,7 @@
3
@@ -484,7 +484,7 @@
4
 target_alias = @target_alias@
4
 top_srcdir = @top_srcdir@
5
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
5
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
6
 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
6
 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
7
-SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples
7
-SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
8
+SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4
8
+SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4
9
 # vms_jackets.h is a header that comes with Compaq's "porting library".
9
 
10
 # KEEP_CRTL_SETLOCALE tells it to not override the native locale support.
10
 # Allow users to use "gnulib-tool --update".
11
 EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 \
11
 
(-)gettext/files/patch-gettext-tools_config.h.in (-5 / +5 lines)
Lines 1-8 Link Here
1
--- gettext-tools/config.h.in.orig	Sat Aug 28 11:50:21 2004
1
--- gettext-tools/config.h.in.orig	Fri Jul 21 15:38:34 2006
2
+++ gettext-tools/config.h.in	Sat Aug 28 11:51:26 2004
2
+++ gettext-tools/config.h.in	Mon Jan 29 16:16:07 2007
3
@@ -45,6 +45,9 @@
3
@@ -64,6 +64,9 @@
4
 /* Define to 1 if you have the `atexit' function. */
4
 /* Define to 1 if you have the <bp-sym.h> header file. */
5
 #undef HAVE_ATEXIT
5
 #undef HAVE_BP_SYM_H
6
 
6
 
7
+/* Define if the expat library is bsdxml. */
7
+/* Define if the expat library is bsdxml. */
8
+#undef HAVE_BSDXML
8
+#undef HAVE_BSDXML
(-)gettext/files/patch-gettext-tools_configure (-28 / +61 lines)
Lines 1-33 Link Here
1
--- gettext-tools/configure.orig	Mon Mar 14 07:23:55 2005
2
+++ gettext-tools/configure	Mon Mar 14 21:06:06 2005
3
@@ -463,7 +463,7 @@
4
 # include <unistd.h>
5
 #endif"
6
 
7
-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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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_I
8
N_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 GETOPT_H LIBGREPOBJS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS IN
1
N_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 GETOPT_H LIBGREPOBJS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS IN
9
TL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LOCALE_FR_UTF8 TESTLIBASPRINTF LTLIBOBJS'
2
TL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LOCALE_FR_UTF8 TESTLIBASPRINTF LTLIBOBJS'
10
+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_
11
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 LIBEX
3
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 LIBEX
12
PAT LTLIBEXPAT HAVE_LIBEXPAT HAVE_BSDXML EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS'
4
PAT LTLIBEXPAT HAVE_LIBEXPAT HAVE_BSDXML EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR TESTLIBASPRINTF LTLIBOBJS'
13
 ac_subst_files=''
5
--- gettext-tools/configure.orig	Mon Nov 27 17:34:40 2006
14
 
6
+++ gettext-tools/configure	Tue Jan 30 14:28:41 2007
15
 # Initialize some variables set by options.
7
@@ -819,6 +819,7 @@
16
@@ -1977,7 +1977,7 @@
8
 AUTOMAKE
17
 
9
 AUTOHEADER
18
 docdir='${datadir}/doc/gettext'
10
 MAKEINFO
19
 
11
+AMTAR
20
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
12
 install_sh
21
+test "$mandir" != '${prefix}/man' || mandir='${prefix}/man'
13
 STRIP
22
 
14
 INSTALL_STRIP_PROGRAM
23
 ac_ext=c
15
@@ -826,9 +827,6 @@
24
 ac_cpp='$CPP $CPPFLAGS'
16
 AWK
25
@@ -3786,7 +3786,7 @@
17
 SET_MAKE
26
 fi
18
 am__leading_dot
27
 
19
-AMTAR
28
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
20
-am__tar
29
-  BUILDJAVA=yes
21
-am__untar
30
+  BUILDJAVA=no
22
 CC
23
 CFLAGS
24
 LDFLAGS
25
@@ -948,7 +946,6 @@
26
 LTLIBICONV
27
 INTLBISON
28
 GLIBC21
29
-INTL_MACOSX_LIBS
30
 HAVE_POSIX_PRINTF
31
 HAVE_ASPRINTF
32
 HAVE_SNPRINTF
33
@@ -974,7 +971,7 @@
34
 ALLOCA_H
35
 BYTESWAP_H
36
 FNMATCH_H
37
-GETOPT_H
38
+HAVE_BSDXML
39
 RELOCATABLE
40
 SET_RELOCATABLE
41
 RELOCATABLE_VIA_LD_TRUE
42
@@ -1005,7 +1002,6 @@
43
 WINT_T_SUFFIX
44
 STDINT_H
45
 UNISTD_H
46
-LIBGREPOBJS
47
 WOE32DLL_TRUE
48
 WOE32DLL_FALSE
49
 LIBEXPAT
50
@@ -1023,7 +1019,6 @@
51
 PERL
52
 CROSS_COMPILING
53
 LOCALE_FR
54
-LOCALE_FR_UTF8
55
 TESTLIBASPRINTF
56
 subdirs
57
 LIBOBJS
58
@@ -3845,7 +3840,7 @@
59
 if test "${enable_java+set}" = set; then
60
   enableval=$enable_java; JAVA_CHOICE="$enableval"
31
 else
61
 else
32
   BUILDJAVA=no
62
-  JAVA_CHOICE=yes
63
+  JAVA_CHOICE=no
33
 fi
64
 fi
34
@@ -39202,6 +39202,17 @@
65
 
66
   { echo "$as_me:$LINENO: result: $JAVA_CHOICE" >&5
67
@@ -50081,6 +50076,17 @@
35
 
68
 
36
 
69
 
37
 case "$host_os" in
70
 case "$host_os" in
(-)gettext/files/patch-gettext-tools_gnulib-lib_Makefile.in (+44 lines)
Line 0 Link Here
1
--- gettext-tools/gnulib-lib/Makefile.in.orig	Mon Nov 27 17:34:53 2006
2
+++ gettext-tools/gnulib-lib/Makefile.in	Tue Jan 30 16:13:44 2007
3
@@ -605,8 +605,8 @@
4
 # Extra files to be installed.
5
 gettextsrcdir = $(datadir)/gettext
6
 gettextsrc_DATA = gettext.h
7
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
8
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
9
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
10
+charset_tmp = $(DESTDIR)$(prefix)/libdata/t-charset.alias
11
 all: $(BUILT_SOURCES)
12
 	$(MAKE) $(AM_MAKEFLAGS) all-am
13
 
14
@@ -865,7 +865,7 @@
15
 
16
 install-dvi: install-dvi-am
17
 
18
-install-exec-am: install-exec-local install-libLTLIBRARIES
19
+install-exec-am: install-libLTLIBRARIES
20
 
21
 install-html: install-html-am
22
 
23
@@ -1006,10 +1006,11 @@
24
 install-exec-clean:
25
 	case "@host_os@" in \
26
 	  aix*) ;; \
27
+	  freebsd*) ;; \
28
 	  *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \
29
 	esac
30
 
31
-# We need the following in order to install a simple file in $(libdir)
32
+# We need the following in order to install a simple file in $(prefix)/libdata
33
 # which is shared with other installed packages. We use a list of referencing
34
 # packages so that "make uninstall" will remove the file if and only if it
35
 # is not used by another installed package.
36
@@ -1018,7 +1019,7 @@
37
 
38
 all-local: charset.alias ref-add.sed ref-del.sed
39
 install-exec-local: all-local
40
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
41
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata
42
 	if test -f $(charset_alias); then \
43
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
44
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
(-)gettext/files/patch-gettext-tools_lib_Makefile.in (-29 lines)
Lines 1-29 Link Here
1
--- gettext-tools/lib/Makefile.in.orig	Mon Mar 14 07:24:09 2005
2
+++ gettext-tools/lib/Makefile.in	Mon Mar 14 21:10:57 2005
3
@@ -192,7 +192,7 @@
4
 CYGPATH_W = @CYGPATH_W@
5
 DATADIRNAME = @DATADIRNAME@
6
 DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 \
7
-	-DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(libdir)\"
8
+	-DDEPENDS_ON_LIBICONV=1 @DEFS@ -DLIBDIR=\"$(prefix)/libdata\"
9
 DEPDIR = @DEPDIR@
10
 DLLTOOL = @DLLTOOL@
11
 DVIPS = @DVIPS@
12
@@ -454,7 +454,7 @@
13
 # Need @LTLIBICONV@ because linebreak.c uses iconv().
14
 libgettextlib_la_LDFLAGS = \
15
   -release @VERSION@ \
16
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
17
+  @LTLIBINTL@ @LTLIBICONV@ -no-undefined
18
 
19
 
20
 # Extra files to be installed.
21
@@ -736,7 +736,7 @@
22
 
23
 install-data-am: install-examplesconfigDATA install-gettextsrcDATA
24
 
25
-install-exec-am: install-exec-local install-libLTLIBRARIES
26
+install-exec-am: install-libLTLIBRARIES
27
 
28
 install-info: install-info-am
29
 
(-)gettext/files/patch-gettext-tools_libgettextpo_Makefile.in (+31 lines)
Line 0 Link Here
1
--- gettext-tools/libgettextpo/Makefile.in.orig	Mon Nov 27 17:48:21 2006
2
+++ gettext-tools/libgettextpo/Makefile.in	Tue Jan 30 16:20:41 2007
3
@@ -615,8 +615,8 @@
4
 libgnu_la_LIBADD = $(gtpo_LTLIBOBJS)
5
 libgnu_la_DEPENDENCIES = $(gtpo_LTLIBOBJS)
6
 libgnu_la_LDFLAGS = $(AM_LDFLAGS) $(am__append_3)
7
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
8
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
9
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
10
+charset_tmp = $(DESTDIR)$(prefix)/libdata/t-charset.alias
11
 all: $(BUILT_SOURCES)
12
 	$(MAKE) $(AM_MAKEFLAGS) all-am
13
 
14
@@ -987,7 +987,7 @@
15
 
16
 install-dvi: install-dvi-am
17
 
18
-install-exec-am: install-exec-local install-libLTLIBRARIES
19
+install-exec-am: install-libLTLIBRARIES
20
 
21
 install-html: install-html-am
22
 
23
@@ -1158,7 +1158,7 @@
24
 
25
 all-local: charset.alias ref-add.sed ref-del.sed
26
 install-exec-local: all-local
27
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
28
+	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata
29
 	if test -f $(charset_alias); then \
30
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
31
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
(-)gettext/files/patch-gettext-tools_misc_Makefile.in (+14 lines)
Line 0 Link Here
1
--- gettext-tools/misc/Makefile.in.orig	Mon Nov 27 17:34:55 2006
2
+++ gettext-tools/misc/Makefile.in	Tue Jan 30 14:24:20 2007
3
@@ -562,11 +562,9 @@
4
 	  list='$(lisp_LISP)'; for p in $$list; do \
5
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
6
 	    f=$(am__strip_dir) \
7
-	    echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
8
 	    $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \
9
 	    if test -f $${p}c; then \
10
 	      echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
11
-	      $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \
12
 	    else : ; fi; \
13
 	  done; \
14
 	else : ; fi
(-)gettext/files/patch-gettext-tools_misc_po-mode.el (+11 lines)
Line 0 Link Here
1
--- gettext-tools/misc/po-mode.el.orig	Mon Nov 27 17:02:06 2006
2
+++ gettext-tools/misc/po-mode.el	Tue Jan 30 14:24:20 2007
3
@@ -368,7 +368,7 @@
4
   :type 'sexp
5
   :group 'po)
6
 
7
-(defcustom po-gzip-uuencode-command "gzip -9 | uuencode -m"
8
+(defcustom po-gzip-uuencode-command "gzip -9 | uuencode"
9
   "*The filter to use for preparing a mail invoice of the PO file.
10
 Normally \"gzip -9 | uuencode -m\", remove the -9 for lesser compression,
11
 or remove the -m if you are not using the GNU version of 'uuencode'."
(-)gettext/files/patch-gettext-tools_src_Makefile.in (-16 / +14 lines)
Lines 1-8 Link Here
1
$FreeBSD: ports/devel/gettext/files/patch-gettext-tools_src_Makefile.in,v 1.3 2005/05/13 03:51:07 ahze Exp $
1
--- gettext-tools/src/Makefile.in.orig	Mon Nov 27 17:34:56 2006
2
2
+++ gettext-tools/src/Makefile.in	Tue Jan 30 14:33:24 2007
3
--- gettext-tools/src/Makefile.in.orig	Thu May 22 09:41:24 2003
3
@@ -487,7 +487,7 @@
4
+++ gettext-tools/src/Makefile.in	Wed Jun 11 14:10:48 2003
5
@@ -72,7 +72,7 @@
6
   -DUSEJEXE=$(USEJEXE) \
4
   -DUSEJEXE=$(USEJEXE) \
7
   -DGETTEXTJEXEDIR=\"$(pkglibdir)\" \
5
   -DGETTEXTJEXEDIR=\"$(pkglibdir)\" \
8
   -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
6
   -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
Lines 11-39 Link Here
11
   -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
9
   -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
12
   -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
10
   -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
13
 
11
 
14
@@ -336,7 +336,7 @@
12
@@ -859,7 +859,7 @@
13
 # Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
15
 # use iconv().
14
 # use iconv().
16
 libgettextsrc_la_LDFLAGS = \
15
 libgettextsrc_la_LDFLAGS = -release @VERSION@ \
17
   -release @VERSION@ \
16
-	../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc \
18
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
17
+	../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ \
19
+  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -no-undefined
18
 	@LTNOUNDEF@ $(am__append_2)
20
 
21
 
19
 
22
 # How to build libgettextpo.la.
20
 # Compile-time flags for particular source files.
23
@@ -1316,11 +1316,11 @@
21
@@ -1870,11 +1870,11 @@
24
 # Special rules for installation of auxiliary programs.
22
 # Special rules for installation of auxiliary programs.
25
 
23
 
26
 install-exec-local:
24
 install-exec-local:
27
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
25
-	$(mkdir_p) $(DESTDIR)$(pkglibdir)
28
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
26
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT)
29
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
27
-	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT)
30
-	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
28
-	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email
31
-	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
29
-	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id
32
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)
30
+	$(mkdir_p) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)
33
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/hostname$(EXEEXT)
31
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/hostname$(EXEEXT)
34
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/urlget$(EXEEXT)
32
+	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/urlget$(EXEEXT)
35
+	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/user-email
33
+	$(INSTALL_SCRIPT) user-email $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/user-email
36
+	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/project-id
34
+	$(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(prefix)/libdata/$(PACKAGE)/project-id
37
 
35
 
38
 installdirs-local:
36
 installdirs-local:
39
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
37
 	$(mkdir_p) $(DESTDIR)$(pkglibdir)
(-)gettext/files/patch-gettext-tools_src_msginit.c (-6 / +6 lines)
Lines 1-6 Link Here
1
--- gettext-tools/src/msginit.c.orig	Fri May 20 00:14:54 2005
1
--- gettext-tools/src/msginit.c.orig	Mon Nov 27 17:02:08 2006
2
+++ gettext-tools/src/msginit.c	Fri May 20 00:15:16 2005
2
+++ gettext-tools/src/msginit.c	Tue Jan 30 14:34:46 2007
3
@@ -950,7 +950,7 @@
3
@@ -818,7 +818,7 @@
4
 
4
 
5
   gettextlibdir = getenv ("GETTEXTLIBDIR");
5
   gettextlibdir = getenv ("GETTEXTLIBDIR");
6
   if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
6
   if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
Lines 9-15 Link Here
9
 
9
 
10
   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
10
   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
11
 
11
 
12
@@ -1016,7 +1016,7 @@
12
@@ -885,7 +885,7 @@
13
 
13
 
14
   gettextlibdir = getenv ("GETTEXTLIBDIR");
14
   gettextlibdir = getenv ("GETTEXTLIBDIR");
15
   if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
15
   if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
Lines 18-24 Link Here
18
 
18
 
19
   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
19
   prog = concatenated_pathname (gettextlibdir, "project-id", NULL);
20
 
20
 
21
@@ -1165,7 +1165,7 @@
21
@@ -1035,7 +1035,7 @@
22
 static const char *
22
 static const char *
23
 get_user_email ()
23
 get_user_email ()
24
 {
24
 {
Lines 27-33 Link Here
27
   char *argv[4];
27
   char *argv[4];
28
   pid_t child;
28
   pid_t child;
29
   int fd[1];
29
   int fd[1];
30
@@ -1261,7 +1261,7 @@
30
@@ -1132,7 +1132,7 @@
31
   argv[0] = "/bin/sh";
31
   argv[0] = "/bin/sh";
32
   argv[1] = (char *) prog;
32
   argv[1] = (char *) prog;
33
   argv[2] = (char *) relocate (PROJECTSDIR);
33
   argv[2] = (char *) relocate (PROJECTSDIR);
(-)gettext/files/patch-gettext-tools_src_x-glade.c (-4 / +3 lines)
Lines 1-14 Link Here
1
--- gettext-tools/src/x-glade.c.orig	Sat Aug 28 11:53:08 2004
1
--- gettext-tools/src/x-glade.c.orig	Mon Nov 27 17:02:08 2006
2
+++ gettext-tools/src/x-glade.c	Sat Aug 28 11:53:48 2004
2
+++ gettext-tools/src/x-glade.c	Tue Jan 30 14:34:46 2007
3
@@ -30,7 +30,11 @@
3
@@ -30,7 +30,11 @@
4
 # include <dlfcn.h>
4
 # include <dlfcn.h>
5
 #else
5
 #else
6
 # if HAVE_LIBEXPAT
6
 # if HAVE_LIBEXPAT
7
-#  include <expat.h>
8
+#  if HAVE_BSDXML
7
+#  if HAVE_BSDXML
9
+#   include <bsdxml.h>
8
+#   include <bsdxml.h>
10
+#  else
9
+#  else
11
+#   include <expat.h>
10
 #  include <expat.h>
12
+#  endif
11
+#  endif
13
 # endif
12
 # endif
14
 #endif
13
 #endif
(-)gettext/pkg-plist (-7 / +20 lines)
Lines 19-24 Link Here
19
bin/msgunfmt
19
bin/msgunfmt
20
bin/msguniq
20
bin/msguniq
21
bin/ngettext
21
bin/ngettext
22
bin/recode-sr-latin
22
bin/xgettext
23
bin/xgettext
23
include/autosprintf.h
24
include/autosprintf.h
24
include/gettext-po.h
25
include/gettext-po.h
Lines 35-48 Link Here
35
lib/libgettextpo.a
36
lib/libgettextpo.a
36
lib/libgettextpo.la
37
lib/libgettextpo.la
37
lib/libgettextpo.so
38
lib/libgettextpo.so
38
lib/libgettextpo.so.1
39
lib/libgettextpo.so.3
39
lib/libgettextsrc.la
40
lib/libgettextsrc.la
40
lib/libgettextsrc-%%VERSION%%.so
41
lib/libgettextsrc-%%VERSION%%.so
41
lib/libgettextsrc.so
42
lib/libgettextsrc.so
42
lib/libintl.a
43
lib/libintl.a
43
lib/libintl.la
44
lib/libintl.la
44
lib/libintl.so
45
lib/libintl.so
45
lib/libintl.so.6
46
lib/libintl.so.8
46
libdata/gettext-tools/hostname
47
libdata/gettext-tools/hostname
47
libdata/gettext-tools/project-id
48
libdata/gettext-tools/project-id
48
libdata/gettext-tools/urlget
49
libdata/gettext-tools/urlget
Lines 53-78 Link Here
53
share/aclocal/glibc21.m4
54
share/aclocal/glibc21.m4
54
share/aclocal/iconv.m4
55
share/aclocal/iconv.m4
55
share/aclocal/intdiv0.m4
56
share/aclocal/intdiv0.m4
57
share/aclocal/intl.m4
58
share/aclocal/intldir.m4
56
share/aclocal/intmax.m4
59
share/aclocal/intmax.m4
57
share/aclocal/inttypes-pri.m4
60
share/aclocal/inttypes-pri.m4
58
share/aclocal/inttypes.m4
59
share/aclocal/inttypes_h.m4
61
share/aclocal/inttypes_h.m4
60
share/aclocal/isc-posix.m4
61
share/aclocal/lcmessage.m4
62
share/aclocal/lcmessage.m4
62
share/aclocal/lib-ld.m4
63
share/aclocal/lib-ld.m4
63
share/aclocal/lib-link.m4
64
share/aclocal/lib-link.m4
64
share/aclocal/lib-prefix.m4
65
share/aclocal/lib-prefix.m4
66
share/aclocal/lock.m4
65
share/aclocal/longdouble.m4
67
share/aclocal/longdouble.m4
66
share/aclocal/longlong.m4
68
share/aclocal/longlong.m4
67
share/aclocal/nls.m4
69
share/aclocal/nls.m4
68
share/aclocal/po.m4
70
share/aclocal/po.m4
69
share/aclocal/printf-posix.m4
71
share/aclocal/printf-posix.m4
70
share/aclocal/progtest.m4
72
share/aclocal/progtest.m4
71
share/aclocal/signed.m4
72
share/aclocal/size_max.m4
73
share/aclocal/size_max.m4
73
share/aclocal/stdint_h.m4
74
share/aclocal/stdint_h.m4
74
share/aclocal/uintmax_t.m4
75
share/aclocal/uintmax_t.m4
75
share/aclocal/ulonglong.m4
76
share/aclocal/ulonglong.m4
77
share/aclocal/visibility.m4
76
share/aclocal/wchar_t.m4
78
share/aclocal/wchar_t.m4
77
share/aclocal/wint_t.m4
79
share/aclocal/wint_t.m4
78
share/aclocal/xsize.m4
80
share/aclocal/xsize.m4
Lines 87-92 Link Here
87
%%DOCSDIR%%/examples/build-aux/csharpcomp.sh.in
89
%%DOCSDIR%%/examples/build-aux/csharpcomp.sh.in
88
%%DOCSDIR%%/examples/build-aux/csharpexec.m4
90
%%DOCSDIR%%/examples/build-aux/csharpexec.m4
89
%%DOCSDIR%%/examples/build-aux/csharpexec.sh.in
91
%%DOCSDIR%%/examples/build-aux/csharpexec.sh.in
92
%%DOCSDIR%%/examples/build-aux/csharpexec-test.exe
90
%%DOCSDIR%%/examples/build-aux/gcj.m4
93
%%DOCSDIR%%/examples/build-aux/gcj.m4
91
%%DOCSDIR%%/examples/build-aux/javacomp.m4
94
%%DOCSDIR%%/examples/build-aux/javacomp.m4
92
%%DOCSDIR%%/examples/build-aux/javacomp.sh.in
95
%%DOCSDIR%%/examples/build-aux/javacomp.sh.in
Lines 134-140 Link Here
134
%%DOCSDIR%%/javadoc2/serialized-form.html
137
%%DOCSDIR%%/javadoc2/serialized-form.html
135
%%DOCSDIR%%/javadoc2/stylesheet.css
138
%%DOCSDIR%%/javadoc2/stylesheet.css
136
%%DOCSDIR%%/tutorial.html
139
%%DOCSDIR%%/tutorial.html
137
share/doc/libasprintf/autosprintf.html
140
share/doc/libasprintf/autosprintf_all.html
138
share/emacs/site-lisp/po-compat.el
141
share/emacs/site-lisp/po-compat.el
139
share/emacs/site-lisp/po-mode.el
142
share/emacs/site-lisp/po-mode.el
140
share/gettext/ABOUT-NLS
143
share/gettext/ABOUT-NLS
Lines 155-166 Link Here
155
share/gettext/intl/dngettext.c
158
share/gettext/intl/dngettext.c
156
share/gettext/intl/eval-plural.h
159
share/gettext/intl/eval-plural.h
157
share/gettext/intl/explodename.c
160
share/gettext/intl/explodename.c
161
share/gettext/intl/export.h
158
share/gettext/intl/finddomain.c
162
share/gettext/intl/finddomain.c
159
share/gettext/intl/gettext.c
163
share/gettext/intl/gettext.c
160
share/gettext/intl/gettextP.h
164
share/gettext/intl/gettextP.h
161
share/gettext/intl/gmo.h
165
share/gettext/intl/gmo.h
166
share/gettext/intl/hash-string.c
162
share/gettext/intl/hash-string.h
167
share/gettext/intl/hash-string.h
163
share/gettext/intl/intl-compat.c
168
share/gettext/intl/intl-compat.c
169
share/gettext/intl/intl-exports.c
164
share/gettext/intl/l10nflist.c
170
share/gettext/intl/l10nflist.c
165
share/gettext/intl/langprefs.c
171
share/gettext/intl/langprefs.c
166
share/gettext/intl/libgnuintl.h.in
172
share/gettext/intl/libgnuintl.h.in
Lines 171-176 Link Here
171
share/gettext/intl/locale.alias
177
share/gettext/intl/locale.alias
172
share/gettext/intl/localealias.c
178
share/gettext/intl/localealias.c
173
share/gettext/intl/localename.c
179
share/gettext/intl/localename.c
180
share/gettext/intl/lock.c
181
share/gettext/intl/lock.h
174
share/gettext/intl/log.c
182
share/gettext/intl/log.c
175
share/gettext/intl/ngettext.c
183
share/gettext/intl/ngettext.c
176
share/gettext/intl/os2compat.c
184
share/gettext/intl/os2compat.c
Lines 193-201 Link Here
193
share/gettext/intl/vasnprintf.c
201
share/gettext/intl/vasnprintf.c
194
share/gettext/intl/vasnprintf.h
202
share/gettext/intl/vasnprintf.h
195
share/gettext/intl/vasnwprintf.h
203
share/gettext/intl/vasnwprintf.h
204
share/gettext/intl/version.c
196
share/gettext/intl/wprintf-parse.h
205
share/gettext/intl/wprintf-parse.h
197
share/gettext/intl/xsize.h
206
share/gettext/intl/xsize.h
198
share/gettext/mkinstalldirs
207
share/gettext/javaversion.class
199
share/gettext/msgunfmt.tcl
208
share/gettext/msgunfmt.tcl
200
share/gettext/po/Makefile.in.in
209
share/gettext/po/Makefile.in.in
201
share/gettext/po/Makevars.template
210
share/gettext/po/Makevars.template
Lines 240-245 Link Here
240
share/locale/es/LC_MESSAGES/gettext-tools.mo
249
share/locale/es/LC_MESSAGES/gettext-tools.mo
241
share/locale/et/LC_MESSAGES/gettext-runtime.mo
250
share/locale/et/LC_MESSAGES/gettext-runtime.mo
242
share/locale/et/LC_MESSAGES/gettext-tools.mo
251
share/locale/et/LC_MESSAGES/gettext-tools.mo
252
share/locale/eo/LC_MESSAGES/gettext-runtime.mo
243
share/locale/fi/LC_MESSAGES/gettext-runtime.mo
253
share/locale/fi/LC_MESSAGES/gettext-runtime.mo
244
share/locale/fi/LC_MESSAGES/gettext-tools.mo
254
share/locale/fi/LC_MESSAGES/gettext-tools.mo
245
share/locale/fr/LC_MESSAGES/gettext-runtime.mo
255
share/locale/fr/LC_MESSAGES/gettext-runtime.mo
Lines 290-295 Link Here
290
share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
300
share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
291
share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
301
share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
292
share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
302
share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
303
share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
293
@dirrm share/gettext/projects/TP
304
@dirrm share/gettext/projects/TP
294
@dirrm share/gettext/projects/KDE
305
@dirrm share/gettext/projects/KDE
295
@dirrm share/gettext/projects/GNOME
306
@dirrm share/gettext/projects/GNOME
Lines 328-333 Link Here
328
@dirrmtry share/locale/sr/LC_MESSAGES
339
@dirrmtry share/locale/sr/LC_MESSAGES
329
@dirrmtry share/locale/uk/LC_MESSAGES
340
@dirrmtry share/locale/uk/LC_MESSAGES
330
@dirrmtry share/locale/zh_CN/LC_MESSAGES
341
@dirrmtry share/locale/zh_CN/LC_MESSAGES
342
@dirrmtry share/locale/zh_HK/LC_MESSAGES
331
@dirrmtry share/locale/zh_TW/LC_MESSAGES
343
@dirrmtry share/locale/zh_TW/LC_MESSAGES
332
@dirrmtry share/locale/be
344
@dirrmtry share/locale/be
333
@dirrmtry share/locale/ca
345
@dirrmtry share/locale/ca
Lines 348-351 Link Here
348
@dirrmtry share/locale/sr
360
@dirrmtry share/locale/sr
349
@dirrmtry share/locale/uk
361
@dirrmtry share/locale/uk
350
@dirrmtry share/locale/zh_CN
362
@dirrmtry share/locale/zh_CN
363
@dirrmtry share/locale/zh_HK
351
@dirrmtry share/locale/zh_TW
364
@dirrmtry share/locale/zh_TW

Return to bug 108559