From owner-svn-ports-head@FreeBSD.ORG Sat Apr 27 18:25:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7756472A; Sat, 27 Apr 2013 18:25:42 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 66E0814C3; Sat, 27 Apr 2013 18:25:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3RIPgTe007539; Sat, 27 Apr 2013 18:25:42 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3RIPPsj007420; Sat, 27 Apr 2013 18:25:25 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201304271825.r3RIPPsj007420@svn.freebsd.org> From: Marcus von Appen Date: Sat, 27 Apr 2013 18:25:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316683 - in head: news/newsstar news/slrn news/tin palm/pilot-link palm/synce-hal palm/synce-librapi2 palm/synce-librra palm/synce-libsynce palm/synce-vdccm polish/ekg2 polish/kadu pol... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Apr 2013 18:25:42 -0000 Author: mva Date: Sat Apr 27 18:25:24 2013 New Revision: 316683 URL: http://svnweb.freebsd.org/changeset/ports/316683 Log: - Convert USE_ICONV=yes to USES=iconv - Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig and USE_GETTEXT=yes to USES=gettext while here Modified: head/news/newsstar/Makefile head/news/slrn/Makefile head/news/tin/Makefile head/palm/pilot-link/Makefile (contents, props changed) head/palm/synce-hal/Makefile (contents, props changed) head/palm/synce-librapi2/Makefile (contents, props changed) head/palm/synce-librra/Makefile (contents, props changed) head/palm/synce-libsynce/Makefile (contents, props changed) head/palm/synce-vdccm/Makefile head/polish/ekg2/Makefile head/polish/kadu/Makefile head/polish/qnapi/Makefile head/ports-mgmt/gnome-packagekit/Makefile head/ports-mgmt/packagekit/Makefile head/print/cups-base/Makefile (contents, props changed) head/print/fontforge/Makefile head/print/gv/Makefile head/print/openprinting/Makefile head/print/pdftk/Makefile (contents, props changed) head/print/py-cups/Makefile head/print/wprint/Makefile (contents, props changed) head/russian/mueller-dic/Makefile (contents, props changed) head/science/afni/Makefile head/science/ecs/Makefile head/science/linsmith/Makefile head/science/massxpert/Makefile head/science/meep/Makefile head/science/ncs/Makefile head/security/bsp_upektfmess/Makefile head/security/clamav-devel/Makefile head/security/clamav/Makefile (contents, props changed) head/security/dirmngr/Makefile (contents, props changed) head/security/gnupg/Makefile head/security/gnupg1/Makefile (contents, props changed) head/security/gnutls-devel/Makefile (contents, props changed) head/security/gnutls/Makefile head/security/ipsec-tools/Makefile (contents, props changed) head/security/libgpg-error/Makefile head/security/libprelude/Makefile head/security/libpreludedb/Makefile head/security/openvas-libnasl/Makefile (contents, props changed) head/security/pam_krb5-rh/Makefile head/security/pinentry/Makefile head/security/prelude-lml/Makefile head/security/prelude-manager/Makefile head/security/rifiuti2/Makefile head/security/scanhill/Makefile (contents, props changed) head/security/shishi/Makefile head/security/sssd/Makefile head/security/tpm-tools/Makefile head/security/trousers/Makefile head/security/truecrypt/Makefile head/shells/bash-devel/Makefile head/shells/bash/Makefile (contents, props changed) head/shells/fish/Makefile head/shells/tcsh_nls/Makefile (contents, props changed) head/shells/zsh/Makefile (contents, props changed) head/sysutils/afflib/Makefile head/sysutils/apt/Makefile head/sysutils/archivemount/Makefile head/sysutils/cdrkit/Makefile head/sysutils/cdrtools-devel/Makefile (contents, props changed) head/sysutils/cdrtools/Makefile (contents, props changed) head/sysutils/conky/Makefile head/sysutils/dc3dd/Makefile head/sysutils/fusefs-exfat/Makefile head/sysutils/fusefs-fur/Makefile head/sysutils/fusefs-fusexmp_fh/Makefile head/sysutils/fusefs-libs/Makefile head/sysutils/fusefs-ntfs/Makefile head/sysutils/geomgui/Makefile head/sysutils/gsmartcontrol/Makefile head/sysutils/gtk-imonc/Makefile head/sysutils/jfbterm/Makefile (contents, props changed) head/sysutils/kiconvtool/Makefile (contents, props changed) head/sysutils/ldapvi/Makefile (contents, props changed) head/sysutils/libcdio/Makefile (contents, props changed) head/sysutils/lxinput/Makefile head/sysutils/lxtask/Makefile head/sysutils/lxterminal/Makefile head/sysutils/nitrogen/Makefile head/sysutils/pfstat/Makefile (contents, props changed) head/sysutils/quicksynergy/Makefile head/sysutils/shmcat/Makefile head/sysutils/unieject/Makefile head/sysutils/xorriso/Makefile (contents, props changed) head/textproc/aspell/Makefile head/textproc/clucene/Makefile head/textproc/ctpp2/Makefile head/textproc/docbook2X/Makefile (contents, props changed) head/textproc/estraier/Makefile (contents, props changed) head/textproc/exempi/Makefile (contents, props changed) head/textproc/flex/Makefile head/textproc/freexl/Makefile (contents, props changed) head/textproc/gsed/Makefile (contents, props changed) head/textproc/hunspell/Makefile head/textproc/hyperestraier/Makefile (contents, props changed) head/textproc/intltool/Makefile (contents, props changed) head/textproc/kmflcomp/Makefile (contents, props changed) head/textproc/liblrdf/Makefile (contents, props changed) head/textproc/libparsifal/Makefile (contents, props changed) head/textproc/libxml2/Makefile head/textproc/mifluz/Makefile head/textproc/odt2txt/Makefile (contents, props changed) head/textproc/opensp/Makefile head/textproc/p5-Text-Unaccent/Makefile (contents, props changed) head/textproc/p5-XML-Sablotron/Makefile (contents, props changed) head/textproc/p5-XML-TinyXML/Makefile (contents, props changed) head/textproc/refdb/Makefile (contents, props changed) head/textproc/ruby-libxml/Makefile head/textproc/ruby-sablot/Makefile head/textproc/sablotron/Makefile (contents, props changed) head/textproc/scim-kmfl-imengine/Makefile head/textproc/scim-openvanilla/Makefile head/textproc/scim/Makefile head/textproc/sdcv/Makefile head/textproc/simplexml/Makefile head/textproc/skim/Makefile (contents, props changed) head/textproc/sphinxsearch-devel/Makefile (contents, props changed) head/textproc/sphinxsearch/Makefile head/textproc/uim-el/Makefile (contents, props changed) head/textproc/uim-qt4/Makefile (contents, props changed) head/textproc/uim/Makefile head/textproc/unrtf/Makefile head/textproc/wv2/Makefile head/textproc/xalan-c/Makefile (contents, props changed) head/textproc/xerces-c2-devel/Makefile head/textproc/xerces-c2/Makefile (contents, props changed) head/textproc/xmlppm/Makefile (contents, props changed) head/textproc/xmlstarlet/Makefile (contents, props changed) head/textproc/zorba/Makefile head/www/anyterm/Makefile head/www/apache22/Makefile head/www/apache24/Makefile head/www/awffull/Makefile head/www/cadaver/Makefile head/www/cas/Makefile head/www/dansguardian-devel/Makefile head/www/dansguardian/Makefile (contents, props changed) head/www/dillo-i18n/Makefile head/www/elinks/Makefile head/www/flood/Makefile (contents, props changed) head/www/gatling/Makefile head/www/htmlcxx/Makefile head/www/httest/Makefile (contents, props changed) head/www/httrack/Makefile head/www/lynx-current/Makefile head/www/lynx/Makefile head/www/mod_encoding/Makefile (contents, props changed) head/www/rsstool/Makefile (contents, props changed) head/www/sarg/Makefile (contents, props changed) head/www/tntnet/Makefile head/www/trafficserver/Makefile (contents, props changed) head/www/webalizer/Makefile (contents, props changed) head/www/xapian-omega/Makefile head/www/xapian-omega10/Makefile (contents, props changed) head/x11-clocks/cairo-clock/Makefile head/x11-themes/lxde-icon-theme/Makefile (contents, props changed) head/x11-wm/afterstep-stable/Makefile (contents, props changed) head/x11-wm/awesome/Makefile head/x11-wm/awesome2/Makefile (contents, props changed) head/x11-wm/blackbox/Makefile (contents, props changed) head/x11-wm/e16/Makefile head/x11-wm/enlightenment/Makefile head/x11-wm/fluxbox/Makefile (contents, props changed) head/x11-wm/fvwm2/Makefile head/x11-wm/i3/Makefile (contents, props changed) head/x11-wm/lxsession/Makefile head/x11-wm/pekwm/Makefile (contents, props changed) head/x11-wm/wmii/Makefile (contents, props changed) head/x11/eterm/Makefile head/x11/florence/Makefile head/x11/gdkxft/Makefile (contents, props changed) head/x11/ggiterm/Makefile (contents, props changed) head/x11/i3lock/Makefile (contents, props changed) head/x11/kde4-workspace/Makefile head/x11/trayer/Makefile head/x11/x3270/Makefile (contents, props changed) head/x11/xfree86_xkb_xml/Makefile head/x11/xkeyboard-config/Makefile head/x11/xnee/Makefile Modified: head/news/newsstar/Makefile ============================================================================== --- head/news/newsstar/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/news/newsstar/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -17,7 +17,7 @@ BUILD_DEPENDS= xmlto:${PORTSDIR}/textpro USE_PERL5= yes GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= SSL Modified: head/news/slrn/Makefile ============================================================================== --- head/news/slrn/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/news/slrn/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -15,7 +15,7 @@ LIB_DEPENDS= slang:${PORTSDIR}/devel/lib CONFLICTS_INSTALL= ja-slrn-[0-9]* USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-ipv6 --disable-inews --with-slrnpull \ Modified: head/news/tin/Makefile ============================================================================== --- head/news/tin/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/news/tin/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -31,7 +31,7 @@ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes TIN_EDITOR?= /usr/bin/ee TIN_SCREEN?= ncursesw Modified: head/palm/pilot-link/Makefile ============================================================================== --- head/palm/pilot-link/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/pilot-link/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -13,9 +13,8 @@ COMMENT= Suite of tools used to connect BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -USES= pathfix pkgconfig +USES= pathfix pkgconfig iconv USE_BZIP2= yes -USE_ICONV= yes GNU_CONFIGURE= yes CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libiconv=${LOCALBASE} --with-included-popt --enable-conduits --enable-xsltproc Modified: head/palm/synce-hal/Makefile ============================================================================== --- head/palm/synce-hal/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/synce-hal/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,7 +21,7 @@ LIB_DEPENDS= synce.0:${PORTSDIR}/palm/sy dbus-1.3:${PORTSDIR}/devel/dbus \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_ICONV= yes +USES= iconv USE_PYTHON_RUN= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-hal-addon-dir=${PREFIX}/libexec \ Modified: head/palm/synce-librapi2/Makefile ============================================================================== --- head/palm/synce-librapi2/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/synce-librapi2/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -19,8 +19,7 @@ CONFLICTS= popular-[0-9]* GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool -USE_ICONV= yes -USES= pathfix +USES= pathfix iconv USE_LDCONFIG= yes CONFIGURE_ARGS= --with-libiconv="${LOCALBASE}" \ --with-libsynce="${LOCALBASE}" Modified: head/palm/synce-librra/Makefile ============================================================================== --- head/palm/synce-librra/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/synce-librra/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -23,9 +23,8 @@ OPTIONS?= TOOLS "Build with minor rra co GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool -USE_ICONV= yes USE_LDCONFIG= yes -USES= pathfix +USES= pathfix iconv CONFIGURE_ARGS+= --with-libsynce="${LOCALBASE}" \ --with-libmimedir="${LOCALBASE}" Modified: head/palm/synce-libsynce/Makefile ============================================================================== --- head/palm/synce-libsynce/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/synce-libsynce/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -18,8 +18,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/d GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool -USE_ICONV= yes -USES= pathfix +USES= pathfix iconv CONFIGURE_ARGS+= --with-libiconv-prefix="${LOCALBASE}" \ --enable-dccm-file-support=no \ --enable-hal-support=yes \ Modified: head/palm/synce-vdccm/Makefile ============================================================================== --- head/palm/synce-vdccm/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/palm/synce-vdccm/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes WANT_GNOME= yes -USE_ICONV= yes +USES= iconv CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \ --with-libsynce=${LOCALBASE} Modified: head/polish/ekg2/Makefile ============================================================================== --- head/polish/ekg2/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/polish/ekg2/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,8 +21,7 @@ LICENSE= GPLv2 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv MAKE_JOBS_SAFE= yes CONFIGURE_ARGS+= --enable-shared \ Modified: head/polish/kadu/Makefile ============================================================================== --- head/polish/kadu/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/polish/kadu/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -44,8 +44,7 @@ GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.t GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz USE_BZIP2= yes -USES= cmake pkgconfig gettext -USE_ICONV= yes +USES= cmake pkgconfig gettext iconv USE_XORG= ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON # Setting KADU_VERSION disables git invocation Modified: head/polish/qnapi/Makefile ============================================================================== --- head/polish/qnapi/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/polish/qnapi/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,8 +21,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_XORG= ice sm x11 xau xdmcp xext xrender USE_QT4= corelib gui network xml qmake_build moc_build uic_build rcc_build USE_KDE4= kdehier Modified: head/ports-mgmt/gnome-packagekit/Makefile ============================================================================== --- head/ports-mgmt/gnome-packagekit/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/ports-mgmt/gnome-packagekit/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -24,10 +24,9 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/dev USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomemenus gnomedocutils \ +USE_GNOME= gnomeprefix intlhack gconf2 gnomemenus gnomedocutils \ desktopfileutils -USES= gettext -USE_ICONV= yes +USES= gettext pathfix iconv USE_PYTHON_BUILD=2.5+ GCONF_SCHEMAS= gnome-packagekit.schemas INSTALLS_ICONS= yes Modified: head/ports-mgmt/packagekit/Makefile ============================================================================== --- head/ports-mgmt/packagekit/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/ports-mgmt/packagekit/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,10 +22,9 @@ RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/l ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_GMAKE= yes -USES= gettext +USES= gettext iconv USE_GNOME= glib20 intltool gnomehier USE_SQLITE= 3 -USE_ICONV= yes USE_LDCONFIG= yes USE_PYTHON_BUILD= 2.5+ GNU_CONFIGURE= yes Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/cups-base/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -83,7 +83,7 @@ XDG_OPEN= Build with XDG_OPEN as browse COMMENT2= Library cups INSTALL_WRKSRC= ${WRKSRC}/cups PLIST= ${MASTERDIR}/pkg-plist.client -USE_ICONV= yes +USES+= iconv USE_LDCONFIG= yes PKGMESSAGE= ${NONEXISTENT} DESCR= ${MASTERDIR}/pkg-descr.client Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/fontforge/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -34,10 +34,9 @@ DISTFILES+= ${DOCFILES:C/$/:docs/} .endif USE_BZIP2= yes -USES= gettext +USES= gettext iconv USE_XORG= x11 xi ice xkbui USE_GMAKE= yes -USE_ICONV= yes PATCH_STRIP= -l .if !defined(FONTFORGE_NO_MULTILAYER) Modified: head/print/gv/Makefile ============================================================================== --- head/print/gv/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/gv/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -15,7 +15,7 @@ LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolk USE_XORG= xpm ice sm xext xmu x11 USE_GHOSTSCRIPT= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_PERL5_BUILD= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/print/openprinting/Makefile ============================================================================== --- head/print/openprinting/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/openprinting/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,8 +22,7 @@ WRKSRC= ${WRKDIR}/papi-${PORTVERSION}_b USE_BZIP2= yes USE_GMAKE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/pdftk/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -18,7 +18,7 @@ CSUFF= ${_USE_GCC:S/.//} USE_GCC= 4.6+ USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_LDCONFIG= ${PREFIX}/lib/gcc${CSUFF} # gcj/libgcj don't exist on some platforms Modified: head/print/py-cups/Makefile ============================================================================== --- head/print/py-cups/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/py-cups/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -16,7 +16,7 @@ LIB_DEPENDS= cups:${PORTSDIR}/print/cups CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_PYDISTUTILS= yes USE_PYTHON= -2.7 Modified: head/print/wprint/Makefile ============================================================================== --- head/print/wprint/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/print/wprint/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 -USE_ICONV= yes +USES= iconv USE_PERL5= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Modified: head/russian/mueller-dic/Makefile ============================================================================== --- head/russian/mueller-dic/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/russian/mueller-dic/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Mueller English-Russian dictionary USE_GMAKE= yes -USE_ICONV= yes +USES= iconv SUB_FILES= mueller WRKSRC= ${WRKDIR}/mf Modified: head/science/afni/Makefile ============================================================================== --- head/science/afni/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/afni/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -40,9 +40,8 @@ BROKEN= Does not compile on sparc64: "un USE_GL= glw glu USE_XORG= xi -USE_GETTEXT= yes USE_GMAKE= yes -USE_ICONV= yes +USES= gettext iconv USE_MOTIF= yes MAKE_ENV= CC="${CC}" MAKE_JOBS_UNSAFE=yes Modified: head/science/ecs/Makefile ============================================================================== --- head/science/ecs/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/ecs/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -44,8 +44,7 @@ CONFIGURE_ARGS+=--without-adf --without- CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv PLIST_SUB+= NLS="" .endif Modified: head/science/linsmith/Makefile ============================================================================== --- head/science/linsmith/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/linsmith/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -13,8 +13,7 @@ COMMENT= Smith charting program LICENSE= GPLv2 # (or later) USE_GNOME= libgnomeui libxml2 -USE_ICONV= yes -USES= gettext +USES= gettext iconv GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Modified: head/science/massxpert/Makefile ============================================================================== --- head/science/massxpert/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/massxpert/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,8 +21,7 @@ LICENSE= GPLv3 USE_GCC= any USE_BZIP2= yes -USES= cmake gettext -USE_ICONV= yes +USES= cmake gettext iconv USE_XORG= ice sm x11 xau xdmcp xext xrender USE_GNOME= glib20 USE_QT4= corelib gui xml rcc_build qmake_build uic_build moc_build \ Modified: head/science/meep/Makefile ============================================================================== --- head/science/meep/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/meep/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -23,8 +23,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_FORTRAN= yes USE_GCC= 4.6+ -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_AUTOTOOLS+= libltdl CPPFLAGS+= -I${LOCALBASE}/include LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib Modified: head/science/ncs/Makefile ============================================================================== --- head/science/ncs/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/science/ncs/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -29,8 +29,7 @@ RUN_DEPENDS= xmgrace:${PORTSDIR}/math/gr USE_ZIP= yes USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_GNOME= libxml2 USE_PYTHON= yes USE_QT_VER= 4 Modified: head/security/bsp_upektfmess/Makefile ============================================================================== --- head/security/bsp_upektfmess/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/bsp_upektfmess/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,8 +20,7 @@ PLIST_FILES= lib/libtfmessbsp.so USE_ZIP= yes USE_LDCONFIG= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv # Maintainer note # Both the gui and the non-gui object are linked to libX11 USE_XORG= x11 xext Modified: head/security/clamav-devel/Makefile ============================================================================== --- head/security/clamav-devel/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/clamav-devel/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -138,7 +138,7 @@ CONFIGURE_ARGS+=--disable-unrar .endif .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+=--with-iconv -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+=--without-iconv .endif Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/clamav/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -133,7 +133,7 @@ CONFIGURE_ARGS+=--disable-unrar .endif .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+=--with-iconv -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+=--without-iconv .endif Modified: head/security/dirmngr/Makefile ============================================================================== --- head/security/dirmngr/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/dirmngr/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,7 +21,7 @@ LIB_DEPENDS= assuan.0:${PORTSDIR}/securi pth:${PORTSDIR}/devel/pth USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_OPENLDAP= yes GNU_CONFIGURE= yes USE_GMAKE= yes Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/gnupg/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -26,7 +26,7 @@ LIB_DEPENDS= assuan:${PORTSDIR}/security USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES -USE_ICONV= YES +USES= iconv USE_LDCONFIG= YES CONFIGURE_ARGS+= --enable-symcryptrun .if defined(NOPORTDOCS) Modified: head/security/gnupg1/Makefile ============================================================================== --- head/security/gnupg1/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/gnupg1/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -45,7 +45,7 @@ CFLAGS:= ${CFLAGS:S/$/ -fheinous-gnu-ext .endif .if defined(WITH_LIBICONV) -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+= --without-libiconv-prefix .endif Modified: head/security/gnutls-devel/Makefile ============================================================================== --- head/security/gnutls-devel/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/gnutls-devel/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -23,7 +23,7 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/sec CONFLICTS= gnutls-[0-9]* USE_XZ= yes -USE_ICONV= yes +USES= iconv USE_GNOME= pkgconfig ltverhack GNU_CONFIGURE= yes USE_LDCONFIG= yes Modified: head/security/gnutls/Makefile ============================================================================== --- head/security/gnutls/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/gnutls/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -17,10 +17,9 @@ LIB_DEPENDS= nettle:${PORTSDIR}/security CONFLICTS= gnutls-devel-[0-9]* -USES= pkgconfig +USES= pathfix pkgconfig iconv USE_BZIP2= yes -USE_ICONV= yes -USE_GNOME= ltverhack gnomehack +USE_GNOME= ltverhack GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes Modified: head/security/ipsec-tools/Makefile ============================================================================== --- head/security/ipsec-tools/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/ipsec-tools/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -121,7 +121,7 @@ CONFIGURE_ARGS+= --without-libpam .endif .if ${PORT_OPTIONS:MGSSAPI} -USE_ICONV= yes +USES+= iconv CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-gssapi Modified: head/security/libgpg-error/Makefile ============================================================================== --- head/security/libgpg-error/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/libgpg-error/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,8 +20,7 @@ MAKE_JOBS_UNSAFE= yes .include .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} PLIST_SUB= NLS="" Modified: head/security/libprelude/Makefile ============================================================================== --- head/security/libprelude/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/libprelude/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -24,8 +24,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --enable-gtk-doc=no \ --with-html-dir=${PREFIX}/share/doc USE_GMAKE= yes -USE_ICONV= yes -USES= pathfix pkgconfig gettext +USES= pathfix pkgconfig gettext iconv USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes Modified: head/security/libpreludedb/Makefile ============================================================================== --- head/security/libpreludedb/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/libpreludedb/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,8 +21,7 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ USE_GMAKE= yes USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv CONFIGURE_ARGS= --enable-gtk-doc=no USE_LDCONFIG= yes Modified: head/security/openvas-libnasl/Makefile ============================================================================== --- head/security/openvas-libnasl/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/openvas-libnasl/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,8 +20,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/secur GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_ICONV= yes -USES= bison +USES= bison iconv MAN1= openvas-libnasl-config.1 openvas-nasl.1 Modified: head/security/pam_krb5-rh/Makefile ============================================================================== --- head/security/pam_krb5-rh/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/pam_krb5-rh/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,7 +20,7 @@ LICENSE_COMB= dual CONFLICTS= pam_krb5-4.* -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} --without-afs \ --with-libintl-prefix=${LOCALBASE} --with-krb4=no \ Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/pinentry/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -16,7 +16,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/secur CONFLICTS_INSTALL?= pinentry-[a-z]*-[0.9]* -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_GMAKE= yes INFO= pinentry Modified: head/security/prelude-lml/Makefile ============================================================================== --- head/security/prelude-lml/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/prelude-lml/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -25,8 +25,7 @@ USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes USE_RC_SUBR= prelude-lml CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc -USES= pkgconfig gettext -USE_ICONV= yes +USES= pkgconfig gettext iconv OPTIONS_DEFINE= FAM Modified: head/security/prelude-manager/Makefile ============================================================================== --- head/security/prelude-manager/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/prelude-manager/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -19,11 +19,10 @@ LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ nettle:${PORTSDIR}/security/nettle \ p11-kit:${PORTSDIR}/security/p11-kit -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GMAKE= yes USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -USE_ICONV= yes USE_LDCONFIG= yes USE_RC_SUBR= prelude-manager Modified: head/security/rifiuti2/Makefile ============================================================================== --- head/security/rifiuti2/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/rifiuti2/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,8 +14,7 @@ LICENSE= BSD LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes -USES= pkgconfig gettext -USE_ICONV= yes +USES= pkgconfig gettext iconv USE_GNOME= glib20 CPPFLAGS+= -I${LOCALBASE}/include Modified: head/security/scanhill/Makefile ============================================================================== --- head/security/scanhill/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/scanhill/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -13,7 +13,7 @@ COMMENT= Microsoft Messenger Protocol Sn WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv MAKE_JOBS_SAFE= yes PORTDOCS= README.txt INSTALL.txt mysql.sql Modified: head/security/shishi/Makefile ============================================================================== --- head/security/shishi/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/shishi/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -16,8 +16,7 @@ LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn USE_AUTOTOOLS= libtool USE_PERL5_BUILD= yes -USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --with-db-dir=/var/shishi Modified: head/security/sssd/Makefile ============================================================================== --- head/security/sssd/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/sssd/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -53,8 +53,7 @@ USE_PYTHON= yes USE_OPENLDAP= yes USE_GMAKE= yes USE_GNOME= pkgconfig -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_PYTHON= yes USE_RC_SUBR= ${PORTNAME} Modified: head/security/tpm-tools/Makefile ============================================================================== --- head/security/tpm-tools/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/tpm-tools/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,8 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/tcsd:${PO RUN_DEPENDS+= ${LOCALBASE}/lib/pkcs11/libopencryptoki.so:${PORTSDIR}/security/opencryptoki USE_GMAKE= YES -USE_ICONV= YES -USES= gettext +USES= gettext iconv USE_LDCONFIG= YES USE_AUTOTOOLS= autoconf GNU_CONFIGURE= YES Modified: head/security/trousers/Makefile ============================================================================== --- head/security/trousers/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/trousers/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -12,10 +12,9 @@ COMMENT= The open-source TCG Software St USE_GCC= any USE_GMAKE= YES -USE_ICONV= YES USE_OPENSSL= YES USE_LDCONFIG= YES -USES= pkgconfig +USES= pkgconfig iconv USE_AUTOTOOLS= autoconf automake libtool GNU_CONFIGURE= YES MAKE_JOBS_SAFE= YES Modified: head/security/truecrypt/Makefile ============================================================================== --- head/security/truecrypt/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/security/truecrypt/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,9 +22,8 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/s WRKSRC= ${WRKDIR}/truecrypt-${PORTVERSION}-source -USES= fuse +USES= fuse iconv USE_GMAKE= yes -USE_ICONV= yes RESTRICTED= Downloading requires acceptance of license agreement NO_CDROM= Distribution requires acceptance of license agreement NO_PACKAGE= Distribution requires acceptance of license agreement Modified: head/shells/bash-devel/Makefile ============================================================================== --- head/shells/bash-devel/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/shells/bash-devel/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -75,8 +75,7 @@ CONFIGURE_ARGS+= --disable-help-builtin CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv PLIST_SUB+= NLS="" .endif Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/shells/bash/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -85,8 +85,7 @@ PLIST_SUB+= HELP="" CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else -USE_ICONV= yes -USE_GETTEXT= yes +USES+= gettext iconv PLIST_SUB+= NLS="" .endif Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/shells/fish/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -11,11 +11,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A user friendly command line shell USE_AUTOTOOLS= autoconf -USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USES= gettext +USES= gettext iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= LIBS="${LDFLAGS}" Modified: head/shells/tcsh_nls/Makefile ============================================================================== --- head/shells/tcsh_nls/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/shells/tcsh_nls/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,7 +14,7 @@ DISTFILES= # none MAINTAINER= ume@FreeBSD.org COMMENT= Misc NLS catalogs for tcsh which requires libiconv -USE_ICONV= yes +USES= iconv NO_BUILD= yes PLIST_FILES= share/nls/de_AT.UTF-8/tcsh.cat \ Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/shells/zsh/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE= yes ZSH_VER= ${PORTVERSION} USE_BZIP2= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_NCURSES= yes Modified: head/sysutils/afflib/Makefile ============================================================================== --- head/sysutils/afflib/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/afflib/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -17,8 +17,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ USE_LDCONFIG= yes USE_OPENSSL= yes -USE_ICONV= yes -USES= fuse pathfix +USES= fuse pathfix iconv USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf Modified: head/sysutils/apt/Makefile ============================================================================== --- head/sysutils/apt/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/apt/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -23,8 +23,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_BDB= 44+ USE_LDCONFIG= yes NO_FILTER_SHLIBS= yes Modified: head/sysutils/archivemount/Makefile ============================================================================== --- head/sysutils/archivemount/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/archivemount/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -15,9 +15,8 @@ MAN1= archivemount.1 GNU_CONFIGURE= yes NO_INSTALL_MANPAGES= yes -USES= fuse pkgconfig +USES= fuse pkgconfig iconv USE_GMAKE= yes -USE_ICONV= yes USE_GCC= 4.2+ .include Modified: head/sysutils/cdrkit/Makefile ============================================================================== --- head/sysutils/cdrkit/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/cdrkit/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,8 +14,7 @@ MASTER_SITES= http://cdrkit.org/releases MAINTAINER= pav@FreeBSD.org COMMENT= Command-line CD/DVD writing suite -USES= cmake -USE_ICONV= yes +USES= cmake iconv MAN1= cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \ isodebug.1 isodump.1 isoinfo.1 isovfy.1 list_audio_tracks.1 \ Modified: head/sysutils/cdrtools-devel/Makefile ============================================================================== --- head/sysutils/cdrtools-devel/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/cdrtools-devel/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -93,8 +93,7 @@ CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc .if exists(${LOCALBASE}/lib/libiconv.a) || \ exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS) MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include -USE_GETTEXT= yes -USE_ICONV= yes +USES+= gettext iconv .endif pre-everything:: Modified: head/sysutils/cdrtools/Makefile ============================================================================== --- head/sysutils/cdrtools/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/cdrtools/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -99,8 +99,7 @@ CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc .if exists(${LOCALBASE}/lib/libiconv.a) || \ exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS) MAKE_ENV+= OSDEFS=-I${LOCALBASE}/include -USE_GETTEXT= yes -USE_ICONV= yes +USES+= gettext iconv .endif pre-everything:: Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/conky/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -13,11 +13,9 @@ COMMENT= An advanced, highly configurabl CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome -USES= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv USE_BZIP2= yes GNU_CONFIGURE= yes -USE_ICONV= yes USE_GMAKE= yes CONFIGURE_ARGS+= --disable-portmon \ --disable-hddtemp \ Modified: head/sysutils/dc3dd/Makefile ============================================================================== --- head/sysutils/dc3dd/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/dc3dd/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,8 +14,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= A dd program useful for computer forensics USE_BZIP2= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${LIBS} -L${LOCALBASE}/lib" Modified: head/sysutils/fusefs-exfat/Makefile ============================================================================== --- head/sysutils/fusefs-exfat/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/fusefs-exfat/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -15,8 +15,7 @@ LICENSE= GPLv3 LIB_DEPENDS= ublio:${PORTSDIR}/devel/libublio -USES= fuse -USE_ICONV= yes +USES= fuse iconv USE_SCONS= yes MAN8= mount.exfat-fuse.8 Modified: head/sysutils/fusefs-fur/Makefile ============================================================================== --- head/sysutils/fusefs-fur/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/fusefs-fur/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -20,9 +20,8 @@ VCHMOD_DESC= Fake hook for chmod that ju MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes -USES= fuse pkgconfig +USES= fuse pkgconfig iconv USE_GMAKE= yes -USE_ICONV= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -DFUSE_USE_VERSION=26 Modified: head/sysutils/fusefs-fusexmp_fh/Makefile ============================================================================== --- head/sysutils/fusefs-fusexmp_fh/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/fusefs-fusexmp_fh/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,9 +14,8 @@ COMMENT= Dummy driver from fusefs-libs e USE_AUTOTOOLS= libtool -USES= fuse pathfix +USES= fuse pathfix iconv USE_LDCONFIG= yes -USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-kernel-module --prefix=${PREFIX} \ --enable-example Modified: head/sysutils/fusefs-libs/Makefile ============================================================================== --- head/sysutils/fusefs-libs/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/fusefs-libs/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,8 +14,7 @@ COMMENT= FUSE allows filesystem implemen GNU_CONFIGURE= yes CONFIGURE_ENV= MOUNT_FUSE_PATH=${PREFIX}/sbin USE_LDCONFIG= yes -USES= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv CONFIGURE_ARGS= --prefix=${PREFIX} \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig TXT_DOCS= how-fuse-works \ Modified: head/sysutils/fusefs-ntfs/Makefile ============================================================================== --- head/sysutils/fusefs-ntfs/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/fusefs-ntfs/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -16,10 +16,9 @@ LICENSE= GPLv2 CONFLICTS_BUILD= bonobo-1.* CONFLICTS_INSTALL= ntfsprogs-* -USES= fuse pkgconfig +USES= fuse pkgconfig iconv USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_ICONV= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ --disable-mtab --with-fuse=external CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include Modified: head/sysutils/geomgui/Makefile ============================================================================== --- head/sysutils/geomgui/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/geomgui/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,7 +22,7 @@ BROKEN= does not build USE_AUTOTOOLS= libtool USE_GNOME= gtk20 librsvg2 -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes MAN1= geomgui.1 Modified: head/sysutils/gsmartcontrol/Makefile ============================================================================== --- head/sysutils/gsmartcontrol/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/gsmartcontrol/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -28,9 +28,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bas smartctl:${PORTSDIR}/sysutils/smartmontools USE_AUTOTOOLS= libtool -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_BZIP2= yes -USE_ICONV= yes USE_GNOME= gtk20 USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ xi xinerama xrandr xrender Modified: head/sysutils/gtk-imonc/Makefile ============================================================================== --- head/sysutils/gtk-imonc/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/gtk-imonc/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d xcb:${PORTSDIR}/x11/libxcb GNU_CONFIGURE= yes -USE_ICONV= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender Modified: head/sysutils/jfbterm/Makefile ============================================================================== --- head/sysutils/jfbterm/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/jfbterm/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -62,7 +62,7 @@ MAKE_ENV+= WITHOUT_ICONV= .if !exists(/usr/include/iconv.h) . if ${PORT_OPTIONS:MICONV} . if !defined(NO_SHARED) -USE_ICONV= yes +USES+= iconv . else BUILD_DEPENDS+= ${LOCALBASE}/lib/libiconv.a:${PORTSDIR}/converters/libiconv . endif Modified: head/sysutils/kiconvtool/Makefile ============================================================================== --- head/sysutils/kiconvtool/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/kiconvtool/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -14,7 +14,7 @@ MASTER_SITES= http://mirror.amdmi3.ru/di MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tool to preload kernel iconv charset tables -USE_ICONV= yes # used by libkiconv, actually +USES= iconv # used by libkiconv, actually PLIST_FILES= sbin/kiconvtool etc/rc.d/kiconv Modified: head/sysutils/ldapvi/Makefile ============================================================================== --- head/sysutils/ldapvi/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/ldapvi/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -21,8 +21,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= popt:${PORTSDIR}/devel/popt USE_OPENLDAP= yes -USE_GNOME= pkgconfig glib20 -USE_ICONV= yes +USE_GNOME= glib20 +USES= pkgconfig iconv GNU_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile Modified: head/sysutils/libcdio/Makefile ============================================================================== --- head/sysutils/libcdio/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/libcdio/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -22,9 +22,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USE_GNOME= pkgconfig gnomehack +USES= pathfix pkgconfig iconv USE_GMAKE= yes -USE_ICONV= yes USE_LDCONFIG= yes USE_NCURSES= yes CONFIGURE_ARGS+= --with-libpopt-prefix=${LOCALBASE} \ Modified: head/sysutils/lxinput/Makefile ============================================================================== --- head/sysutils/lxinput/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/lxinput/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -16,7 +16,7 @@ COMMENT= A keyboard and mouse config too USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} Modified: head/sysutils/lxtask/Makefile ============================================================================== --- head/sysutils/lxtask/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/lxtask/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -12,7 +12,7 @@ COMMENT= Lightweight desktop-independent USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes Modified: head/sysutils/lxterminal/Makefile ============================================================================== --- head/sysutils/lxterminal/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/lxterminal/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -18,7 +18,7 @@ LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolk USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} Modified: head/sysutils/nitrogen/Makefile ============================================================================== --- head/sysutils/nitrogen/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/nitrogen/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -33,8 +33,7 @@ RUN_DEPENDS= gnome-icon-theme>0:${PORTSD OPTIONS_DEFINE= XINERAMA OPTIONS_DEFAULT=XINERAMA -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_GNOME= gtk20 USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ xrandr xrender Modified: head/sysutils/pfstat/Makefile ============================================================================== --- head/sysutils/pfstat/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/pfstat/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -18,7 +18,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/g MAKE_ARGS= "LD_GD=gd" MAKE_ENV+= __MAKE_CONF=/dev/null -USE_ICONV= yes +USES= iconv USE_RC_SUBR= pfstatd MAN8= pfstat.8 \ Modified: head/sysutils/quicksynergy/Makefile ============================================================================== --- head/sysutils/quicksynergy/Makefile Sat Apr 27 18:19:58 2013 (r316682) +++ head/sysutils/quicksynergy/Makefile Sat Apr 27 18:25:24 2013 (r316683) @@ -13,8 +13,7 @@ COMMENT= A graphical interface for easil BUILD_DEPENDS= synergys:${PORTSDIR}/sysutils/synergy GNU_CONFIGURE= yes -USE_ICONV= yes -USES= pathfix pkgconfig gettext +USES= pathfix pkgconfig gettext iconv USE_GNOME= gnomeprefix libglade2 CPPFLAGS+= -I${LOCALBASE}/include Modified: head/sysutils/shmcat/Makefile ============================================================================== --- head/sysutils/shmcat/Makefile Sat Apr 27 18:19:58 2013 (r316682) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***