diff options
Diffstat (limited to 'devel')
46 files changed, 168 insertions, 439 deletions
diff --git a/devel/Makefile b/devel/Makefile index ba1a3bceb57b..5ecba71fafb0 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -168,7 +168,7 @@ SUBDIR += gengameng SUBDIR += gengetopt SUBDIR += gettext - SUBDIR += gettext-devel + SUBDIR += gettext-old SUBDIR += getxml SUBDIR += gide SUBDIR += gindent diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile index 8766b597aacd..edca641789ac 100644 --- a/devel/ORBit/Makefile +++ b/devel/ORBit/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig USE_BZIP2= yes diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index a2b816a8f417..cd05fb1ec832 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/bonobo MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint USE_X_PREFIX= yes diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index e2f28aa1bbbc..5e2c04b40c6d 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index e2f28aa1bbbc..5e2c04b40c6d 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index e2f28aa1bbbc..5e2c04b40c6d 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -14,7 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index 68df3c1ac41a..4362b431d337 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -19,7 +19,7 @@ QT_VER= "" USE_KDELIBS_VER=2 QT_VER= 2 .endif -LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/cook/Makefile b/devel/cook/Makefile index 14069a5d7d4d..163d6ccb13b1 100644 --- a/devel/cook/Makefile +++ b/devel/cook/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.canb.auug.org.au/~millerp/cook/ MAINTAINER= jasone@freebsd.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile deleted file mode 100644 index 56e1cbec1c33..000000000000 --- a/devel/gettext-devel/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# New ports collection makefile for: gettext -# Date created: 16 March 1998 -# Whom: Yukihiro Nakai <Nakai@technologist.com> -# -# $FreeBSD$ -# - -PORTNAME= gettext -PORTVERSION= 0.10.40 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= gettext - -MAINTAINER= sobomax@FreeBSD.org - -LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv - -NO_LATEST_LINK= yes - -USE_BISON= yes -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} - -MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \ - dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \ - textdomain.3 - -# X X X - I know, but it doesn't work with BSD iconv yet. :((( -post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \ - 's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g' - -pre-configure: - ${RM} ${WRKSRC}/doc/gettext.info* - -.if !defined(WANT_FULL_GETTEXT) -BINFILES= gettext msgcmp msgcomm msgfmt msgmerge msgunfmt \ - ngettext xgettext -PLIST= ${WRKDIR}/PLIST -CONFIGURE_ARGS= --disable-shared -.undef MAN3 -.undef INSTALLS_SHLIB - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \ - ${PREFIX}/bin/gettextize-new - @${ECHO_CMD} bin/gettextize-new > ${WRKDIR}/PLIST -.for file in ${BINFILES} - ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-new - @${ECHO_CMD} bin/${file}-new >> ${WRKDIR}/PLIST -.endfor -.else -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 - ${MKDIR} ${X11BASE}/share/locale -.endif - -.include <bsd.port.mk> diff --git a/devel/gettext-devel/distinfo b/devel/gettext-devel/distinfo deleted file mode 100644 index 65665a4b56df..000000000000 --- a/devel/gettext-devel/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (gettext-0.10.40.tar.gz) = 6a17767b47ffb45b4866cec9fb0a39b0 diff --git a/devel/gettext-devel/files/patch-ad b/devel/gettext-devel/files/patch-ad deleted file mode 100644 index be0cbd6eb450..000000000000 --- a/devel/gettext-devel/files/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- misc/Makefile.in.orig Sat Sep 15 03:48:07 2001 -+++ misc/Makefile.in Mon Nov 26 13:54:29 2001 -@@ -165,10 +165,8 @@ - list='$(lisp_LISP)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \ - if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \ -- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \ - else : ; fi; \ - done; \ - else : ; fi diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae deleted file mode 100644 index c24ab0e425cc..000000000000 --- a/devel/gettext-devel/files/patch-ae +++ /dev/null @@ -1,67 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Sat Sep 15 03:47:29 2001 -+++ configure Mon Nov 26 13:56:11 2001 -@@ -1220,13 +1220,13 @@ - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. --if (aclocal --version) < /dev/null > /dev/null 2>&1; then -- ACLOCAL=aclocal -- echo "$ac_t""found" 1>&6 --else -+#if (aclocal --version) < /dev/null > /dev/null 2>&1; then -+# ACLOCAL=aclocal -+# echo "$ac_t""found" 1>&6 -+#else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 --fi -+#fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 - echo "configure:1233: checking for working autoconf" >&5 -@@ -1246,13 +1246,13 @@ - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. --if (automake --version) < /dev/null > /dev/null 2>&1; then -- AUTOMAKE=automake -- echo "$ac_t""found" 1>&6 --else -+#if (automake --version) < /dev/null > /dev/null 2>&1; then -+# AUTOMAKE=automake -+# echo "$ac_t""found" 1>&6 -+#else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 --fi -+#fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 - echo "configure:1259: checking for working autoheader" >&5 -@@ -8375,7 +8375,7 @@ - ;; - esac - fi --EMACS="$ac_cv_path_EMACS" -+EMACS=no - if test -n "$EMACS"; then - echo "$ac_t""$EMACS" 1>&6 - else -@@ -8677,10 +8677,10 @@ - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g --s%@ACLOCAL@%$ACLOCAL%g --s%@AUTOCONF@%$AUTOCONF%g --s%@AUTOMAKE@%$AUTOMAKE%g --s%@AUTOHEADER@%$AUTOHEADER%g -+s%@ACLOCAL@%/usr/bin/true%g -+s%@AUTOCONF@%/usr/bin/true%g -+s%@AUTOMAKE@%/usr/bin/true%g -+s%@AUTOHEADER@%/usr/bin/true%g - s%@MAKEINFO@%$MAKEINFO%g - s%@SET_MAKE@%$SET_MAKE%g - s%@CC@%$CC%g diff --git a/devel/gettext-devel/files/patch-ak b/devel/gettext-devel/files/patch-ak deleted file mode 100644 index 3cc93a5361fd..000000000000 --- a/devel/gettext-devel/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/po-mode.el.orig Sun Jan 23 22:35:10 2000 -+++ misc/po-mode.el Sun Jan 23 22:35:39 2000 -@@ -330,7 +330,7 @@ - :type 'face - :group 'po) - --(defcustom po-gzip-uuencode-command "gzip -9 | uuencode -m" -+(defcustom po-gzip-uuencode-command "gzip -9 | uuencode" - "*The filter to use for preparing a mail invoice of the PO file. - Normally \"gzip -9 | uuencode -m\", remove the -9 for lesser compression, - or remove the -m if you are not using the GNU version of `uuencode'." diff --git a/devel/gettext-devel/pkg-comment b/devel/gettext-devel/pkg-comment deleted file mode 100644 index 03f01568ee37..000000000000 --- a/devel/gettext-devel/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -GNU gettext package diff --git a/devel/gettext-devel/pkg-descr b/devel/gettext-devel/pkg-descr deleted file mode 100644 index 24fee26e0c26..000000000000 --- a/devel/gettext-devel/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This is the GNU gettext package. It is interesting for authors or -maintainers of other packages or programs which they want to see -internationalized. As one step the handling of messages in different -languages should be implemented. For this task GNU gettext provides -the needed tools and library functions. diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist deleted file mode 100644 index 42bc8b3edebb..000000000000 --- a/devel/gettext-devel/pkg-plist +++ /dev/null @@ -1,122 +0,0 @@ -bin/gettext -bin/gettextize -bin/msgcmp -bin/msgcomm -bin/msgfmt -bin/msgmerge -bin/msgunfmt -bin/ngettext -bin/xgettext -include/libintl.h -@unexec install-info --delete %D/info/gettext.info %D/info/dir -info/gettext.info -@exec install-info %D/info/gettext.info %D/info/dir -lib/libintl.a -lib/libintl.so -lib/libintl.so.1 -@comment libdata/charset.alias -share/aclocal/codeset.m4 -share/aclocal/gettext.m4 -share/aclocal/glibc21.m4 -share/aclocal/iconv.m4 -share/aclocal/isc-posix.m4 -share/aclocal/lcmessage.m4 -share/aclocal/progtest.m4 -share/doc/gettext/bind_textdomain_codeset.3.html -share/doc/gettext/bindtextdomain.3.html -share/doc/gettext/gettext.3.html -share/doc/gettext/gettext_1.html -share/doc/gettext/gettext_10.html -share/doc/gettext/gettext_11.html -share/doc/gettext/gettext_12.html -share/doc/gettext/gettext_13.html -share/doc/gettext/gettext_14.html -share/doc/gettext/gettext_2.html -share/doc/gettext/gettext_3.html -share/doc/gettext/gettext_4.html -share/doc/gettext/gettext_5.html -share/doc/gettext/gettext_6.html -share/doc/gettext/gettext_7.html -share/doc/gettext/gettext_8.html -share/doc/gettext/gettext_9.html -share/doc/gettext/gettext_foot.html -share/doc/gettext/gettext_toc.html -share/doc/gettext/ngettext.3.html -share/doc/gettext/textdomain.3.html -share/emacs/site-lisp/po-mode.el -share/gettext/ABOUT-NLS -share/gettext/intl/COPYING.LIB-2 -share/gettext/intl/COPYING.LIB-2.1 -share/gettext/intl/ChangeLog -share/gettext/intl/Makefile.in -share/gettext/intl/VERSION -share/gettext/intl/bindtextdom.c -share/gettext/intl/config.charset -share/gettext/intl/dcgettext.c -share/gettext/intl/dcigettext.c -share/gettext/intl/dcngettext.c -share/gettext/intl/dgettext.c -share/gettext/intl/dngettext.c -share/gettext/intl/explodename.c -share/gettext/intl/finddomain.c -share/gettext/intl/gettext.c -share/gettext/intl/gettext.h -share/gettext/intl/gettextP.h -share/gettext/intl/hash-string.h -share/gettext/intl/intl-compat.c -share/gettext/intl/l10nflist.c -share/gettext/intl/libgettext.h -share/gettext/intl/libgnuintl.h -share/gettext/intl/loadinfo.h -share/gettext/intl/loadmsgcat.c -share/gettext/intl/localcharset.c -share/gettext/intl/locale.alias -share/gettext/intl/localealias.c -share/gettext/intl/ngettext.c -share/gettext/intl/plural.c -share/gettext/intl/plural.y -share/gettext/intl/ref-add.sin -share/gettext/intl/ref-del.sin -share/gettext/intl/textdomain.c -share/gettext/po/Makefile.in.in -share/locale/cs/LC_MESSAGES/gettext.mo -share/locale/da/LC_MESSAGES/gettext.mo -share/locale/de/LC_MESSAGES/gettext.mo -share/locale/el/LC_MESSAGES/gettext.mo -share/locale/en@boldquot/LC_MESSAGES/gettext.mo -share/locale/en@quot/LC_MESSAGES/gettext.mo -share/locale/es/LC_MESSAGES/gettext.mo -share/locale/et/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 -share/locale/it/LC_MESSAGES/gettext.mo -share/locale/ja/LC_MESSAGES/gettext.mo -share/locale/ko/LC_MESSAGES/gettext.mo -share/locale/locale.alias -share/locale/nl/LC_MESSAGES/gettext.mo -share/locale/nn/LC_MESSAGES/gettext.mo -share/locale/no/LC_MESSAGES/gettext.mo -share/locale/pl/LC_MESSAGES/gettext.mo -share/locale/pt/LC_MESSAGES/gettext.mo -share/locale/pt_BR/LC_MESSAGES/gettext.mo -share/locale/ru/LC_MESSAGES/gettext.mo -share/locale/sl/LC_MESSAGES/gettext.mo -share/locale/sv/LC_MESSAGES/gettext.mo -share/locale/tr/LC_MESSAGES/gettext.mo -share/locale/zh/LC_MESSAGES/gettext.mo -@dirrm share/gettext/po -@dirrm share/gettext/intl -@dirrm share/gettext -@dirrm share/doc/gettext -@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/* 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@exec mkdir -p %%LOCALBASE%%/share/locale -@unexec rmdir %%LOCALBASE%%/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/* 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale 2>/dev/null || true -@exec mkdir -p %%X11BASE%%/share/locale -@unexec rmdir %%X11BASE%%/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%X11BASE%%/share/locale/* 2>/dev/null || true -@unexec rmdir %%X11BASE%%/share/locale 2>/dev/null || true diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index c9c2776b1eef..56e1cbec1c33 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -6,27 +6,60 @@ # PORTNAME= gettext -PORTVERSION= 0.10.35 -PORTREVISION= 1 +PORTVERSION= 0.10.40 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gettext -MAINTAINER= reg@FreeBSD.org +MAINTAINER= sobomax@FreeBSD.org -USE_LIBTOOL= yes +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv + +NO_LATEST_LINK= yes + +USE_BISON= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \ + dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \ + textdomain.3 + +# X X X - I know, but it doesn't work with BSD iconv yet. :((( +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \ + 's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g' + pre-configure: ${RM} ${WRKSRC}/doc/gettext.info* +.if !defined(WANT_FULL_GETTEXT) +BINFILES= gettext msgcmp msgcomm msgfmt msgmerge msgunfmt \ + ngettext xgettext +PLIST= ${WRKDIR}/PLIST +CONFIGURE_ARGS= --disable-shared +.undef MAN3 +.undef INSTALLS_SHLIB + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/misc/gettextize \ + ${PREFIX}/bin/gettextize-new + @${ECHO_CMD} bin/gettextize-new > ${WRKDIR}/PLIST +.for file in ${BINFILES} + ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin/${file}-new + @${ECHO_CMD} bin/${file}-new >> ${WRKDIR}/PLIST +.endfor +.else 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 ${MKDIR} ${X11BASE}/share/locale +.endif .include <bsd.port.mk> diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index c78c8247570c..65665a4b56df 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1 +1 @@ -MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc +MD5 (gettext-0.10.40.tar.gz) = 6a17767b47ffb45b4866cec9fb0a39b0 diff --git a/devel/gettext-devel/files/patch-Makefile.in b/devel/gettext/files/patch-Makefile.in index 3c1a3ac9bb7c..c517c45ae926 100644 --- a/devel/gettext-devel/files/patch-Makefile.in +++ b/devel/gettext/files/patch-Makefile.in @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $ --- Makefile.in 2001/05/29 09:22:43 1.1 +++ Makefile.in 2001/05/29 09:23:01 diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad index 3a0c6f4c39f6..be0cbd6eb450 100644 --- a/devel/gettext/files/patch-ad +++ b/devel/gettext/files/patch-ad @@ -1,24 +1,16 @@ ---- misc/Makefile.in.orig Fri May 1 14:47:40 1998 -+++ misc/Makefile.in Thu Dec 3 20:11:52 1998 -@@ -164,10 +164,8 @@ - @list='$(lisp_LISP)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \ - if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \ -- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \ - else : ; fi; \ - done - ---- doc/Makefile.in.orig Thu Dec 3 20:12:35 1998 -+++ doc/Makefile.in Thu Dec 3 20:12:51 1998 -@@ -79,7 +79,7 @@ - LIBOBJS = @LIBOBJS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - NM = @NM@ + +$FreeBSD$ + +--- misc/Makefile.in.orig Sat Sep 15 03:48:07 2001 ++++ misc/Makefile.in Mon Nov 26 13:54:29 2001 +@@ -165,10 +165,8 @@ + list='$(lisp_LISP)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \ +- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \ + if test -f $${p}c; then \ + echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \ +- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \ + else : ; fi; \ + done; \ + else : ; fi diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae index 920d368fe4ed..c24ab0e425cc 100644 --- a/devel/gettext/files/patch-ae +++ b/devel/gettext/files/patch-ae @@ -1,6 +1,9 @@ ---- configure.orig Fri May 1 01:48:25 1998 -+++ configure Tue Jan 1 07:05:49 2002 -@@ -837,52 +837,52 @@ + +$FreeBSD$ + +--- configure.orig Sat Sep 15 03:47:29 2001 ++++ configure Mon Nov 26 13:56:11 2001 +@@ -1220,13 +1220,13 @@ # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -18,25 +21,8 @@ +#fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 - echo "configure:850: checking for working autoconf" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. --if (autoconf --version) < /dev/null > /dev/null 2>&1; then -- AUTOCONF=autoconf -- echo "$ac_t""found" 1>&6 --else -+#if (autoconf --version) < /dev/null > /dev/null 2>&1; then -+# AUTOCONF=autoconf -+# echo "$ac_t""found" 1>&6 -+#else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 --fi -+#fi - - echo $ac_n "checking for working automake""... $ac_c" 1>&6 - echo "configure:863: checking for working automake" >&5 + echo "configure:1233: checking for working autoconf" >&5 +@@ -1246,13 +1246,13 @@ # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -54,35 +40,8 @@ +#fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 - echo "configure:876: checking for working autoheader" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. --if (autoheader --version) < /dev/null > /dev/null 2>&1; then -- AUTOHEADER=autoheader -- echo "$ac_t""found" 1>&6 --else -+#if (autoheader --version) < /dev/null > /dev/null 2>&1; then -+# AUTOHEADER=autoheader -+# echo "$ac_t""found" 1>&6 -+#else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 --fi -+#fi - - echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 - echo "configure:889: checking for working makeinfo" >&5 -@@ -3958,7 +3958,7 @@ - fi - - -- l= -+ l=l - - - test -d po || mkdir po -@@ -4004,7 +4004,7 @@ + echo "configure:1259: checking for working autoheader" >&5 +@@ -8375,7 +8375,7 @@ ;; esac fi @@ -91,3 +50,18 @@ if test -n "$EMACS"; then echo "$ac_t""$EMACS" 1>&6 else +@@ -8677,10 +8677,10 @@ + s%@INSTALL_DATA@%$INSTALL_DATA%g + s%@PACKAGE@%$PACKAGE%g + s%@VERSION@%$VERSION%g +-s%@ACLOCAL@%$ACLOCAL%g +-s%@AUTOCONF@%$AUTOCONF%g +-s%@AUTOMAKE@%$AUTOMAKE%g +-s%@AUTOHEADER@%$AUTOHEADER%g ++s%@ACLOCAL@%/usr/bin/true%g ++s%@AUTOCONF@%/usr/bin/true%g ++s%@AUTOMAKE@%/usr/bin/true%g ++s%@AUTOHEADER@%/usr/bin/true%g + s%@MAKEINFO@%$MAKEINFO%g + s%@SET_MAKE@%$SET_MAKE%g + s%@CC@%$CC%g diff --git a/devel/gettext/files/patch-af b/devel/gettext/files/patch-af deleted file mode 100644 index 7da1ef001b32..000000000000 --- a/devel/gettext/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/locale.alias.orig Sat Oct 19 23:40:54 1996 -+++ misc/locale.alias Thu Dec 3 20:11:52 1998 -@@ -40,6 +40,7 @@ - icelandic is_IS.ISO-8859-1 - italian it_CH.ISO-8859-1 - japanese ja_JP.EUC -+korean ko_KR.EUC - norwegian no_NO.ISO-8859-1 - polish pl_PL.ISO-8859-2 - portuguese pt_PT.ISO-8859-1 diff --git a/devel/gettext/files/patch-ah b/devel/gettext/files/patch-ah deleted file mode 100644 index a45dc903c3b9..000000000000 --- a/devel/gettext/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999 -+++ intl/Makefile.in Wed Feb 17 02:30:13 1999 -@@ -119,7 +119,7 @@ - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ - fi; \ - $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ - else \ - : ; \ - fi diff --git a/devel/gettext/files/patch-ai b/devel/gettext/files/patch-ai deleted file mode 100644 index 6a780fdd2d68..000000000000 --- a/devel/gettext/files/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ ---- m4/gettext.m4.orig Fri Dec 24 20:23:44 1999 -+++ m4/gettext.m4 Fri Dec 24 20:25:52 1999 -@@ -73,6 +73,9 @@ - INSTOBJEXT=.mo - fi - fi -+ if test "$gt_cv_func_gettext_libintl" = "yes"; then -+ INTLLIBS='-lintl' -+ fi - ]) - - if test "$CATOBJEXT" = "NONE"; then diff --git a/devel/gettext-devel/files/patch-doc::Makefile.in b/devel/gettext/files/patch-doc::Makefile.in index 80533cd81c08..61e9567457ae 100644 --- a/devel/gettext-devel/files/patch-doc::Makefile.in +++ b/devel/gettext/files/patch-doc::Makefile.in @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-doc::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $ --- doc/Makefile.in.orig Wed May 23 23:48:53 2001 +++ doc/Makefile.in Tue May 29 11:38:28 2001 diff --git a/devel/gettext-devel/files/patch-intl::Makefile.in b/devel/gettext/files/patch-intl::Makefile.in index 66817ee0b75e..66817ee0b75e 100644 --- a/devel/gettext-devel/files/patch-intl::Makefile.in +++ b/devel/gettext/files/patch-intl::Makefile.in diff --git a/devel/gettext-devel/files/patch-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in index d2b83eca79fd..d2b83eca79fd 100644 --- a/devel/gettext-devel/files/patch-lib::Makefile.in +++ b/devel/gettext/files/patch-lib::Makefile.in diff --git a/devel/gettext-devel/files/patch-ltmain.sh b/devel/gettext/files/patch-ltmain.sh index 98cb05e4ddb3..90e76b8f2b14 100644 --- a/devel/gettext-devel/files/patch-ltmain.sh +++ b/devel/gettext/files/patch-ltmain.sh @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-ltmain.sh,v 1.1 2002-03-15 19:43:48 ade Exp $ --- ltmain.sh 2001/08/27 09:51:26 1.1 +++ ltmain.sh 2001/08/27 09:51:42 diff --git a/devel/gettext-devel/files/patch-man::Makefile.in b/devel/gettext/files/patch-man::Makefile.in index 860777a595d7..d8bead54467f 100644 --- a/devel/gettext-devel/files/patch-man::Makefile.in +++ b/devel/gettext/files/patch-man::Makefile.in @@ -1,5 +1,5 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-man::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $ --- man/Makefile.in 2001/05/29 08:45:39 1.1 +++ man/Makefile.in 2001/05/29 08:46:06 diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist index 9e23936a2dbd..42bc8b3edebb 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext/pkg-plist @@ -5,26 +5,58 @@ bin/msgcomm bin/msgfmt bin/msgmerge bin/msgunfmt +bin/ngettext bin/xgettext +include/libintl.h @unexec install-info --delete %D/info/gettext.info %D/info/dir info/gettext.info @exec install-info %D/info/gettext.info %D/info/dir -include/libintl.h lib/libintl.a lib/libintl.so lib/libintl.so.1 +@comment libdata/charset.alias +share/aclocal/codeset.m4 share/aclocal/gettext.m4 +share/aclocal/glibc21.m4 +share/aclocal/iconv.m4 +share/aclocal/isc-posix.m4 share/aclocal/lcmessage.m4 share/aclocal/progtest.m4 +share/doc/gettext/bind_textdomain_codeset.3.html +share/doc/gettext/bindtextdomain.3.html +share/doc/gettext/gettext.3.html +share/doc/gettext/gettext_1.html +share/doc/gettext/gettext_10.html +share/doc/gettext/gettext_11.html +share/doc/gettext/gettext_12.html +share/doc/gettext/gettext_13.html +share/doc/gettext/gettext_14.html +share/doc/gettext/gettext_2.html +share/doc/gettext/gettext_3.html +share/doc/gettext/gettext_4.html +share/doc/gettext/gettext_5.html +share/doc/gettext/gettext_6.html +share/doc/gettext/gettext_7.html +share/doc/gettext/gettext_8.html +share/doc/gettext/gettext_9.html +share/doc/gettext/gettext_foot.html +share/doc/gettext/gettext_toc.html +share/doc/gettext/ngettext.3.html +share/doc/gettext/textdomain.3.html +share/emacs/site-lisp/po-mode.el share/gettext/ABOUT-NLS -share/gettext/po/Makefile.in.in +share/gettext/intl/COPYING.LIB-2 +share/gettext/intl/COPYING.LIB-2.1 share/gettext/intl/ChangeLog share/gettext/intl/Makefile.in share/gettext/intl/VERSION share/gettext/intl/bindtextdom.c -share/gettext/intl/cat-compat.c +share/gettext/intl/config.charset share/gettext/intl/dcgettext.c +share/gettext/intl/dcigettext.c +share/gettext/intl/dcngettext.c share/gettext/intl/dgettext.c +share/gettext/intl/dngettext.c share/gettext/intl/explodename.c share/gettext/intl/finddomain.c share/gettext/intl/gettext.c @@ -34,30 +66,49 @@ share/gettext/intl/hash-string.h share/gettext/intl/intl-compat.c share/gettext/intl/l10nflist.c share/gettext/intl/libgettext.h -share/gettext/intl/linux-msg.sed +share/gettext/intl/libgnuintl.h share/gettext/intl/loadinfo.h share/gettext/intl/loadmsgcat.c +share/gettext/intl/localcharset.c +share/gettext/intl/locale.alias share/gettext/intl/localealias.c -share/gettext/intl/po2tbl.sed.in -share/gettext/intl/xopen-msg.sed +share/gettext/intl/ngettext.c +share/gettext/intl/plural.c +share/gettext/intl/plural.y +share/gettext/intl/ref-add.sin +share/gettext/intl/ref-del.sin share/gettext/intl/textdomain.c +share/gettext/po/Makefile.in.in +share/locale/cs/LC_MESSAGES/gettext.mo share/locale/da/LC_MESSAGES/gettext.mo share/locale/de/LC_MESSAGES/gettext.mo +share/locale/el/LC_MESSAGES/gettext.mo +share/locale/en@boldquot/LC_MESSAGES/gettext.mo +share/locale/en@quot/LC_MESSAGES/gettext.mo share/locale/es/LC_MESSAGES/gettext.mo +share/locale/et/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 +share/locale/it/LC_MESSAGES/gettext.mo +share/locale/ja/LC_MESSAGES/gettext.mo share/locale/ko/LC_MESSAGES/gettext.mo +share/locale/locale.alias share/locale/nl/LC_MESSAGES/gettext.mo +share/locale/nn/LC_MESSAGES/gettext.mo share/locale/no/LC_MESSAGES/gettext.mo -share/locale/no@nynorsk/LC_MESSAGES/gettext.mo share/locale/pl/LC_MESSAGES/gettext.mo share/locale/pt/LC_MESSAGES/gettext.mo +share/locale/pt_BR/LC_MESSAGES/gettext.mo +share/locale/ru/LC_MESSAGES/gettext.mo share/locale/sl/LC_MESSAGES/gettext.mo share/locale/sv/LC_MESSAGES/gettext.mo -share/locale/locale.alias -share/emacs/site-lisp/po-mode.el -@dirrm share/gettext/intl +share/locale/tr/LC_MESSAGES/gettext.mo +share/locale/zh/LC_MESSAGES/gettext.mo @dirrm share/gettext/po +@dirrm share/gettext/intl @dirrm share/gettext +@dirrm share/doc/gettext @unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true @unexec rmdir %D/share/locale/* 2>/dev/null || true @unexec rmdir %D/share/locale 2>/dev/null || true diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index b7edb142e8cf..6f0d8cb8bdef 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -20,7 +20,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \ - intl.1:${PORTSDIR}/devel/gettext + intl.1:${PORTSDIR}/devel/gettext-old RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig NO_LATEST_LINK= "Unstable, development version." diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index b7be23333d09..f744548b3db0 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -14,7 +14,7 @@ DISTNAME= make-${PORTVERSION} MAINTAINER= portmgr@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile index b7be23333d09..f744548b3db0 100644 --- a/devel/gmake381/Makefile +++ b/devel/gmake381/Makefile @@ -14,7 +14,7 @@ DISTNAME= make-${PORTVERSION} MAINTAINER= portmgr@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index ce8c377d7b4f..fba0dbb1da9c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \ +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \ bonobo-2.0:${PORTSDIR}/devel/libbonobo diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 40b90d917fc3..42e5afd76137 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \ +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf .if !exists(/usr/bin/bzip2) diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index 40b90d917fc3..42e5afd76137 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-vfs-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \ +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf .if !exists(/usr/bin/bzip2) diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index ce8c377d7b4f..fba0dbb1da9c 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \ +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \ bonobo-2.0:${PORTSDIR}/devel/libbonobo diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 001c68473265..59b26ba64bed 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile index 3469c2dfaca5..21c1bbf7aee5 100644 --- a/devel/ixlib/Makefile +++ b/devel/ixlib/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old USE_NEWGCC= yes USE_GMAKE= yes diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 5b141e827a02..89fd4472b804 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -14,7 +14,7 @@ DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext \ +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old \ autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake diff --git a/devel/ktranslator/Makefile b/devel/ktranslator/Makefile index e76d8dbb2aac..8f5c797c1e35 100644 --- a/devel/ktranslator/Makefile +++ b/devel/ktranslator/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= Attic/old/1.1.2/apps/utils MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_KDELIBS_VER=1 diff --git a/devel/motor/Makefile b/devel/motor/Makefile index ab049ffd3004..e30dca3d77a2 100644 --- a/devel/motor/Makefile +++ b/devel/motor/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= sobomax MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt USE_GMAKE= yes diff --git a/devel/objprelink/Makefile b/devel/objprelink/Makefile index 10ec5044c412..b9ac40479d44 100644 --- a/devel/objprelink/Makefile +++ b/devel/objprelink/Makefile @@ -16,7 +16,7 @@ DISTFILES= objprelink.c.gz binutils-${BINUTILS_VER}.tar.bz2 MAINTAINER= dominic_marks@btinternet.com -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old ONLY_FOR_ARCHS= i386 BINUTILS_VER= 2.11.2 diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile index f8744350054e..d9ccf3dacbe8 100644 --- a/devel/p5-Locale-gettext/Makefile +++ b/devel/p5-Locale-gettext/Makefile @@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= demon@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old PERL_CONFIGURE= yes CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 9a2d635b567b..1561ff140078 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \ MAINTAINER= ycheng@sinica.edu.tw -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old WRKSRC= ${WRKDIR}/${PORTNAME}-1.5 diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile index 4db1a654257f..5dd4d37c1fb6 100644 --- a/devel/ruby-intl/Makefile +++ b/devel/ruby-intl/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old USE_RUBY= yes USE_RUBY_EXTCONF= yes |