Attachment 24039 Details for Bug 41170 – file.diff

[patch] file.diff

file.diff (text/plain), 10.38 KB, created by tkato on 2002-07-30 21:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-07-30 21:20:03 UTC

Size: 10.38 KB

patch

obsolete

>diff -urN /usr/ports/devel/gettext/Makefile devel/gettext/Makefile
>--- /usr/ports/devel/gettext/Makefile	Mon Jul 22 20:44:39 2002
>+++ devel/gettext/Makefile	Tue Jul 30 04:16:32 2002
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	gettext
>-PORTVERSION=	0.11.2
>-PORTREVISION=	1
>+PORTVERSION=	0.11.4
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	gettext
>@@ -17,20 +16,25 @@
> LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
> 		expat.3:${PORTSDIR}/textproc/expat2
> 
>-USE_BISON=	yes
>-INSTALLS_SHLIB=	yes
> USE_LIBTOOL=	yes
>-CONFIGURE_ARGS=	--with-libexpat-prefix=${LOCALBASE}/lib
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
>+		AUTOCONF="${TRUE}" \
>+		AUTOMAKE="${TRUE}" \
>+		AUTOHEADER="${TRUE}" \
>+		MAKEINFO="makeinfo --no-split" \
>+		CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
>+CONFIGURE_ARGS=	--with-libexpat-prefix=${LOCALBASE}/lib
>+INSTALLS_SHLIB=	yes
> 
> PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
> 		VERSION=${PORTVERSION}
> 
>-MAN1=		gettext.1 msgattrib.1 msgcat.1 msgcmp.1 msgcomm.1 \
>-		msgconv.1 msgen.1 msgexec.1 msgfilter.1 msgfmt.1 \
>-		msggrep.1 msginit.1 msgmerge.1 msgunfmt.1 msguniq.1 \
>-		ngettext.1 xgettext.1
>+MAN1=		autopoint.1 gettext.1 gettextize.1 msgattrib.1 msgcat.1 \
>+		msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
>+		msgfilter.1 msgfmt.1 msggrep.1 msginit.1 msgmerge.1 \
>+		msgunfmt.1 msguniq.1 ngettext.1 xgettext.1
> MAN3=		bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
> 		dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
> 		textdomain.3
>@@ -41,8 +45,9 @@
> post-install:
> 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
> 	${MKDIR} ${PREFIX}/share/emacs/site-lisp
>-	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
>-		${PREFIX}/share/emacs/site-lisp/po-mode.el
>+.for file in po-compat.el po-mode.el
>+	${INSTALL_DATA} ${WRKSRC}/misc/${file} ${PREFIX}/share/emacs/site-lisp
>+.endfor
> 	${MKDIR} ${X11BASE}/share/locale
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/gettext/distinfo devel/gettext/distinfo
>--- /usr/ports/devel/gettext/distinfo	Fri Jun 21 19:07:18 2002
>+++ devel/gettext/distinfo	Sat Jul 27 07:37:27 2002
>@@ -1 +1 @@
>-MD5 (gettext-0.11.2.tar.gz) = 31ff6c5f51ba151d2349f4dec47f4ec1
>+MD5 (gettext-0.11.4.tar.gz) = 6236562909ade8c5b56e1d6b75be2767
>diff -urN /usr/ports/devel/gettext/files/patch-Makefile.in devel/gettext/files/patch-Makefile.in
>--- /usr/ports/devel/gettext/files/patch-Makefile.in	Tue Mar 26 19:25:45 2002
>+++ devel/gettext/files/patch-Makefile.in	Fri Jul 19 03:41:15 2002
>@@ -1,12 +1,11 @@
>---- Makefile.in.orig	Tue Mar 12 14:51:22 2002
>-+++ Makefile.in	Fri Mar 15 18:42:49 2002
>-@@ -40,3 +40,3 @@
>+--- Makefile.in.orig	Wed Jul 17 20:45:19 2002
>++++ Makefile.in	Fri Jul 19 03:41:08 2002
>+@@ -155,7 +155,7 @@
>+ gettextsrc_DATA = ABOUT-NLS
>+ gettextsrc_SCRIPTS = config.rpath mkinstalldirs
>  
>--ACLOCAL = @ACLOCAL@
>-+ACLOCAL = /usr/bin/true
>- AUTOCONF = @AUTOCONF@
>-@@ -152,3 +152,3 @@
>- 
>--SUBDIRS = doc intl intl-java lib libuniname src po man m4 projects misc tests
>-+SUBDIRS = doc intl lib libuniname src po man m4 projects misc tests
>+-SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests
>++SUBDIRS = doc intl lib libuniname src po projects misc man m4 tests
>  
>+ EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
>+              djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
>diff -urN /usr/ports/devel/gettext/files/patch-ae devel/gettext/files/patch-ae
>--- /usr/ports/devel/gettext/files/patch-ae	Tue Apr 30 19:14:03 2002
>+++ devel/gettext/files/patch-ae	Fri Jul 19 07:33:47 2002
>@@ -1,9 +1,9 @@
> 
> $FreeBSD: ports/devel/gettext/files/patch-ae,v 1.8 2002/04/29 21:23:20 sobomax Exp $
> 
>---- configure.orig	Tue Mar 12 21:03:57 2002
>-+++ configure	Mon Apr 29 23:49:41 2002
>-@@ -6094,6 +6094,7 @@
>+--- configure.orig	Wed Jul 17 20:45:27 2002
>++++ configure	Fri Jul 19 03:44:17 2002
>+@@ -7576,6 +7576,7 @@
>  
>  # This can be used to rebuild libtool when needed
>  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>@@ -11,12 +11,12 @@
>  
>  # Always use our own libtool.
>  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>-@@ -11774,7 +11775,7 @@
>-   IFS="$ac_save_ifs"
>+@@ -14782,7 +14783,7 @@
>+ 
>  fi
>  fi
>--EMACS="$ac_cv_prog_EMACS"
>+-EMACS=$ac_cv_prog_EMACS
> +EMACS=no
>  if test -n "$EMACS"; then
>-   echo "$ac_t""$EMACS" 1>&6
>- else
>+   echo "$as_me:14787: result: $EMACS" >&5
>+ echo "${ECHO_T}$EMACS" >&6
>diff -urN /usr/ports/devel/gettext/files/patch-doc::Makefile.in devel/gettext/files/patch-doc::Makefile.in
>--- /usr/ports/devel/gettext/files/patch-doc::Makefile.in	Sat Mar 16 04:43:48 2002
>+++ devel/gettext/files/patch-doc::Makefile.in	Fri Jul 19 04:11:44 2002
>@@ -12,12 +12,3 @@
>  dvidir = $(docdir)
>  psdir = $(docdir)
>  pdfdir = $(docdir)
>-@@ -108,7 +108,7 @@
>- SED = sed
>- RM = rm -f
>- 
>--MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
>-+MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ --no-split
>- 
>- info_TEXINFOS = gettext.texi
>- gettext_TEXINFOS = iso-639.texi iso-3166.texi
>diff -urN /usr/ports/devel/gettext/files/patch-lib::Makefile.in devel/gettext/files/patch-lib::Makefile.in
>--- /usr/ports/devel/gettext/files/patch-lib::Makefile.in	Tue Apr 30 19:14:06 2002
>+++ devel/gettext/files/patch-lib::Makefile.in	Fri Jul 19 03:48:48 2002
>@@ -1,9 +1,9 @@
> 
> $FreeBSD: ports/devel/gettext/files/patch-lib::Makefile.in,v 1.4 2002/04/30 08:32:35 sobomax Exp $
> 
>---- lib/Makefile.in.orig	Tue Mar 12 21:04:16 2002
>-+++ lib/Makefile.in	Tue Apr 30 11:06:26 2002
>-@@ -220,7 +220,7 @@
>+--- lib/Makefile.in.orig	Fri Jul 19 03:46:30 2002
>++++ lib/Makefile.in	Fri Jul 19 03:47:55 2002
>+@@ -227,7 +227,7 @@
>  # Need @LTLIBICONV@ because linebreak.c uses iconv().
>  libgettextlib_la_LDFLAGS = \
>    -release @VERSION@ \
>@@ -12,12 +12,12 @@
>  
>  
>  
>-@@ -238,14 +238,14 @@
>+@@ -245,14 +245,14 @@
>  gen-lbrkprop.c 3level.h Combining.txt
>  
>  
>--DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
>-+DEFS = -DLIBDIR=\"$(prefix)/libdata\" @DEFS@
>+-DEFS = -DLIBDIR=\"$(libdir)\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
>++DEFS = -DLIBDIR=\"$(prefix)/libdata\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
>  INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
>  
>  DISTCLEANFILES = fnmatch.h
>@@ -30,7 +30,7 @@
>  
>  SUFFIXES = .sed .sin
>  
>-@@ -475,7 +475,7 @@
>+@@ -482,7 +482,7 @@
>  
>  install-data-am: install-gettextsrcDATA
>  
>@@ -39,7 +39,7 @@
>  
>  install-info: install-info-am
>  
>-@@ -522,7 +522,7 @@
>+@@ -534,7 +534,7 @@
>  
>  all-local: charset.alias ref-add.sed ref-del.sed
>  install-exec-local: all-local
>diff -urN /usr/ports/devel/gettext/files/patch-src::Makefile.in devel/gettext/files/patch-src::Makefile.in
>--- /usr/ports/devel/gettext/files/patch-src::Makefile.in	Tue Apr 30 19:14:06 2002
>+++ devel/gettext/files/patch-src::Makefile.in	Fri Jul 19 03:51:42 2002
>@@ -1,18 +1,18 @@
> 
> $FreeBSD: ports/devel/gettext/files/patch-src::Makefile.in,v 1.2 2002/04/29 21:23:20 sobomax Exp $
> 
>---- src/Makefile.in.orig	Tue Mar 12 21:04:19 2002
>-+++ src/Makefile.in	Tue Apr 30 00:01:24 2002
>-@@ -173,7 +173,7 @@
>- -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
>+--- src/Makefile.in.orig	Wed Jul 17 20:46:11 2002
>++++ src/Makefile.in	Fri Jul 19 03:51:12 2002
>+@@ -181,7 +181,7 @@
>  
>- DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
>+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DUSEJEXE=$(USEJEXE) \
>+ -DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
> --DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
> +-DLIBDIR=\"$(prefix)/libdata\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
>  -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
>  
>  LDADD = ../lib/libgettextlib.la @LTLIBINTL@
>-@@ -240,7 +240,7 @@
>+@@ -248,7 +248,7 @@
>  # use iconv().
>  libgettextsrc_la_LDFLAGS = \
>    -release @VERSION@ \
>@@ -21,7 +21,7 @@
>  
>  
>  # Link dependencies.
>-@@ -726,11 +726,11 @@
>+@@ -747,11 +747,11 @@
>  # Special rules for installation of auxiliary programs.
>  
>  install-exec-local:
>diff -urN /usr/ports/devel/gettext/pkg-plist devel/gettext/pkg-plist
>--- /usr/ports/devel/gettext/pkg-plist	Fri Jun 21 19:07:19 2002
>+++ devel/gettext/pkg-plist	Tue Jul 30 04:16:48 2002
>@@ -1,3 +1,4 @@
>+bin/autopoint
> bin/gettext
> bin/gettextize
> bin/msgattrib
>@@ -21,14 +22,12 @@
> info/gettext.info
> @exec install-info %D/info/gettext.info %D/info/dir
> lib/libgettextlib-%%VERSION%%.so
>-lib/libgettextlib.a
> lib/libgettextlib.so
> lib/libgettextsrc-%%VERSION%%.so
>-lib/libgettextsrc.a
> lib/libgettextsrc.so
> lib/libintl.a
> lib/libintl.so
>-lib/libintl.so.2
>+lib/libintl.so.4
> libdata/gettext/hostname
> libdata/gettext/project-id
> libdata/gettext/urlget
>@@ -37,12 +36,19 @@
> share/aclocal/gettext.m4
> share/aclocal/glibc21.m4
> share/aclocal/iconv.m4
>+share/aclocal/intdiv0.m4
>+share/aclocal/inttypes-pri.m4
>+share/aclocal/inttypes.m4
>+share/aclocal/inttypes_h.m4
> share/aclocal/isc-posix.m4
> share/aclocal/lcmessage.m4
> share/aclocal/lib-ld.m4
> share/aclocal/lib-link.m4
> share/aclocal/lib-prefix.m4
> share/aclocal/progtest.m4
>+share/aclocal/stdint_h.m4
>+share/aclocal/uintmax_t.m4
>+share/doc/gettext/autopoint.1.html
> share/doc/gettext/bind_textdomain_codeset.3.html
> share/doc/gettext/bindtextdomain.3.html
> share/doc/gettext/gettext.1.html
>@@ -71,6 +77,7 @@
> share/doc/gettext/gettext_9.html
> share/doc/gettext/gettext_foot.html
> share/doc/gettext/gettext_toc.html
>+share/doc/gettext/gettextize.1.html
> share/doc/gettext/msgattrib.1.html
> share/doc/gettext/msgcat.1.html
> share/doc/gettext/msgcmp.1.html
>@@ -89,8 +96,10 @@
> share/doc/gettext/ngettext.3.html
> share/doc/gettext/textdomain.3.html
> share/doc/gettext/xgettext.1.html
>+share/emacs/site-lisp/po-compat.el
> share/emacs/site-lisp/po-mode.el
> share/gettext/ABOUT-NLS
>+share/gettext/archive.tar.gz
> share/gettext/config.rpath
> share/gettext/gettext.h
> share/gettext/intl/COPYING.LIB-2.0
>@@ -132,6 +141,7 @@
> share/gettext/intl/ref-add.sin
> share/gettext/intl/ref-del.sin
> share/gettext/intl/textdomain.c
>+share/gettext/mkinstalldirs
> share/gettext/msgunfmt.tcl
> share/gettext/po/Makefile.in.in
> share/gettext/po/Makevars
>@@ -156,6 +166,7 @@
> share/gettext/projects/TP/trigger
> share/gettext/projects/index
> share/gettext/projects/team-address
>+share/locale/be/LC_MESSAGES/gettext.mo
> share/locale/ca/LC_MESSAGES/gettext.mo
> share/locale/cs/LC_MESSAGES/gettext.mo
> share/locale/da/LC_MESSAGES/gettext.mo
>@@ -165,6 +176,7 @@
> share/locale/en@quot/LC_MESSAGES/gettext.mo
> share/locale/es/LC_MESSAGES/gettext.mo
> share/locale/et/LC_MESSAGES/gettext.mo
>+share/locale/fi/LC_MESSAGES/gettext.mo
> share/locale/fr/LC_MESSAGES/gettext.mo
> share/locale/gl/LC_MESSAGES/gettext.mo
> share/locale/id/LC_MESSAGES/gettext.mo

Actions: View | Diff

Attachments on bug 41170: 24039