Use gettext-devel to workaround a incompatibility with the oldest version of

gettext.

4 files changed, 8 insertions, 70 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 1a27f2b74845..19969fedb384 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-utils-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	msgfmt-new:${PORTS}/devel/gettext-devel
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
 		ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
 
@@ -23,7 +24,9 @@ USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-messages=/var/log/messages
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+		XGETTEXT=${LOCALBASE}/bin/xgettext-new
 
 MAN1=	gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
 	gfontsel.1 gless.1 gnome-exe-handler.1 gsearchtool.1 guname.1 gw.1 \
diff --git a/deskutils/gnome-utils/files/patch-po::zh_TW.Big5.po b/deskutils/gnome-utils/files/patch-po::zh_TW.Big5.po
deleted file mode 100644
index d7939391d3b8..000000000000
--- a/deskutils/gnome-utils/files/patch-po::zh_TW.Big5.po
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- po/zh_TW.Big5.po	2001/07/03 16:16:17	1.1
-+++ po/zh_TW.Big5.po	2001/07/03 16:19:48
-@@ -1154,8 +1154,8 @@
- "This will overwrite your current set of projects.\n"
- "Do you really want to reload the configuration file?"
- msgstr ""
--"將要覆蓋現存計劃的設定。\n"
--"是否真的要重新載入設定檔？"
-+"This will overwrite your current set of projects.\n"
-+"Do you really want to reload the configuration file?"
- 
- # gtt/menus.c:27

- #: gtt/menus.c:27
-@@ -2903,7 +2903,7 @@
- # mini-utils/gless/gless.c:130

- #: mini-utils/gless/gless.c:130
- msgid "Where to put the window, and its size"
--msgstr "視窗擺放的位置與大小"
-+msgstr "Where to put the window, and its size"
- 
- # mini-utils/gless/gless.c:131

- #: mini-utils/gless/gless.c:131
-@@ -4082,7 +4082,7 @@
- # gfloppy/src/progress.c:117

- #: gfloppy/src/progress.c:117
- msgid "Floppy formatted successfully."
--msgstr "軟碟片格式化成功。"
-+msgstr "Floppy formatted successfully."
- 
- # gfloppy/src/progress.c:121

- #: gfloppy/src/progress.c:121
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 1a27f2b74845..19969fedb384 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-utils-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	msgfmt-new:${PORTS}/devel/gettext-devel
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
 		ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
 
@@ -23,7 +24,9 @@ USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-messages=/var/log/messages
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+		XGETTEXT=${LOCALBASE}/bin/xgettext-new
 
 MAN1=	gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \
 	gfontsel.1 gless.1 gnome-exe-handler.1 gsearchtool.1 guname.1 gw.1 \
diff --git a/deskutils/gnomeutils2/files/patch-po::zh_TW.Big5.po b/deskutils/gnomeutils2/files/patch-po::zh_TW.Big5.po
deleted file mode 100644
index d7939391d3b8..000000000000
--- a/deskutils/gnomeutils2/files/patch-po::zh_TW.Big5.po
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- po/zh_TW.Big5.po	2001/07/03 16:16:17	1.1
-+++ po/zh_TW.Big5.po	2001/07/03 16:19:48
-@@ -1154,8 +1154,8 @@
- "This will overwrite your current set of projects.\n"
- "Do you really want to reload the configuration file?"
- msgstr ""
--"將要覆蓋現存計劃的設定。\n"
--"是否真的要重新載入設定檔？"
-+"This will overwrite your current set of projects.\n"
-+"Do you really want to reload the configuration file?"
- 
- # gtt/menus.c:27

- #: gtt/menus.c:27
-@@ -2903,7 +2903,7 @@
- # mini-utils/gless/gless.c:130

- #: mini-utils/gless/gless.c:130
- msgid "Where to put the window, and its size"
--msgstr "視窗擺放的位置與大小"
-+msgstr "Where to put the window, and its size"
- 
- # mini-utils/gless/gless.c:131

- #: mini-utils/gless/gless.c:131
-@@ -4082,7 +4082,7 @@
- # gfloppy/src/progress.c:117

- #: gfloppy/src/progress.c:117
- msgid "Floppy formatted successfully."
--msgstr "軟碟片格式化成功。"
-+msgstr "Floppy formatted successfully."
- 
- # gfloppy/src/progress.c:121

- #: gfloppy/src/progress.c:121