summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftp/wget-devel/Makefile16
-rw-r--r--ftp/wget/Makefile16
2 files changed, 22 insertions, 10 deletions
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index 26ecfdb76992..c1c246ffb945 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wget
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ftp www ipv6
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -23,8 +23,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
@@ -33,9 +33,7 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
USE_GMAKE= 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= wget.1
@@ -44,6 +42,14 @@ post-patch:
@${RM} -f ${WRKSRC}/po/zh.po*
# we don't need to run autoconf.
${TOUCH} ${WRKSRC}/configure
+# convert utf-8 to Big5 for FreeBSD's default old fashioned gettext.
+ (cd ${WRKSRC}; \
+ ${MV} po/zh_TW.po po/zh_TW.po.utf-8; \
+ ${LOCALBASE}/bin/giconv -f UTF-8 -t BIG5 po/zh_TW.po.utf-8 |\
+ ${SED} -e 's/utf-8/big5/' |\
+ ${PERL} -p -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
+ ${PERL} -p -e 's,\\\\([nt\"]),\\$$1,g' \
+ > po/zh_TW.po)
pre-build:
@${RM} -f ${WRKSRC}/doc/wget.info*
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 26ecfdb76992..c1c246ffb945 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wget
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ftp www ipv6
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \
@@ -23,8 +23,8 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
-BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
@@ -33,9 +33,7 @@ CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
USE_GMAKE= 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= wget.1
@@ -44,6 +42,14 @@ post-patch:
@${RM} -f ${WRKSRC}/po/zh.po*
# we don't need to run autoconf.
${TOUCH} ${WRKSRC}/configure
+# convert utf-8 to Big5 for FreeBSD's default old fashioned gettext.
+ (cd ${WRKSRC}; \
+ ${MV} po/zh_TW.po po/zh_TW.po.utf-8; \
+ ${LOCALBASE}/bin/giconv -f UTF-8 -t BIG5 po/zh_TW.po.utf-8 |\
+ ${SED} -e 's/utf-8/big5/' |\
+ ${PERL} -p -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
+ ${PERL} -p -e 's,\\\\([nt\"]),\\$$1,g' \
+ > po/zh_TW.po)
pre-build:
@${RM} -f ${WRKSRC}/doc/wget.info*