diff options
author | Ade Lovett <ade@FreeBSD.org> | 2002-04-12 17:10:20 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2002-04-12 17:10:20 +0000 |
commit | f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1 (patch) | |
tree | 9e893c98603cb0cd739358e66f822966d7bdcc5b /www | |
parent | Update to the 2002-04-09 snapshot of what will be version 5.2. (diff) |
gettext upgrade uber-patch (stage 3)
- switch devel/gettext (0.11.1) on, installing full package
- flip devel/gettext-old (0.10.35) to installing only static binaries
with a "-old" suffix -- gettext-old will have its deorbit burn
sequence initiated just after 4.6-RELEASE
- fix up ports for the new world order
Reviewed by: portmgr
Diffstat (limited to 'www')
-rw-r--r-- | www/amyc/Makefile | 4 | ||||
-rw-r--r-- | www/cadaver/Makefile | 4 | ||||
-rw-r--r-- | www/dillo-i18n/Makefile | 3 | ||||
-rw-r--r-- | www/dillo/Makefile | 3 | ||||
-rw-r--r-- | www/dillo2/Makefile | 3 | ||||
-rw-r--r-- | www/galeon/Makefile | 8 | ||||
-rw-r--r-- | www/galeon2/Makefile | 8 | ||||
-rw-r--r-- | www/horde-devel/Makefile | 6 | ||||
-rw-r--r-- | www/horde2/Makefile | 6 | ||||
-rw-r--r-- | www/kdewebdev/Makefile | 3 | ||||
-rw-r--r-- | www/kdewebdev4/Makefile | 3 | ||||
-rw-r--r-- | www/lynx-current/Makefile | 3 | ||||
-rw-r--r-- | www/mod_php3/scripts/configure.php | 2 | ||||
-rw-r--r-- | www/mod_php4/scripts/configure.php | 2 | ||||
-rw-r--r-- | www/mod_php5/scripts/configure.php | 2 | ||||
-rw-r--r-- | www/quanta/Makefile | 3 | ||||
-rw-r--r-- | www/retawq/Makefile | 3 | ||||
-rw-r--r-- | www/sitecopy/Makefile | 4 |
18 files changed, 37 insertions, 33 deletions
diff --git a/www/amyc/Makefile b/www/amyc/Makefile index bb1158675199..80ada03e1849 100644 --- a/www/amyc/Makefile +++ b/www/amyc/Makefile @@ -7,13 +7,13 @@ PORTNAME= amyc PORTVERSION= 0.9.159 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.crevola.com/about/current/ MAINTAINER= petef@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_AUTOCONF= yes GNU_CONFIGURE= yes diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 5a8b54a1ed18..38bb9f6e6fa5 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -7,7 +7,7 @@ PORTNAME= cadaver PORTVERSION= 0.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.webdav.org/cadaver/ @@ -16,7 +16,7 @@ MAINTAINER= tarkhil@over.ru BROKEN= "Dependency out of date" LIB_DEPENDS= neon.18:${PORTSDIR}/www/neon \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext .ifndef NO_OPENSSL USE_OPENSSL= yes diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile index f19ed74d52cc..6cd0a7b34587 100644 --- a/www/dillo-i18n/Makefile +++ b/www/dillo-i18n/Makefile @@ -7,6 +7,7 @@ PORTNAME= dillo PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dillo.cipsga.org.br/download/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext USE_GTK= yes GNU_CONFIGURE= yes diff --git a/www/dillo/Makefile b/www/dillo/Makefile index f19ed74d52cc..6cd0a7b34587 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -7,6 +7,7 @@ PORTNAME= dillo PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dillo.cipsga.org.br/download/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext USE_GTK= yes GNU_CONFIGURE= yes diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index f19ed74d52cc..6cd0a7b34587 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -7,6 +7,7 @@ PORTNAME= dillo PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dillo.cipsga.org.br/download/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -15,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext USE_GTK= yes GNU_CONFIGURE= yes diff --git a/www/galeon/Makefile b/www/galeon/Makefile index fe610a55fbb5..cc9dfb3299ef 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -7,7 +7,7 @@ PORTNAME= galeon PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \ - msgfmt-new:${PORTSDIR}/devel/gettext + msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -38,9 +38,7 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \ --enable-nautilus-view CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= galeon.1 diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index fe610a55fbb5..cc9dfb3299ef 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -7,7 +7,7 @@ PORTNAME= galeon PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \ - msgfmt-new:${PORTSDIR}/devel/gettext + msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -38,9 +38,7 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \ --enable-nautilus-view CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= galeon.1 diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile index 133cfc7d43c8..966b8e6f2c5a 100644 --- a/www/horde-devel/Makefile +++ b/www/horde-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= horde PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/ PKGNAMESUFFIX= -devel @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} # #----------------------------------------------------------------------- -LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext .if !defined(WITHOUT_MCAL) LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal .endif @@ -75,7 +75,7 @@ pre-install: ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi - @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.1"; then \ + @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.2"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with gettext support." ; \ ${ECHO_MSG} "" ; \ diff --git a/www/horde2/Makefile b/www/horde2/Makefile index 133cfc7d43c8..966b8e6f2c5a 100644 --- a/www/horde2/Makefile +++ b/www/horde2/Makefile @@ -7,7 +7,7 @@ PORTNAME= horde PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/ PKGNAMESUFFIX= -devel @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} # #----------------------------------------------------------------------- -LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS+= intl.2:${PORTSDIR}/devel/gettext .if !defined(WITHOUT_MCAL) LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal .endif @@ -75,7 +75,7 @@ pre-install: ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi - @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.1"; then \ + @if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.2"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with gettext support." ; \ ${ECHO_MSG} "" ; \ diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index 98ad75a22a61..9e0285ce9aa8 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -7,6 +7,7 @@ PORTNAME= quanta PORTVERSION= 2.0p1 +PORTREVISION= 1 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 98ad75a22a61..9e0285ce9aa8 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -7,6 +7,7 @@ PORTNAME= quanta PORTVERSION= 2.0p1 +PORTREVISION= 1 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 7b1540589ed2..0c9ab0b6af6f 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -7,13 +7,14 @@ PORTNAME= lynx PORTVERSION= 2.8.5d7 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://lynx.isc.org/current/ DISTNAME= ${PORTNAME}2.8.5dev.7 MAINTAINER= ache@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME}2-8-5 USE_BZIP2= yes diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php index ebda8f793310..d8ed8bd55600 100644 --- a/www/mod_php3/scripts/configure.php +++ b/www/mod_php3/scripts/configure.php @@ -154,7 +154,7 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-ftp" ;; \"gettext\") - echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext" + echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext" echo "CONFIGURE_ARGS+=--with-gettext=\${PREFIX}" ;; \"YP\") diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 47d875cb814a..32a156902c3b 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -263,7 +263,7 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl" ;; \"gettext\") - echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext" + echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext" echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}" ;; \"iconv\") diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 47d875cb814a..32a156902c3b 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -263,7 +263,7 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl" ;; \"gettext\") - echo "LIB_DEPENDS+= intl.1:\${PORTSDIR}/devel/gettext" + echo "LIB_DEPENDS+= intl.2:\${PORTSDIR}/devel/gettext" echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}" ;; \"iconv\") diff --git a/www/quanta/Makefile b/www/quanta/Makefile index 98ad75a22a61..9e0285ce9aa8 100644 --- a/www/quanta/Makefile +++ b/www/quanta/Makefile @@ -7,6 +7,7 @@ PORTNAME= quanta PORTVERSION= 2.0p1 +PORTREVISION= 1 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,7 +22,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jeremy@external.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/retawq/Makefile b/www/retawq/Makefile index 4a19b4593a88..e31cd3a61c60 100644 --- a/www/retawq/Makefile +++ b/www/retawq/Makefile @@ -8,13 +8,14 @@ PORTNAME= retawq PORTVERSION= 0.0.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 40c5cc749147..78de174ae2d6 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -7,13 +7,13 @@ PORTNAME= sitecopy PORTVERSION= 0.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.lyra.org/sitecopy/ MAINTAINER= olgeni@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext GNU_CONFIGURE= yes CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -lintl" |