aboutsummaryrefslogtreecommitdiffstats
path: root/ftp
diff options
context:
space:
mode:
authormva <mva@FreeBSD.org>2013-04-27 16:50:46 +0800
committermva <mva@FreeBSD.org>2013-04-27 16:50:46 +0800
commit79452c6dc80b634c3ef9c985a517d911cf038f4a (patch)
tree5b8de344e457d5da2cf746d56e495a2ce03e1d99 /ftp
parent6901fd0c6d72632658ac11df799e604b6039ac64 (diff)
downloadfreebsd-ports-gnome-79452c6dc80b634c3ef9c985a517d911cf038f4a.tar.gz
freebsd-ports-gnome-79452c6dc80b634c3ef9c985a517d911cf038f4a.tar.zst
freebsd-ports-gnome-79452c6dc80b634c3ef9c985a517d911cf038f4a.zip
- Convert USE_ICONV=yes to USES=iconv
- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig while here Reviewed by: bapt, kwm
Diffstat (limited to 'ftp')
-rw-r--r--ftp/axel/Makefile3
-rw-r--r--ftp/lftp/Makefile2
-rw-r--r--ftp/pure-ftpd/Makefile2
-rw-r--r--ftp/smbftpd/Makefile2
-rw-r--r--ftp/wput/Makefile3
-rw-r--r--ftp/wzdftpd/Makefile2
6 files changed, 6 insertions, 8 deletions
diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index d3017241541e..e64b9d5f3511 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -21,8 +21,7 @@ OPTIONS_DEFINE= NLS DEBUG
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-USE_ICONV= yes
+USES+= gettext iconv
PLIST_SUB+= NLS=""
CONFIGURE_ARGS+=--i18n=1
.else
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 29c34621c415..cd6c486d9aa5 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv3
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
-USE_ICONV= yes
+USES= iconv
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 1659a586a03c..de4b8937e3e2 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -110,7 +110,7 @@ CONFIGURE_ARGS+= --with-uploadscript
# RFC 2640 charset conversion requested?
.if ${PORT_OPTIONS:MUTF8}
-USE_ICONV= YES
+USES+= iconv
CONFIGURE_ARGS+= --with-rfc2640
.endif
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index b3d42f845b35..6abc425f6b29 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= "--with-pgsql"
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= "--with-iconv"
.endif
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index e0a37e41933c..b2797864451b 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -35,8 +35,7 @@ CONFIGURE_ARGS+= --without-ssl
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_ICONV= yes
-USES+= gettext
+USES+= gettext iconv
CONFIGURE_ARGS+= --enable-nls \
--with-libintl-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE}
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 5853f222e345..3c515c1dfa5c 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -40,7 +40,7 @@ MAN8= wzdftpd.8
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MUTF8}
-USE_ICONV= yes
+USES+= iconv
.else
CONFIGURE_ARGS+= --disable-utf8
.endif