diff options
author | Ade Lovett <ade@FreeBSD.org> | 2002-04-13 01:10:20 +0800 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2002-04-13 01:10:20 +0800 |
commit | f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1 (patch) | |
tree | 9e893c98603cb0cd739358e66f822966d7bdcc5b /x11 | |
parent | ad6d09753806c4f4d415c00b57ecbca27042b8bb (diff) | |
download | freebsd-ports-f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1.tar.gz freebsd-ports-f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1.tar.zst freebsd-ports-f18cbf2fa6e7c1d623750aaf72027bb6a6a395c1.zip |
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 'x11')
-rw-r--r-- | x11/gnome-applets/Makefile | 7 | ||||
-rw-r--r-- | x11/gnomeapplets/Makefile | 7 | ||||
-rw-r--r-- | x11/gnomeapplets2/Makefile | 7 | ||||
-rw-r--r-- | x11/gnomecore/Makefile | 8 | ||||
-rw-r--r-- | x11/kde4-baseapps/Makefile | 4 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 4 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase11/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase2/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4-runtime/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4-workspace/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase4/Makefile | 4 |
13 files changed, 30 insertions, 35 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 127ff116f9e3..dc7df156e15a 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeapplets PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-applets @@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= yes @@ -22,9 +23,7 @@ USE_GMAKE= yes USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib" MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \ cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \ diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile index 127ff116f9e3..dc7df156e15a 100644 --- a/x11/gnomeapplets/Makefile +++ b/x11/gnomeapplets/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeapplets PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-applets @@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= yes @@ -22,9 +23,7 @@ USE_GMAKE= yes USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib" MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \ cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \ diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 127ff116f9e3..dc7df156e15a 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeapplets PORTVERSION= 1.4.0.5 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-applets @@ -14,7 +15,7 @@ DISTNAME= gnome-applets-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop USE_X_PREFIX= yes @@ -22,9 +23,7 @@ USE_GMAKE= yes USE_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib" MAN1= another_clock_applet.1 asclock_applet.1 battery_applet.1 \ cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \ diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index 70c384b5e899..d190e807c519 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomecore PORTVERSION= 1.4.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-core @@ -15,7 +15,7 @@ DISTNAME= gnome-core-${PORTVERSION} MAINTAINER?= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio @@ -27,9 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-gtkhtml=${X11BASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT=${LOCALBASE}/bin/msgfmt-new \ - XGETTEXT=${LOCALBASE}/bin/xgettext-new + LIBS="-L${LOCALBASE}/lib" MAN1= deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \ gnome-download.1 gnome-edit.1 gnome-hint-properties-capplet.1 \ diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index 6a6a27b6e86c..1793f438504b 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= Attic/old/1.1.2/distribution/tar/generic/source/bz2 @@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - intl.1:${PORTSDIR}/devel/gettext-old + intl.2:${PORTSDIR}/devel/gettext NO_LATEST_LINK= yes USE_XLIB= yes diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 042ef81f0608..3c5876f985f2 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -17,7 +17,7 @@ MAINTAINER?= kde@FreeBSD.org BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ automake14:${PORTSDIR}/devel/automake14 -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext USE_KDELIBS_VER=2 SOMAJOR= 4 |