diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2013-04-27 18:25:24 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2013-04-27 18:25:24 +0000 |
| commit | 95e70819761ed898d6a4ea9874d4bd43a5491f3e (patch) | |
| tree | 05c37dd385b99b953046290a1ad749042e2d1c51 | |
| parent | 284101cc39e019e4530f6878d10381ed2e68a3d5 (diff) | |
| download | ports-95e70819761ed898d6a4ea9874d4bd43a5491f3e.tar.gz ports-95e70819761ed898d6a4ea9874d4bd43a5491f3e.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=316683
181 files changed, 187 insertions, 273 deletions
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile index 9536a2b234c4..99b90cdfc8db 100644 --- a/news/newsstar/Makefile +++ b/news/newsstar/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ USE_PERL5= yes GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv MAKE_JOBS_SAFE= yes OPTIONS_DEFINE= SSL diff --git a/news/slrn/Makefile b/news/slrn/Makefile index 283fead6a365..15747edb5644 100644 --- a/news/slrn/Makefile +++ b/news/slrn/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang2 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 \ diff --git a/news/tin/Makefile b/news/tin/Makefile index ec65d8c86faf..43484c62b34d 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes TIN_EDITOR?= /usr/bin/ee TIN_SCREEN?= ncursesw diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index 0a3e220ac0e0..2226c7d3154b 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -13,9 +13,8 @@ COMMENT= Suite of tools used to connect and sync your Palm handled 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 diff --git a/palm/synce-hal/Makefile b/palm/synce-hal/Makefile index 563dbcc68eb0..5ba39b7dd53c 100644 --- a/palm/synce-hal/Makefile +++ b/palm/synce-hal/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= synce.0:${PORTSDIR}/palm/synce-libsynce \ 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 \ diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile index a52fdfb483cf..51e3da440722 100644 --- a/palm/synce-librapi2/Makefile +++ b/palm/synce-librapi2/Makefile @@ -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}" diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile index 53719ed552a2..349655823c5e 100644 --- a/palm/synce-librra/Makefile +++ b/palm/synce-librra/Makefile @@ -23,9 +23,8 @@ OPTIONS?= TOOLS "Build with minor rra command line tools" on \ 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}" diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile index 5a295d43ae61..52c32a24a222 100644 --- a/palm/synce-libsynce/Makefile +++ b/palm/synce-libsynce/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ 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 \ diff --git a/palm/synce-vdccm/Makefile b/palm/synce-vdccm/Makefile index 48f12beed7dd..9ef41c3d8a3d 100644 --- a/palm/synce-vdccm/Makefile +++ b/palm/synce-vdccm/Makefile @@ -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} diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile index 13b51b0b84d2..e76e796cb791 100644 --- a/polish/ekg2/Makefile +++ b/polish/ekg2/Makefile @@ -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 \ diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index 281f92bf0f64..93b63c1a7f62 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -44,8 +44,7 @@ GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz 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 diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 69a381fc4e93..99ff9d4e7d03 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -21,8 +21,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile index 7c2ac9b4ad7a..c0623772e42e 100644 --- a/ports-mgmt/gnome-packagekit/Makefile +++ b/ports-mgmt/gnome-packagekit/Makefile @@ -24,10 +24,9 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ 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 diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index a273fb72e0e1..c72515d17b5d 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -22,10 +22,9 @@ RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ ${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 diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 4d83290b607e..836ccf2281ec 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -83,7 +83,7 @@ XDG_OPEN= Build with XDG_OPEN as browser 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 diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index eb7588c5bf4b..ebb4aa607724 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -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) diff --git a/print/gv/Makefile b/print/gv/Makefile index e02e01c613c1..7d16e9173392 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d 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 diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile index d12b6a55d764..337df19ba410 100644 --- a/print/openprinting/Makefile +++ b/print/openprinting/Makefile @@ -22,8 +22,7 @@ WRKSRC= ${WRKDIR}/papi-${PORTVERSION}_beta USE_BZIP2= yes USE_GMAKE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile index e6b3005a631b..524f0e023d7f 100644 --- a/print/pdftk/Makefile +++ b/print/pdftk/Makefile @@ -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 diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile index dd6e7b01e130..9bc34e4975f6 100644 --- a/print/py-cups/Makefile +++ b/print/py-cups/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_PYDISTUTILS= yes USE_PYTHON= -2.7 diff --git a/print/wprint/Makefile b/print/wprint/Makefile index 3960f2c568e2..a9e4ee229599 100644 --- a/print/wprint/Makefile +++ b/print/wprint/Makefile @@ -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 diff --git a/russian/mueller-dic/Makefile b/russian/mueller-dic/Makefile index 4a996dc9e291..bbbb6e9d41f1 100644 --- a/russian/mueller-dic/Makefile +++ b/russian/mueller-dic/Makefile @@ -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 diff --git a/science/afni/Makefile b/science/afni/Makefile index d1c21bc6b309..1343a5ef859c 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -40,9 +40,8 @@ BROKEN= Does not compile on sparc64: "undefined reference to '_mcount'" 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 diff --git a/science/ecs/Makefile b/science/ecs/Makefile index a877a207f211..e0329ab199c6 100644 --- a/science/ecs/Makefile +++ b/science/ecs/Makefile @@ -44,8 +44,7 @@ CONFIGURE_ARGS+=--without-adf --without-ccm CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv PLIST_SUB+= NLS="" .endif diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile index 9a73e496bfae..5ee5b83d20be 100644 --- a/science/linsmith/Makefile +++ b/science/linsmith/Makefile @@ -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 diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile index ac8e09377f05..3b9d69b66220 100644 --- a/science/massxpert/Makefile +++ b/science/massxpert/Makefile @@ -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 \ diff --git a/science/meep/Makefile b/science/meep/Makefile index 330e30e63aa5..10d663f907d0 100644 --- a/science/meep/Makefile +++ b/science/meep/Makefile @@ -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 diff --git a/science/ncs/Makefile b/science/ncs/Makefile index 0dba40fe710b..c3124031ebd5 100644 --- a/science/ncs/Makefile +++ b/science/ncs/Makefile @@ -29,8 +29,7 @@ RUN_DEPENDS= xmgrace:${PORTSDIR}/math/grace \ USE_ZIP= yes USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_GNOME= libxml2 USE_PYTHON= yes USE_QT_VER= 4 diff --git a/security/bsp_upektfmess/Makefile b/security/bsp_upektfmess/Makefile index 1e6b7add75b5..f168d6ea34e5 100644 --- a/security/bsp_upektfmess/Makefile +++ b/security/bsp_upektfmess/Makefile @@ -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 diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index e4ee9ed0e1cc..178c04bb26b2 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -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 diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 181f8e98fdac..201875f9828e 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -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 diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 1a73889e4d95..8ab7df899c3b 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \ pth:${PORTSDIR}/devel/pth USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_OPENLDAP= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index e8e746a3153c..14144f613bb9 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= assuan:${PORTSDIR}/security/libassuan \ USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES -USE_ICONV= YES +USES= iconv USE_LDCONFIG= YES CONFIGURE_ARGS+= --enable-symcryptrun .if defined(NOPORTDOCS) diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index d88d489003c1..828ce2806e28 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -45,7 +45,7 @@ CFLAGS:= ${CFLAGS:S/$/ -fheinous-gnu-extensions/} .endif .if defined(WITH_LIBICONV) -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+= --without-libiconv-prefix .endif diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile index 6b8ba64a2e12..158ea23b4d98 100644 --- a/security/gnutls-devel/Makefile +++ b/security/gnutls-devel/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error \ CONFLICTS= gnutls-[0-9]* USE_XZ= yes -USE_ICONV= yes +USES= iconv USE_GNOME= pkgconfig ltverhack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index b73aacb532b0..678838f2bb83 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -17,10 +17,9 @@ LIB_DEPENDS= nettle:${PORTSDIR}/security/nettle \ 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 diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 832a95737c05..c5ff3852ecf3 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -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 diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 7f9f9f75335e..95abfa45102f 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -20,8 +20,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.options.mk> .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="" diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index dc3c17db3b74..f234b0d96d0e 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -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 diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index 4d51458cf060..a8437fef1cc9 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -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 diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile index 7750411d30e4..c3a40c9a67e9 100644 --- a/security/openvas-libnasl/Makefile +++ b/security/openvas-libnasl/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_ICONV= yes -USES= bison +USES= bison iconv MAN1= openvas-libnasl-config.1 openvas-nasl.1 diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile index 17415f7d7075..0865f7a4c70e 100644 --- a/security/pam_krb5-rh/Makefile +++ b/security/pam_krb5-rh/Makefile @@ -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 \ diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 6d6c3b09e902..dc43dc04f088 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \ CONFLICTS_INSTALL?= pinentry-[a-z]*-[0.9]* -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_GMAKE= yes INFO= pinentry diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index a36d718f03f1..5e3bbe6b9cf8 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -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 diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 6b322cc2b4f6..b459a071e4eb 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -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 diff --git a/security/rifiuti2/Makefile b/security/rifiuti2/Makefile index 3188e5690d98..9faad1ece14b 100644 --- a/security/rifiuti2/Makefile +++ b/security/rifiuti2/Makefile @@ -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 diff --git a/security/scanhill/Makefile b/security/scanhill/Makefile index f475e7a198d5..55d6a28ef825 100644 --- a/security/scanhill/Makefile +++ b/security/scanhill/Makefile @@ -13,7 +13,7 @@ COMMENT= Microsoft Messenger Protocol Sniffer WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv MAKE_JOBS_SAFE= yes PORTDOCS= README.txt INSTALL.txt mysql.sql diff --git a/security/shishi/Makefile b/security/shishi/Makefile index 86e59cde951c..7e0199676f9f 100644 --- a/security/shishi/Makefile +++ b/security/shishi/Makefile @@ -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 diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 2714f88ed35a..e032cc72a347 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -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} diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile index fee37ba49af6..93b7b8657f66 100644 --- a/security/tpm-tools/Makefile +++ b/security/tpm-tools/Makefile @@ -20,8 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers 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 diff --git a/security/trousers/Makefile b/security/trousers/Makefile index 3d8a9fd4b24f..ef7c36e5d094 100644 --- a/security/trousers/Makefile +++ b/security/trousers/Makefile @@ -12,10 +12,9 @@ COMMENT= The open-source TCG Software Stack 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 diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile index a4e4aec09884..a0b035bd28a3 100644 --- a/security/truecrypt/Makefile +++ b/security/truecrypt/Makefile @@ -22,9 +22,8 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo 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 diff --git a/shells/bash-devel/Makefile b/shells/bash-devel/Makefile index 3b67ee7480e8..dac812c9683a 100644 --- a/shells/bash-devel/Makefile +++ b/shells/bash-devel/Makefile @@ -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 diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 94255c16dc29..54dbc0952bfe 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -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 diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 12f175517261..4a76c5d90fc2 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -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}" diff --git a/shells/tcsh_nls/Makefile b/shells/tcsh_nls/Makefile index c4dee4638e22..d6b234a4eb07 100644 --- a/shells/tcsh_nls/Makefile +++ b/shells/tcsh_nls/Makefile @@ -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 \ diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index df9a2b099357..c321cacf3e04 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -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 diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile index c5757822645e..6814e727907f 100644 --- a/sysutils/afflib/Makefile +++ b/sysutils/afflib/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ 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 diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile index 747d28718973..16904e5fafe0 100644 --- a/sysutils/apt/Makefile +++ b/sysutils/apt/Makefile @@ -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 diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile index 858d8e0d61ba..e4bd1254e69f 100644 --- a/sysutils/archivemount/Makefile +++ b/sysutils/archivemount/Makefile @@ -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 <bsd.port.mk> diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index d85b2db49ec2..97679c7819f1 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -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 \ diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile index c4617893e208..7112e1425ba2 100644 --- a/sysutils/cdrtools-devel/Makefile +++ b/sysutils/cdrtools-devel/Makefile @@ -93,8 +93,7 @@ CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-cc .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:: diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 4cead21f8d6f..9f9e4dbfbc9e 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -99,8 +99,7 @@ CDRTLSTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-cc .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:: diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index fbc854c6888c..4115e9497b23 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -13,11 +13,9 @@ COMMENT= An advanced, highly configurable system monitor for X 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 \ diff --git a/sysutils/dc3dd/Makefile b/sysutils/dc3dd/Makefile index ce09ddded6d6..4c5c2c8095b2 100644 --- a/sysutils/dc3dd/Makefile +++ b/sysutils/dc3dd/Makefile @@ -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" diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile index 4746da3b8fd1..436f6580f90b 100644 --- a/sysutils/fusefs-exfat/Makefile +++ b/sysutils/fusefs-exfat/Makefile @@ -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 diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile index 21c1582a9a3d..7a5d0d8bb19e 100644 --- a/sysutils/fusefs-fur/Makefile +++ b/sysutils/fusefs-fur/Makefile @@ -20,9 +20,8 @@ VCHMOD_DESC= Fake hook for chmod that just returns 0 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 diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile index 0ecdb8427ccd..3091eb87eaa2 100644 --- a/sysutils/fusefs-fusexmp_fh/Makefile +++ b/sysutils/fusefs-fusexmp_fh/Makefile @@ -14,9 +14,8 @@ COMMENT= Dummy driver from fusefs-libs example 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 diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile index 4524dc317605..affa322ee453 100644 --- a/sysutils/fusefs-libs/Makefile +++ b/sysutils/fusefs-libs/Makefile @@ -14,8 +14,7 @@ COMMENT= FUSE allows filesystem implementation in userspace 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 \ diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 60f439656f10..1c1e9abb6fda 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -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 diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile index bb6677842e1c..1292fe63d2b7 100644 --- a/sysutils/geomgui/Makefile +++ b/sysutils/geomgui/Makefile @@ -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 diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index 123bf25c1e05..6ed0badfd172 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -28,9 +28,8 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ 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 diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile index 7a81322f724b..a487a97e5055 100644 --- a/sysutils/gtk-imonc/Makefile +++ b/sysutils/gtk-imonc/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile index 88c245723e40..70a1366441b8 100644 --- a/sysutils/jfbterm/Makefile +++ b/sysutils/jfbterm/Makefile @@ -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 diff --git a/sysutils/kiconvtool/Makefile b/sysutils/kiconvtool/Makefile index 5b2952387d49..b4e52183234f 100644 --- a/sysutils/kiconvtool/Makefile +++ b/sysutils/kiconvtool/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ 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 diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile index d4e200737eb1..c057ffeccd7b 100644 --- a/sysutils/ldapvi/Makefile +++ b/sysutils/ldapvi/Makefile @@ -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 diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile index 9f958e418b66..0528ee5047d1 100644 --- a/sysutils/libcdio/Makefile +++ b/sysutils/libcdio/Makefile @@ -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} \ diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile index 81c9aa15f309..5c3c0bb99396 100644 --- a/sysutils/lxinput/Makefile +++ b/sysutils/lxinput/Makefile @@ -16,7 +16,7 @@ COMMENT= A keyboard and mouse config tool from the LXDE project USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile index f8c7a939ff67..3dfc8c071154 100644 --- a/sysutils/lxtask/Makefile +++ b/sysutils/lxtask/Makefile @@ -12,7 +12,7 @@ COMMENT= Lightweight desktop-independent task manager USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile index 4494a41b40eb..a93fee7404ec 100644 --- a/sysutils/lxterminal/Makefile +++ b/sysutils/lxterminal/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile index 84f4117d2f42..39c5c680fe95 100644 --- a/sysutils/nitrogen/Makefile +++ b/sysutils/nitrogen/Makefile @@ -33,8 +33,7 @@ RUN_DEPENDS= gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \ 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 diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile index 5d4c1494adfc..c54cc47fdca6 100644 --- a/sysutils/pfstat/Makefile +++ b/sysutils/pfstat/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd MAKE_ARGS= "LD_GD=gd" MAKE_ENV+= __MAKE_CONF=/dev/null -USE_ICONV= yes +USES= iconv USE_RC_SUBR= pfstatd MAN8= pfstat.8 \ diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile index 59de55db643d..76ae042898ba 100644 --- a/sysutils/quicksynergy/Makefile +++ b/sysutils/quicksynergy/Makefile @@ -13,8 +13,7 @@ COMMENT= A graphical interface for easily configuring Synergy2 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 diff --git a/sysutils/shmcat/Makefile b/sysutils/shmcat/Makefile index 36b331732295..7c3d8ab1726a 100644 --- a/sysutils/shmcat/Makefile +++ b/sysutils/shmcat/Makefile @@ -11,7 +11,7 @@ MAINTAINER= gasol.wu@gmail.com COMMENT= Simple tool that dumps System V shared memory segments USE_BZIP2= yes -USE_ICONV= yes +USEs= iconv GNU_CONFIGURE= yes OPTIONS_DEFINE= NLS diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile index 383a2e545cb9..f7f42267d304 100644 --- a/sysutils/unieject/Makefile +++ b/sysutils/unieject/Makefile @@ -17,9 +17,8 @@ LIB_DEPENDS= confuse:${PORTSDIR}/devel/libconfuse \ cdio:${PORTSDIR}/sysutils/libcdio USE_BZIP2= yes -USES= pathfix pkgconfig gettext +USES= pathfix pkgconfig gettext iconv USE_GNOME= glib20 -USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules \ --disable-doc diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile index c897f1c6741b..fe101d01b67a 100644 --- a/sysutils/xorriso/Makefile +++ b/sysutils/xorriso/Makefile @@ -19,8 +19,7 @@ RUN_DEPENDS= libburn>=1.1.0:${PORTSDIR}/devel/libburn \ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv USE_LDCONFIG= yes WANT_GNOME= yes diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 275fc0fae7ec..b63ebf0b6c9c 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \ --enable-static USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_PERL5_BUILD= yes USE_LDCONFIG= yes diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index 6ca77986fc42..d0963db7fadd 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -16,8 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs -USES= cmake -USE_ICONV= yes +USES= cmake iconv USE_LDCONFIG= yes CMAKE_ARGS= -DBUILD_CONTRIBS_LIB=ON diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile index 0b9f451a5fa9..0528883524dd 100644 --- a/textproc/ctpp2/Makefile +++ b/textproc/ctpp2/Makefile @@ -9,9 +9,8 @@ MASTER_SITES= http://ctpp.havoc.ru/download/ MAINTAINER= reki@reki.ru COMMENT= C++ library to use templates in C/C++ projects, version 2 -USES= cmake gettext +USES= cmake gettext iconv USE_LDCONFIG= yes -USE_ICONV= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile index 106d2efc84de..590c27bec358 100644 --- a/textproc/docbook2X/Makefile +++ b/textproc/docbook2X/Makefile @@ -29,7 +29,7 @@ CONFLICTS= docbook-utils-* GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= yes -USE_ICONV= yes +USES= iconv .if defined(NOPORTDOCS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc__Makefile.in diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile index af2227ac8ff9..e3745356bc88 100644 --- a/textproc/estraier/Makefile +++ b/textproc/estraier/Makefile @@ -22,7 +22,7 @@ CHASEN_DESC= Japanese Morphological Analysis Support MECAB_DESC= Part-of-Speech and Morphological Analyzer KAKASI_DESC= Language processing filter/converter -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sysqdbm \ --enable-dlfilter \ diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index ce459b3806d7..bd59fb72e744 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -17,12 +17,12 @@ COMMENT= A port of Adobe XMP SDK to work on UNIX LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libtool -USE_GNOME= ltverhack gnomehack +USE_GNOME= ltverhack CONFIGURE_ARGS= --enable-unittest=no CONFIGURE_ENV= LIBS="-liconv" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_ICONV= yes +USES= pathfix iconv USE_LDCONFIG= yes post-patch: diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile index eabea8b253fd..9f32ae5f8553 100644 --- a/textproc/flex/Makefile +++ b/textproc/flex/Makefile @@ -23,8 +23,7 @@ INFO= flex .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile index a67d596c5a16..ce0f9caeb6cc 100644 --- a/textproc/freexl/Makefile +++ b/textproc/freexl/Makefile @@ -11,7 +11,7 @@ COMMENT= Library to extract valid data from within an Excel (.xls) spreadsheet GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index 6fea24020a08..8286201e9e10 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -29,8 +29,7 @@ MAN1= gsed.1 .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes -USE_GETTEXT= yes +USES+= gettext iconv PLIST_SUB= NLS="" .else CONFIGURE_ARGS+=--disable-nls diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index c4fef8fd6c77..e5a254127d9a 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -17,8 +17,7 @@ LICENSE_COMB= dual CONFIGURE_ARGS= --disable-nls --with-libiconv-prefix=${LOCALBASE} --with-readline --with-ui GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -USES= pathfix -USE_ICONV= yes +USES= pathfix iconv USE_LDCONFIG= yes USE_NCURSES= yes diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile index f67c7d84cf73..5d39b1a9c0c3 100644 --- a/textproc/hyperestraier/Makefile +++ b/textproc/hyperestraier/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= qdbm>=1.8.77:${PORTSDIR}/databases/qdbm # check configure for min version of qdbm. LIB_DEPENDS= qdbm.14:${PORTSDIR}/databases/qdbm -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-bzip2 --disable-zlib diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 359828e335fa..8d33475f7d49 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir="${PREFIX}/libdata" diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile index 7fcffe0bda4b..05a2b066fd5f 100644 --- a/textproc/kmflcomp/Makefile +++ b/textproc/kmflcomp/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison USE_XORG= x11 USE_LDCONFIG= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile index d14023fe6628..632d8e5216f8 100644 --- a/textproc/liblrdf/Makefile +++ b/textproc/liblrdf/Makefile @@ -20,8 +20,7 @@ USE_AUTOTOOLS= libtoolize automake autoconf aclocal ACLOCAL_ARGS= -I${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing GNU_CONFIGURE= yes -USE_ICONV= yes -USES= pathfix pkgconfig +USES= pathfix pkgconfig iconv USE_GNOME= libxml2 libxslt GNOME_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile index 86b77533a576..d4d77436130d 100644 --- a/textproc/libparsifal/Makefile +++ b/textproc/libparsifal/Makefile @@ -15,7 +15,7 @@ MAINTAINER= yzlin@FreeBSD.org COMMENT= Lightweight XML Parser USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 7c42905d89f7..166708860508 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -19,9 +19,8 @@ COMMENT?= XML parser library for GNOME USE_CSTD= gnu89 USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_ICONV= yes GNU_CONFIGURE= yes -USES= pathfix +USES= pathfix iconv USE_GNOME?= pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \ diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index 9e5bc0dffee5..7bbca7adbf46 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -12,8 +12,7 @@ COMMENT= C++ library to build and query a full text inverted index LICENSE= GPLv3 USE_GCC= any -USES= bison pathfix -USE_ICONV= yes +USES= bison pathfix iconv USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --without-unac USE_LDCONFIG= yes diff --git a/textproc/odt2txt/Makefile b/textproc/odt2txt/Makefile index d173f04d3973..f18dac99c4d1 100644 --- a/textproc/odt2txt/Makefile +++ b/textproc/odt2txt/Makefile @@ -18,7 +18,7 @@ COMMENT= A simple converter from OpenDocument Text to plain text LICENSE= GPLv2 USE_GMAKE= yes -USE_ICONV= yes +USES= iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile index 76dacdeb8105..be6ff5b06108 100644 --- a/textproc/opensp/Makefile +++ b/textproc/opensp/Makefile @@ -16,7 +16,7 @@ COMMENT= This package is a collection of SGML/XML tools called OpenSP USE_GMAKE= yes USE_LDCONFIG= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \ diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile index 75450eebb665..8d28c3a7631a 100644 --- a/textproc/p5-Text-Unaccent/Makefile +++ b/textproc/p5-Text-Unaccent/Makefile @@ -17,7 +17,7 @@ COMMENT= Remove accents from a string MAN3= Text::Unaccent.3 -USE_ICONV= yes +USES= iconv PERL_CONFIGURE= yes CFLAGS+= -DICONV_CONST=const diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile index c9114289caa2..f52d0984d2ef 100644 --- a/textproc/p5-XML-Sablotron/Makefile +++ b/textproc/p5-XML-Sablotron/Makefile @@ -12,7 +12,7 @@ COMMENT= Perl interface to the Sablotron XSLT processor LIB_DEPENDS= sablot.70:${PORTSDIR}/textproc/sablotron -USE_ICONV= yes +USES= iconv PERL_CONFIGURE= yes CONFIGURE_ARGS= LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \ INC='-I${LOCALBASE}/include' \ diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile index a8e05dc64d91..5845f201f333 100644 --- a/textproc/p5-XML-TinyXML/Makefile +++ b/textproc/p5-XML-TinyXML/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= info@rickvanderzwet.nl COMMENT= Little and efficient Perl module to manage xml data -USE_ICONV= yes +USEs= iconv MAKE_ARGS+= LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include' PERL_CONFIGURE= yes diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile index 0471b9711707..c9d57d311276 100644 --- a/textproc/refdb/Makefile +++ b/textproc/refdb/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ dbi.1:${PORTSDIR}/databases/libdbi USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_PERL5= yes HAS_CONFIGURE= yes ALL_TARGET= diff --git a/textproc/ruby-libxml/Makefile b/textproc/ruby-libxml/Makefile index 1282497e8990..5a7bfa500fab 100644 --- a/textproc/ruby-libxml/Makefile +++ b/textproc/ruby-libxml/Makefile @@ -18,7 +18,7 @@ EXPIRATION_DATE= 2013-05-02 LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 USE_RUBY= yes -USE_ICONV= yes +USES= iconv USE_LDCONFIG= ${RUBY_SITEARCHLIBDIR}/xml EXT_ARGS= --with-iconv-dir=${LOCALBASE} \ diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile index dbc0d83436d6..8b188c84df54 100644 --- a/textproc/ruby-sablot/Makefile +++ b/textproc/ruby-sablot/Makefile @@ -18,7 +18,7 @@ EXPIRATION_DATE= 2013-05-02 LIB_DEPENDS= sablot.70:${PORTSDIR}/textproc/sablotron \ expat.6:${PORTSDIR}/textproc/expat2 -USE_ICONV= yes +USES= iconv USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 9b1f781fe40a..50f65a007287 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -30,7 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexpat -liconv USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_PERL5_BUILD= yes diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile index 408253bb491e..c530e8c9f6b0 100644 --- a/textproc/scim-kmfl-imengine/Makefile +++ b/textproc/scim-kmfl-imengine/Makefile @@ -28,8 +28,7 @@ RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp \ USE_XORG= x11 xkbfile xproto USE_AUTOTOOLS= libtool USE_GNOME= glib20 gtk20 intlhack -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile index 6e505c0652e8..891e283d5376 100644 --- a/textproc/scim-openvanilla/Makefile +++ b/textproc/scim-openvanilla/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libltdl WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM USE_GMAKE= yes -USE_ICONV= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv GNU_CONFIGURE= yes CONFIGURE_ENV+= OV_MODULEDIR=${PREFIX}/lib/openvanilla/ CPPFLAGS+= -I${LOCALBASE}/include diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile index 09e954561c81..f97b7f39b46a 100644 --- a/textproc/scim/Makefile +++ b/textproc/scim/Makefile @@ -18,11 +18,10 @@ USE_GNOME= gnomehack gnomehier gtk20 intlhack USE_AUTOTOOLS= libtool USE_GCC= any -USE_ICONV= yes USE_GMAKE= yes USE_XORG= x11 xpm USE_LDCONFIG= yes -USES= gettext +USES= gettext iconv GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index 092e5b544066..b34c548ce3d4 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -11,11 +11,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A text-based utility for work with dictionaries in StarDict's format USE_BZIP2= yes -USE_ICONV= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool USE_GNOME= glib20 -USES= pkgconfig +USES= pkgconfig iconv SUB_FILES= pkg-message .if !defined(WITHOUT_NLS) diff --git a/textproc/simplexml/Makefile b/textproc/simplexml/Makefile index ce4410b223da..4aad9d4f33dc 100644 --- a/textproc/simplexml/Makefile +++ b/textproc/simplexml/Makefile @@ -17,8 +17,7 @@ COMMENT= C++ XML parser library LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USES= cmake -USE_ICONV= yes +USES= cmake iconv USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile index 7b399fbb603d..773f7eea25e1 100644 --- a/textproc/skim/Makefile +++ b/textproc/skim/Makefile @@ -22,7 +22,7 @@ EXPIRATION_DATE= 2013-07-01 USE_KDELIBS_VER=3 USE_PYTHON= yes USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes USE_AUTOTOOLS= libtool PYDISTUTILS_NOEGGINFO= yes diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile index dd5c9edd3f82..f17158fae85b 100644 --- a/textproc/sphinxsearch-devel/Makefile +++ b/textproc/sphinxsearch-devel/Makefile @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-pgsql .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --with-iconv -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+= --without-iconv .endif diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 9d98f9fd1c43..c5e140e367e3 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --without-pgsql .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --with-iconv -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+= --without-iconv .endif diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 4b84937f050e..f9a410f97cfe 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_PERL5_BUILD=yes USE_GNOME= intltool USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_EMACS= yes GNU_CONFIGURE= yes diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile index d0ae1c606a49..a9edaf13ec18 100644 --- a/textproc/uim-qt4/Makefile +++ b/textproc/uim-qt4/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim USE_QT4= qmake_build moc_build qt3support uic USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index d6869fc5e85b..58535126fea7 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -22,8 +22,7 @@ WANT_GNOME= yes USE_GNOME+= glib20 intltool USE_GMAKE= yes USE_AUTOTOOLS= libtool -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_PERL5_BUILD=yes GNU_CONFIGURE= yes diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile index 1636a6894fc4..e8fd6d258749 100644 --- a/textproc/unrtf/Makefile +++ b/textproc/unrtf/Makefile @@ -11,7 +11,7 @@ COMMENT= A converter from RTF to several formats, including HTML and LaTeX LICENSE= GPLv3 -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile index a7115df87219..7e1478b96fc0 100644 --- a/textproc/wv2/Makefile +++ b/textproc/wv2/Makefile @@ -15,9 +15,8 @@ MAINTAINER= fluffy@FreeBSD.org COMMENT= A library providing routines to access Microsoft Word files USE_GNOME= libgsf -USE_ICONV= yes USE_BZIP2= yes -USES= cmake +USES= cmake iconv USE_LDCONFIG= yes post-patch: diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile index 0bdeff1abf78..b821a6c57d1b 100644 --- a/textproc/xalan-c/Makefile +++ b/textproc/xalan-c/Makefile @@ -88,7 +88,7 @@ MAKE_ENV+= XALAN_USE_ICU=1 MAKE_ENV+= ICUROOT=${ICUROOT} PLIST_SUB+= ICUDEP="" .else -USE_ICONV= yes +USES+= iconv LDFLAGS+= -L${LOCALBASE}/lib -liconv PLIST_SUB+= ICUDEP="@comment " .endif diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile index 7fc04422b97a..5127a11fc70e 100644 --- a/textproc/xerces-c2-devel/Makefile +++ b/textproc/xerces-c2-devel/Makefile @@ -37,7 +37,7 @@ TRANSCODER= IconvFBSD .endif .if !defined(TRANSCODER) -USE_ICONV= yes +USES+= iconv TRANSCODER= IconvFBSD ICONVROOT?= ${LOCALBASE} CONFIGURE_ENV+= ICONVROOT=${ICONVROOT} @@ -58,7 +58,7 @@ PKGNAMESUFFIX+= -native PLIST_SUB+= TRANSICONV="" PLIST_SUB+= TRANSICU="@comment " .else -USE_ICONV= yes +USES+= iconv TRANSCODER= IconvFBSD ICONVROOT?= ${LOCALBASE} CONFIGURE_ENV+= ICONVROOT=${ICONVROOT} diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile index d309d233b1b8..85080c1b2801 100644 --- a/textproc/xerces-c2/Makefile +++ b/textproc/xerces-c2/Makefile @@ -39,7 +39,7 @@ PLIST_SUB+= TRANSICU="@comment " .endif .if ${PORT_OPTIONS:MICONVFBSD} -USE_ICONV= yes +USES+= iconv TRANSCODER= IconvFBSD ICONVROOT?= ${LOCALBASE} CONFIGURE_ENV+= ICONVROOT=${ICONVROOT} diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile index 54af8a30c8d5..64fa5c3f8115 100644 --- a/textproc/xmlppm/Makefile +++ b/textproc/xmlppm/Makefile @@ -18,7 +18,7 @@ COMMENT= XML-Conscious PPM Compression LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_ICONV= yes +USES= iconv USE_GMAKE= yes MAKE_ARGS= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile index 16355caa9f7d..62d89d38763e 100644 --- a/textproc/xmlstarlet/Makefile +++ b/textproc/xmlstarlet/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USE_GNOME= libxslt -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libxml-prefix=${LOCALBASE} \ --with-libxslt-prefix=${LOCALBASE} \ diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile index ad6564f7d44c..904b9f8efddb 100644 --- a/textproc/zorba/Makefile +++ b/textproc/zorba/Makefile @@ -29,9 +29,8 @@ OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS CONFLICTS= xqilla-[0-9]* USE_GNOME= libxml2 libxslt -USE_ICONV= yes USE_LDCONFIG= yes -USES= cmake:outsource +USES= cmake:outsource iconv CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" diff --git a/www/anyterm/Makefile b/www/anyterm/Makefile index 7d8661bcd863..6453a945a401 100644 --- a/www/anyterm/Makefile +++ b/www/anyterm/Makefile @@ -20,7 +20,7 @@ MAN1= anytermd.1 USE_RC_SUBR= anytermd USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_GCC= any ALL_TARGET= default_target PLIST_FILES= sbin/anytermd diff --git a/www/apache22/Makefile b/www/apache22/Makefile index f6282369db3d..4023f6379543 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -25,7 +25,7 @@ CONFLICTS_INSTALL= caudium14-1.* \ USE_APACHE= common22 USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_AUTOTOOLS= autoconf libtool USE_PERL5= yes USE_RC_SUBR= apache22 htcacheclean diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 144f83f29b09..007dd172e3ff 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -23,7 +23,7 @@ CONFLICTS_INSTALL= caudium14-1.* \ apache-*-2.2.* apache22-* USE_APACHE= common24 -USE_ICONV= yes +USES= iconv USE_AUTOTOOLS= autoconf libtool USE_PERL5= yes USE_RC_SUBR= apache24 htcacheclean diff --git a/www/awffull/Makefile b/www/awffull/Makefile index f779590d3c91..c66fd58e1b86 100644 --- a/www/awffull/Makefile +++ b/www/awffull/Makefile @@ -23,8 +23,7 @@ FONTLABEL?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf OPTIONS_DEFINE= GEOIP -USE_ICONV= yes -USES= gettext +USES= gettext iconv GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-font-default=${FONTDEFAULT} \ diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 2060fd6c038a..d48948f479ac 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -51,8 +51,7 @@ post-install: .endif .if !defined(WITHOUT_NLS) -USE_ICONV= yes -USES= gettext +USES= gettext iconv CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} LANGS=en@quot es it diff --git a/www/cas/Makefile b/www/cas/Makefile index b9dfe472dc06..cc07cfa3910e 100644 --- a/www/cas/Makefile +++ b/www/cas/Makefile @@ -13,9 +13,8 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ pcre:${PORTSDIR}/devel/pcre \ ctpp2:${PORTSDIR}/textproc/ctpp2 -USES= cmake +USES= cmake iconv USE_LDCONFIG= yes -USE_ICONV= yes WITHOUT_NLS= yes MAKE_JOBS_SAFE= yes diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile index cb5b03df71c6..44458aa9f065 100644 --- a/www/dansguardian-devel/Makefile +++ b/www/dansguardian-devel/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= SCANNERS="@comment " .if ${PORT_OPTIONS:MNTLM} CONFIGURE_ARGS+= --enable-ntlm --with-libiconv=${LOCALBASE} -USE_ICONV= yes +USES+= iconv PLIST_SUB+= NTLMCONF="" .else PLIST_SUB+= NTLMCONF="@comment " diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile index 9c89802e80bf..22a66943f814 100644 --- a/www/dansguardian/Makefile +++ b/www/dansguardian/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= SCANNERS="@comment " .if ${PORT_OPTIONS:MNTLM} CONFIGURE_ARGS+= --enable-ntlm --with-libiconv=${LOCALBASE} -USE_ICONV= yes +USES+= iconv PLIST_SUB+= NTLMCONF="" .else PLIST_SUB+= NTLMCONF="@comment " diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile index 317f7e3560bd..af4bc28e837c 100644 --- a/www/dillo-i18n/Makefile +++ b/www/dillo-i18n/Makefile @@ -33,7 +33,7 @@ I18NVERSION= 20060709 USE_BZIP2= yes USE_GNOME= gtk12 USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/www/elinks/Makefile b/www/elinks/Makefile index e428d08db376..4de52607d229 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -190,7 +190,7 @@ CONFIGURE_ARGS+= --disable-sm-scripting --without-spidermonkey .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} .endif diff --git a/www/flood/Makefile b/www/flood/Makefile index 9b18c7538a2b..b1ff4c5c1854 100644 --- a/www/flood/Makefile +++ b/www/flood/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --disable-shared \ --with-apr-util=${LOCALBASE}/bin/apu-1-config LDFLAGS+= -L${PREFIX}/lib USE_GMAKE= yes -USE_ICONV= yes +USES= iconv EX_SCRIPTS= analyze-relative analyze-relative-ramp EX_DATA= flood.dtd relative-averages-time.awk round-robin-dynamic.xml \ diff --git a/www/gatling/Makefile b/www/gatling/Makefile index c0c7529370c2..f2eca1af6e88 100644 --- a/www/gatling/Makefile +++ b/www/gatling/Makefile @@ -58,7 +58,7 @@ CFLAGS+= -O2 -fomit-frame-pointer .endif .if defined(WITH_GATLING_SMB) -USE_ICONV= yes +USES+= iconv CFLAGS+= -I${LOCALBASE}/include MAKE_ENV+= ICONV=1 .else diff --git a/www/htmlcxx/Makefile b/www/htmlcxx/Makefile index d5da34246762..d7fef6d3d429 100644 --- a/www/htmlcxx/Makefile +++ b/www/htmlcxx/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LGPL_V2 BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/www/httest/Makefile b/www/httest/Makefile index 3008d24f5ce0..07fc42024d83 100644 --- a/www/httest/Makefile +++ b/www/httest/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --enable-lua-module \ CPPFLAGS+= -I${LUA_INCDIR} GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -USE_ICONV= yes +USES= iconv USE_LUA= yes USE_OPENSSL= yes diff --git a/www/httrack/Makefile b/www/httrack/Makefile index 1d171dd31851..8d0827ebd2c7 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -21,7 +21,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} MAN1= htsserver.1 httrack.1 proxytrack.1 webhttrack.1 diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 399d21573c46..239c0a73625f 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -22,7 +22,7 @@ CONFLICTS_INSTALL= lynx-2.8.[0-7].* ja-lynx-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}2-8-8 USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_OPENSSL= yes NO_LATEST_LINK= yes GNU_CONFIGURE= yes diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 675fe98ce257..8303d6bdbc49 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -34,8 +34,7 @@ DEFAULT_COLORS_DESC= Colors support CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS='@comment ' .else -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv CONFIGURE_ARGS+=--enable-nls --with-libiconv-prefix="${LOCALBASE}" PLIST_SUB+= NLS='' .endif diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index 2adb809499ab..8059124adab5 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes #APACHE_VERSION= 1.3.6 USE_APACHE= 22+ -USE_ICONV= yes +USES= iconv HAS_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/rsstool/Makefile b/www/rsstool/Makefile index bc1cf68f1fe9..6161dcb64397 100644 --- a/www/rsstool/Makefile +++ b/www/rsstool/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= BERLIOS MAINTAINER= miwi@FreeBSD.org COMMENT= Read, parse, merge and write RSS and Atom feeds -USE_ICONV= yes +USES= iconv USE_GNOME= libxml2 USE_GMAKE= yes BUILD_WRKSRC= ${WRKSRC}/src diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 3e652ab53441..12a7012daa02 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -70,7 +70,7 @@ CONFIGURE_ARGS+=--without-ldap .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+=--with-iconv -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+=--without-iconv .endif diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile index eb54cc2917e8..320e74bacf58 100644 --- a/www/tntnet/Makefile +++ b/www/tntnet/Makefile @@ -17,7 +17,7 @@ COMMENT= Webapplicationserver for C++ LIB_DEPENDS= cxxtools:${PORTSDIR}/devel/cxxtools BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -USE_ICONV= yes +USES= iconv USE_CSTD= gnu89 PATCH_STRIP= -p1 GNU_CONFIGURE= yes diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index f0d06d3d9a87..a8096377dd0b 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -23,7 +23,7 @@ MAN1= traffic_shell.1 USE_AUTOTOOLS= autoconf automake libtool USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_OPENSSL= yes USE_SQLITE= yes USE_TCL= yes diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 265a27112312..f58d31c470e5 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -124,7 +124,7 @@ EXTRA_PATCHES+= ${FILESDIR}/ja-webalizer.conf-dist.patch .endif .if ${PORT_OPTIONS:MWEBALIZER_CONV} -USE_ICONV=yes +USES+= iconv # The patch file is written by URASHIMA Akira # see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ EXTRA_PATCHES+= ${FILESDIR}/webalizer-a-urasim_2.patch diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile index a51236df0901..7eb672c6784b 100644 --- a/www/xapian-omega/Makefile +++ b/www/xapian-omega/Makefile @@ -39,7 +39,7 @@ PORTEXAMPLES= omega.conf .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+=--with-iconv .else CONFIGURE_ARGS+=--without-iconv diff --git a/www/xapian-omega10/Makefile b/www/xapian-omega10/Makefile index 2ac8033da30c..4fa995ed43d4 100644 --- a/www/xapian-omega10/Makefile +++ b/www/xapian-omega10/Makefile @@ -40,7 +40,7 @@ PORTSCOUT= limit:^1\.0\. .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-iconv .else CONFIGURE_ARGS+= --without-iconv diff --git a/x11-clocks/cairo-clock/Makefile b/x11-clocks/cairo-clock/Makefile index 4bb58c8af099..ca8dde85a5b0 100644 --- a/x11-clocks/cairo-clock/Makefile +++ b/x11-clocks/cairo-clock/Makefile @@ -14,9 +14,9 @@ MASTER_SITES= http://macslow.thepimp.net/projects/cairo-clock/ MAINTAINER= daichi@FreeBSD.org COMMENT= MacSlow's Cairo-Clock -USE_GNOME= gtk20 intlhack gnomehack libglade2 librsvg2 +USE_GNOME= gtk20 intlhack libglade2 librsvg2 USE_GMAKE= yes -USE_ICONV= yes +USES= pathfix iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes MAN1= cairo-clock.1 diff --git a/x11-themes/lxde-icon-theme/Makefile b/x11-themes/lxde-icon-theme/Makefile index dc10bdb6150c..2c5be6b03b44 100644 --- a/x11-themes/lxde-icon-theme/Makefile +++ b/x11-themes/lxde-icon-theme/Makefile @@ -16,7 +16,7 @@ COMMENT= LXDE Icon Theme USE_BZIP2= YES USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index f4fb56f4caeb..5513b338dc2b 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= xli:${PORTSDIR}/graphics/xli USE_BZIP2= yes USE_GNOME= glib20 gtk20 pango -USE_ICONV= yes +USES= iconv USE_XORG+= ice sm x11 xcursor xext xfixes xi xinerama xrandr xrender GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index deac1745d120..2ff88241712a 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -35,8 +35,7 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ execinfo:${PORTSDIR}/devel/libexecinfo USE_XZ= yes -USE_ICONV= yes -USES= cmake +USES= cmake iconv CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc USE_EFL= imlib2 USE_GNOME= glib20 pango diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile index afedc37c4b6b..a7eb6bd7a84c 100644 --- a/x11-wm/awesome2/Makefile +++ b/x11-wm/awesome2/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_EFL= imlib2 USE_GNOME= pango diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile index 9615f883a2b3..de7247c69f96 100644 --- a/x11-wm/blackbox/Makefile +++ b/x11-wm/blackbox/Makefile @@ -17,8 +17,7 @@ COMMENT= A small and fast window manager for X11R6 LICENSE= MIT GNU_CONFIGURE= yes -USE_ICONV= yes -USE_GNOME= gnomehack pkgconfig +USES= pathfix pkgconfig iconv USE_XORG= x11 xft MAN1= bsetbg.1 bsetroot.1 diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 3b33682e1041..09fee5741660 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -14,8 +14,7 @@ SOUND_DESC= Sound support via pulseaudio/libsndfile USE_XORG= compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \ xext xfixes xft xinerama xrandr xrender xxf86vm -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_GMAKE= yes USE_EFL= imlib2 USE_AUTOTOOLS= libtool diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index 571e13d5910c..93ca1b28a20a 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -19,14 +19,13 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes -USES= pathfix +USES= pathfix iconv USE_GMAKE= yes USE_EFL= eina eet evas ecore eio edbus efreet edje \ libtool_hack librt_hack modarch_hack USE_EFL_EVAS_LOADERS= eet jpeg png USE_EFL_EVAS_ENGINES= buffer USE_EFL_ECORE= ipc -USE_ICONV= yes USE_LDCONFIG= yes SUB_FILES= pkg-message diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index e5ac8152798b..d3350ecb2e7d 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --enable-xinerama .endif .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes +USES+= iconv CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-nls diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index c4d4147629a1..aedd6206e3ae 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -47,7 +47,7 @@ DISTFILES+= ${FVWM_ICONS}.tar.bz2 .if ! ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --disable-iconv .else -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-iconv-library=${LOCALBASE}/lib \ --with-iconv-includes=${LOCALBASE}/include .endif diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile index 0fc29db85597..d5a42547bbb7 100644 --- a/x11-wm/i3/Makefile +++ b/x11-wm/i3/Makefile @@ -31,10 +31,9 @@ RUN_DEPENDS= p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \ USE_PERL5_RUN= yes USE_XORG= x11 xcursor -USES= bison pkgconfig +USES= bison pkgconfig iconv USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/i3 \ diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile index f3db0dc54ca3..40a2e5b9feec 100644 --- a/x11-wm/lxsession/Makefile +++ b/x11-wm/lxsession/Makefile @@ -22,7 +22,7 @@ CONFLICTS= lxsession-lite-[0-9]* USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 65599d460dc5..c3c92c26c42e 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -13,10 +13,9 @@ COMMENT= Light, Unobtrusive, and configurable windowmanager LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png -USES= pkgconfig +USES= pkgconfig iconv USE_XORG= xft xpm x11 USE_GMAKE= yes -USE_ICONV= yes USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \ diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index 432fc91ed5bd..7ce2875d1fba 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -31,7 +31,7 @@ SLIM_LAYOUT_BOX_DESC= Build with slim layout boxes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MUTF8} -USE_ICONV= yes +USES+= iconv MAKE_ARGS+= LIBICONV="-liconv" .else MAKE_ARGS+= -DNO_UTF8 diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 9310810e40b8..cdf0fcc31688 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -27,7 +27,7 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= MMX USE_XORG= x11 xt -USE_ICONV= yes +USES= iconv USE_EFL= imlib2 MAN1= Eterm.1 diff --git a/x11/florence/Makefile b/x11/florence/Makefile index 08762e3b7ba9..24270afe036e 100644 --- a/x11/florence/Makefile +++ b/x11/florence/Makefile @@ -21,9 +21,8 @@ USE_XORG= xtst USE_GNOME= gtk20 intlhack gnomedocutils gconf2 librsvg2 gnomepanel USE_BZIP2= yes -USES= gettext +USES= gettext iconv USE_GMAKE= yes -USE_ICONV= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_OMF= yes diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index a1fced9290ee..8cb9312c9a23 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft USE_AUTOTOOLS= libtool USE_GNOME= gtk12 -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -lgnuregex -liconv CFLAGS+= `pkg-config xft --cflags` diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile index a58d3070ee7e..2904726adb2d 100644 --- a/x11/ggiterm/Makefile +++ b/x11/ggiterm/Makefile @@ -37,7 +37,7 @@ BROKEN= fails to build with new utmpx .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE} .else CONFIGURE_ARGS+=--without-freetype diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile index 254cfd010de3..9809144d0c67 100644 --- a/x11/i3lock/Makefile +++ b/x11/i3lock/Makefile @@ -35,6 +35,6 @@ MAKE_JOBS_SAFE= yes USE_XORG= x11 xt xproto xext USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv .include <bsd.port.mk> diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 3d787908ebc2..30b772221786 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -44,10 +44,9 @@ CONFLICTS= kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].* USE_GL= glu USE_GNOME= glib20 -USE_ICONV= yes USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen pimlibs \ akonadi automoc4 ontologies qimageblitz soprano strigi -USES= cmake:outsource pkgconfig gettext +USES= cmake:outsource pkgconfig gettext iconv USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql webkit xml \ moc_build qmake_build rcc_build uic_build diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile index 047f8b3576d6..57b35bbe8396 100644 --- a/x11/trayer/Makefile +++ b/x11/trayer/Makefile @@ -13,7 +13,7 @@ COMMENT= Lightweight GTK2-based systray for UNIX desktop GITVERSION= 0-g5353f80 FETCH_ARGS= -pRr USE_GNOME= gtk20 glib20 pango atk -USE_ICONV= yes +USES= iconv USE_XORG= xmu USE_GMAKE= yes MAKE_ARGS= "PREFIX=${PREFIX}" diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 7c6eaec720e5..221fdbf4206c 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes -USE_ICONV= yes +USES= iconv USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile index af92391cab41..d42fc8504841 100644 --- a/x11/xfree86_xkb_xml/Makefile +++ b/x11/xfree86_xkb_xml/Makefile @@ -14,8 +14,7 @@ MASTER_SITES= SF/gswitchit/OldFiles MAINTAINER= gnome@FreeBSD.org COMMENT= A little set of XML files useful for dealing with XKB rules -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 16e08cc52dea..c92b694835ac 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -30,8 +30,7 @@ MAN7= xkeyboard-config.7 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index 63c3c6ba1d13..f1a00360a3d8 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -41,8 +41,7 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+=--enable-gui -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv USE_XORG+= pixman xcomposite xcursor xdamage xfixes xinerama xrandr xrender USE_GNOME+= gdkpixbuf2 gtk20 libgnomeui MAN1+= gnee.1 |