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 /net | |
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
Notes
Notes:
svn path=/head/; revision=57625
Diffstat (limited to 'net')
-rw-r--r-- | net/centericq/Makefile | 6 | ||||
-rw-r--r-- | net/dctc-gui/Makefile | 4 | ||||
-rw-r--r-- | net/etherape/Makefile | 3 | ||||
-rw-r--r-- | net/fidelio/Makefile | 3 | ||||
-rw-r--r-- | net/gabber/Makefile | 7 | ||||
-rw-r--r-- | net/gnomeicu/Makefile | 7 | ||||
-rw-r--r-- | net/gnomeicu/gnomeicu/Makefile | 7 | ||||
-rw-r--r-- | net/gnomeicu2/Makefile | 7 | ||||
-rw-r--r-- | net/gtkhx/Makefile | 5 | ||||
-rw-r--r-- | net/ipv6calc/Makefile | 3 | ||||
-rw-r--r-- | net/jwhois/Makefile | 3 | ||||
-rw-r--r-- | net/kdetelnet/Makefile | 3 | ||||
-rw-r--r-- | net/kmud/Makefile | 3 | ||||
-rw-r--r-- | net/ksamba/Makefile | 3 | ||||
-rw-r--r-- | net/wol/Makefile | 7 |
15 files changed, 36 insertions, 35 deletions
diff --git a/net/centericq/Makefile b/net/centericq/Makefile index 1f325facc4ca..c972124c3329 100644 --- a/net/centericq/Makefile +++ b/net/centericq/Makefile @@ -8,14 +8,14 @@ PORTNAME= centericq PORTVERSION= 4.6.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://konst.org.ua/download/ MAINTAINER= ijliao@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \ - sigc.1:${PORTSDIR}/devel/libsigc++ \ - iconv:${PORTSDIR}/converters/libiconv +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \ + sigc.1:${PORTSDIR}/devel/libsigc++ USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile index 8fe0e7a9191f..470845ae1e06 100644 --- a/net/dctc-gui/Makefile +++ b/net/dctc-gui/Makefile @@ -7,6 +7,7 @@ PORTNAME= dctc PORTVERSION= 0.51 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= http://ac2i.tzo.com/dctc/ PKGNAMESUFFIX= -gui @@ -17,8 +18,7 @@ MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \ db4.0:${PORTSDIR}/databases/db4 \ - iconv.3:${PORTSDIR}/converters/libiconv \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext USE_GNOMELIBS= yes USE_GTK= yes diff --git a/net/etherape/Makefile b/net/etherape/Makefile index d149c26069c3..ecbc4ace42e8 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -7,13 +7,14 @@ PORTNAME= etherape PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= petef@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext GNU_CONFIGURE= yes USE_GNOME= yes diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile index 6ac49f627e2d..9a4726fdcdf7 100644 --- a/net/fidelio/Makefile +++ b/net/fidelio/Makefile @@ -7,13 +7,14 @@ PORTNAME= fidelio PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \ +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \ xml2.5:${PORTSDIR}/textproc/libxml2 XML_CONFIG?= ${LOCALBASE}/bin/xml2-config diff --git a/net/gabber/Makefile b/net/gabber/Makefile index 41a20520203d..ba8dad2404f0 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -7,13 +7,14 @@ PORTNAME= gabber PORTVERSION= 0.8.6 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext .if defined(WITH_XMMS) BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms .endif @@ -25,9 +26,7 @@ USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITH_XMMS) CONFIGURE_ARGS= --disable-xmms .endif diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index 162f028a5d4a..408d81195d6e 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeicu PORTVERSION= 0.98.2 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -19,7 +20,7 @@ USE_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \ - msgfmt-new:${PORTSDIR}/devel/gettext + msgfmt:${PORTSDIR}/devel/gettext .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5 CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ - CFLAGS="${CFLAGS}" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + CFLAGS="${CFLAGS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index 162f028a5d4a..408d81195d6e 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeicu PORTVERSION= 0.98.2 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -19,7 +20,7 @@ USE_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \ - msgfmt-new:${PORTSDIR}/devel/gettext + msgfmt:${PORTSDIR}/devel/gettext .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5 CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ - CFLAGS="${CFLAGS}" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + CFLAGS="${CFLAGS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index 162f028a5d4a..408d81195d6e 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeicu PORTVERSION= 0.98.2 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu @@ -19,7 +20,7 @@ USE_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes BUILD_DEPENDS+= gnet-config:${PORTSDIR}/net/gnet \ - msgfmt-new:${PORTSDIR}/devel/gettext + msgfmt:${PORTSDIR}/devel/gettext .if defined(WITH_DANTE) LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ @@ -40,9 +41,7 @@ SOCKSLIBS= -lsocks5 CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ - CFLAGS="${CFLAGS}" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + CFLAGS="${CFLAGS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile index c6377d7a86be..4329b7ab4b23 100644 --- a/net/gtkhx/Makefile +++ b/net/gtkhx/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkhx PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gtkhx @@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= gtkhx MAINTAINER= jre@vineyard.net LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - intl.1:${PORTSDIR}/devel/gettext-old \ - iconv.3:${PORTSDIR}/converters/libiconv + intl.2:${PORTSDIR}/devel/gettext USE_XLIB= yes USE_GLIB= yes diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile index 45f74237353c..585a0fe3c0bf 100644 --- a/net/ipv6calc/Makefile +++ b/net/ipv6calc/Makefile @@ -7,12 +7,13 @@ PORTNAME= ipv6calc PORTVERSION= 0.38 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ MAINTAINER= edwin@mavetju.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \ +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt GNU_CONFIGURE= yes diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index c0d4b73f667e..4e2b4118c5ed 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -7,13 +7,14 @@ PORTNAME= jwhois PORTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= jwhois MAINTAINER= matusita@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${PREFIX}/var/jwhois diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile index 0196d71cb3e0..797fb45d3a42 100644 --- a/net/kdetelnet/Makefile +++ b/net/kdetelnet/Makefile @@ -7,6 +7,7 @@ PORTNAME= ktelnet PORTVERSION= 2.0.43 +PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= http://www.spaghetti-code.de/download/ktelnet/ DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/} @@ -14,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 USE_GMAKE= yes diff --git a/net/kmud/Makefile b/net/kmud/Makefile index ffebabf6ae99..9fc4503f3bef 100644 --- a/net/kmud/Makefile +++ b/net/kmud/Makefile @@ -7,6 +7,7 @@ PORTNAME= kmud PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.kmud.de/pub/kmud/ @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext-old +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext USE_KDEBASE_VER=1 USE_LIBTOOL= yes diff --git a/net/ksamba/Makefile b/net/ksamba/Makefile index 08577984bc54..62e272c6aac7 100644 --- a/net/ksamba/Makefile +++ b/net/ksamba/Makefile @@ -7,12 +7,13 @@ PORTNAME= ksamba PORTVERSION= 0.3.4 +PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= ${MASTER_SITE_KDE} \ http://www.kneschke.de/projekte/ksamba/download/ MASTER_SITE_SUBDIR= unstable/apps/network -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext-old +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=1 USE_GMAKE= yes diff --git a/net/wol/Makefile b/net/wol/Makefile index 2982aa3595de..393b79a66f0e 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -8,16 +8,15 @@ PORTNAME= wol PORTVERSION= 0.6.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ahh MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old \ - iconv.3:${PORTSDIR}/converters/libiconv \ - gnugetopt:${PORTSDIR}/devel/libgnugetopt +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ |