diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2013-04-27 08:50:46 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2013-04-27 08:50:46 +0000 |
| commit | 821843ca06f2354ffe250825fcdffabb6d0caefa (patch) | |
| tree | 5b8de344e457d5da2cf746d56e495a2ce03e1d99 | |
| parent | - update WWW (diff) | |
- Convert USE_ICONV=yes to USES=iconv
- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig while here
Reviewed by: bapt, kwm
Notes
Notes:
svn path=/head/; revision=316654
196 files changed, 205 insertions, 295 deletions
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile index f4a52bddc8b4..9f9b8c953079 100644 --- a/archivers/dpkg/Makefile +++ b/archivers/dpkg/Makefile @@ -19,10 +19,10 @@ BUILD_DEPENDS= po4a:${PORTSDIR}/textproc/po4a RUN_DEPENDS= gmd5sum:${PORTSDIR}/sysutils/coreutils \ gpatch:${PORTSDIR}/devel/patch +USES= iconv USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes USE_PERL5= yes MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION} diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 2221562370f5..f78a99a7e85b 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -16,9 +16,9 @@ COMMENT= GNU version of the traditional tape archiver INFO= tar +USES= iconv USE_AUTOTOOLS= autoconf:env # autom4te USE_XZ= yes -USE_ICONV= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --program-prefix=g \ diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile index 48712d2cae46..cbb0787e3248 100644 --- a/archivers/liborange/Makefile +++ b/archivers/liborange/Makefile @@ -25,7 +25,7 @@ MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USES= pathfix pkgconfig +USES= iconv pathfix pkgconfig USE_ICONV= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index df1230c34c6a..cb5d0bdbe818 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -61,8 +61,7 @@ PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 982c3aeb37c6..eb2444f2fc37 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/Makefile @@ -76,8 +76,7 @@ PLIST_SUB+= PYTHON="@comment " .if ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+=--enable-nls -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv .else CONFIGURE_ARGS+=--disable-nls .endif diff --git a/archivers/star/Makefile b/archivers/star/Makefile index 22d16c650a9e..38be9a173935 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -12,8 +12,7 @@ COMMENT= Unique standard tape archiver with many enhancements BUILD_DEPENDS= smake:${PORTSDIR}/devel/smake USE_BZIP2= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv .if !defined(NO_INSTALL_MANPAGES) MAN1= scpio.1 spax.1 srmt.1 star.1 suntar.1 tartest.1 diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile index 02940c6cc214..3a0c18530e37 100644 --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -14,7 +14,7 @@ COMMENT= Extracts AlZip archives LICENSE_FILE= ${WRKSRC}/readme.txt BROKEN= fails to build -USE_ICONV= yes +USES= iconv PLIST_FILES= bin/unalz MAKEFILE= Makefile.freebsd CPPFLAGS+= -I${LOCALBASE}/include diff --git a/archivers/unrar-iconv/Makefile b/archivers/unrar-iconv/Makefile index be13be93ee68..7bcc102df9a5 100644 --- a/archivers/unrar-iconv/Makefile +++ b/archivers/unrar-iconv/Makefile @@ -15,7 +15,7 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv CPPFLAGS+= -DWITH_ICONV -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv -USE_ICONV= yes +USES+= iconv CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]* diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 7c943c1d5ea6..a42b57c3d0fe 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -50,7 +50,7 @@ PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= nork PATCHFILES+= unzip60-alt-iconv-utf8.patch PATCH_DIST_STRIP+= -p1 -USE_ICONV= yes +USES= iconv CFLAGS+= -I${LOCALBASE}/include -DNATIVE MAKE_ARGS+= LFLAGS1="-L${LOCALBASE}/lib -liconv" .endif diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 2179f0fe6b74..4c27a85c8bf7 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -13,9 +13,8 @@ COMMENT= 3D photo-realistic sky renderer (planetarium) LICENSE= GPLv2 -USES= cmake gettext +USES= cmake gettext iconv USE_GL= glu -USE_ICONV= yes USE_QT4= moc_build rcc_build uic_build qmake_build \ corelib gui network opengl script MAKE_JOBS_SAFE= yes diff --git a/astro/viking/Makefile b/astro/viking/Makefile index 004feb9e78d9..b9ffcd834610 100644 --- a/astro/viking/Makefile +++ b/astro/viking/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ xcb:${PORTSDIR}/x11/libxcb RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel -USES= pkgconfig +USES= iconv pkgconfig USE_GMAKE= yes GNU_CONFIGURE= yes USE_ICONV= yes diff --git a/audio/arts/Makefile b/audio/arts/Makefile index b59d2d4bf801..c9c5862eec56 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -35,12 +35,11 @@ EXPIRATION_DATE= 2013-07-01 PREFIX= ${KDE_PREFIX} WANT_GNOME= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_QT_VER= 3 USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_ICONV= yes USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xft xi \ xinerama xrandr xrender xt USE_LDCONFIG= yes diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index d9199ce6f087..f661156da0e9 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -10,10 +10,9 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= h.skuhra@gmail.com COMMENT= Console-based music player with really cool features -USES= pkgconfig +USES= pkgconfig iconv USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes USE_NCURSES= yes HAS_CONFIGURE= yes CONFIGURE_ENV+= HOSTCC=${CC} diff --git a/audio/cowbell/Makefile b/audio/cowbell/Makefile index 55aa2e368eda..e3a835725900 100644 --- a/audio/cowbell/Makefile +++ b/audio/cowbell/Makefile @@ -12,12 +12,11 @@ COMMENT= Elegant music organizer LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib -USES= pathfix gettext +USES= pathfix gettext iconv USE_GNOME= gnomeprefix intltool gtksharp20 INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile index d07903521a07..bbf3b48085d8 100644 --- a/audio/cuberok/Makefile +++ b/audio/cuberok/Makefile @@ -24,8 +24,7 @@ LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ USE_LDCONFIG= yes USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ network phonon-gst sql -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_SDL= sdl QMAKEFLAGS+= "CONFIG+=player_phonon" MAKE_ENV+= INSTALL_ROOT=${PREFIX} diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 808bd094bf6a..09089ad28387 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -18,11 +18,10 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ execinfo:${PORTSDIR}/devel/libexecinfo GNU_CONFIGURE= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GMAKE= yes USE_LDCONFIG= yes USE_BZIP2= yes -USE_ICONV= yes CONFIGURE_ARGS= --disable-alsa --disable-nullout \ CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl" diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile index 4dd2bc19f95e..a1b8d91dd5a4 100644 --- a/audio/ezstream/Makefile +++ b/audio/ezstream/Makefile @@ -19,8 +19,8 @@ OPTIONS_DEFAULT= TAGLIB TAGLIB_DESC= TagLib support +USES= iconv USE_GNOME= libxml2 -USE_ICONV= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes diff --git a/audio/festival-freebsoft-utils/Makefile b/audio/festival-freebsoft-utils/Makefile index ce98b9a49935..0134d04b3bef 100644 --- a/audio/festival-freebsoft-utils/Makefile +++ b/audio/festival-freebsoft-utils/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= festival:${PORTSDIR}/audio/festival \ sox:${PORTSDIR}/audio/sox NO_BUILD= yes -USE_ICONV= yes +USES= iconv PORTDOCS= ANNOUNCE NEWS README diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile index fb836d2f9e77..f5109fb6d174 100644 --- a/audio/firefly/Makefile +++ b/audio/firefly/Makefile @@ -52,7 +52,7 @@ JAPANESE_DESC= Japanese support in ID3 tags .if ${PORT_OPTIONS:MJAPANESE} EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_scan-mp3.c -USE_ICONV= yes +USES= iconv CONFIGURE_ARGS+= --enable-iconv .endif diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 9a8a4b878abc..6fbb7300cfba 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFAULT=ICONV .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+=--without-libiconv-prefix diff --git a/audio/ices/Makefile b/audio/ices/Makefile index 617adab749fb..502e1ea7e0c6 100644 --- a/audio/ices/Makefile +++ b/audio/ices/Makefile @@ -21,11 +21,10 @@ LIB_DEPENDS= ogg:${PORTSDIR}/audio/libogg \ OPTIONS_DEFINE= ALSA -USES= pkgconfig +USES= pkgconfig iconv USE_BZIP2= yes USE_GNOME= libxml2 USE_GMAKE= yes -USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-roaraudio --disable-sun-audio MAKE_JOBS_SAFE= yes diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index 76ed0fa7e102..4766d0a5bb9f 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -15,7 +15,7 @@ MAINTAINER= kaeru@inigo-tech.com COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile index 80dcae8a91fb..3258f38b3396 100644 --- a/audio/ifp-line/Makefile +++ b/audio/ifp-line/Makefile @@ -11,7 +11,7 @@ COMMENT= Command line interface to iRiver music players LICENSE= GPLv2 -USE_ICONV= yes +USES= iconv USE_AUTOTOOLS= aclocal autoheader automake autoconf ACLOCAL_ARGS= -I m4 MAKE_JOBS_UNSAFE= yes diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 1eb18c59ef5b..38652c705502 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode MANCOMPRESSED= no GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 528ab68ef556..6bf386592140 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -14,11 +14,11 @@ MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/3.99 MAINTAINER= netchild@FreeBSD.org COMMENT= Fast MP3 encoder kit +USES= iconv USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --enable-nasm --enable-mp3rtp --disable-gtktest diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile index 0148fd247b3b..2ef7631b66b8 100644 --- a/audio/libcddb/Makefile +++ b/audio/libcddb/Makefile @@ -12,8 +12,7 @@ COMMENT= A library to access data on a CDDB server USE_BZIP2= yes GNU_CONFIGURE= yes -USES= pathfix pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv USE_LDCONFIG= yes CONFIGURE_ARGS= --without-cdio CPPFLAGS+= -DICONV_CONST="const" -I${LOCALBASE}/include diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile index dc97b545b3cc..7fa3a0aaba79 100644 --- a/audio/libmtp/Makefile +++ b/audio/libmtp/Makefile @@ -15,8 +15,7 @@ OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT= MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices -USES= pathfix pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/audio/mp3unicode/Makefile b/audio/mp3unicode/Makefile index 59adf313070b..cfb56a9a086f 100644 --- a/audio/mp3unicode/Makefile +++ b/audio/mp3unicode/Makefile @@ -17,8 +17,7 @@ COMMENT= ID3 tags charset converter LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib USE_BZIP2= yes -USE_ICONV= yes -USE_GNOME= pkgconfig +USES= iconv pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= ICONV_CFLAGS="-I${LOCALBASE}/include" \ ICONV_LIBS="-L${LOCALBASE}/lib -liconv" diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index 1dcb4a7f67fa..2441b52b4570 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -36,7 +36,7 @@ MAN1= ${PORTNAME}.1 .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES= iconv .else CONFIGURE_ARGS+=--disable-iconv .endif diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile index 2ee2d9a94264..d88ff3dcea05 100644 --- a/audio/mpdbrowser/Makefile +++ b/audio/mpdbrowser/Makefile @@ -16,8 +16,7 @@ COMMENT= GTK+ client for the Music Player Daemon (MPD) RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd PYDISTUTILS_PKGNAME= mpdBrowser -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GNOME= intltool pygtk2 diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index 8ae2c52ec41f..88c9408e8445 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -15,7 +15,7 @@ DISTNAME= mpio-${PORTVERSION:S|.p|_pre|} MAINTAINER= ports@FreeBSD.org COMMENT= Digit@lway MPIO MP3 player tool -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 2d0234277b2c..723dd357e99e 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -22,7 +22,7 @@ LYRICS_DESC= Compile with lyrics screen .include <bsd.port.options.mk> -USE_ICONV= yes +USES= iconv PLIST_FILES= bin/ncmpc \ %%EXAMPLESDIR%%/config \ %%EXAMPLESDIR%%/keys \ diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 0334df5951bd..a345a90c2d29 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -13,9 +13,9 @@ COMMENT= A ncurses mpd client, clone of ncmpc with some new features LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient \ fftw3:${PORTSDIR}/math/fftw3 +USES= iconv USE_BZIP2= yes GNU_CONFIGURE= yes -USE_ICONV= yes USE_NCURSES= yes USE_GNOME= glib20 USE_AUTOTOOLS= automake aclocal libtool diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile index 1a7269d1e45a..b7580f0c8fa2 100644 --- a/audio/py-karaoke/Makefile +++ b/audio/py-karaoke/Makefile @@ -24,8 +24,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \ OPTIONS_DEFINE= MUTAGEN MUTAGEN_DESC= Enable Mutagen support +USES= iconv USE_ZIP= yes -USE_ICONV= yes USE_SDL= sdl USE_XORG= x11 xau xdmcp USE_WX= 2.6+ diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile index 1d3788a989c2..b0129245a2a2 100644 --- a/audio/scrobbler/Makefile +++ b/audio/scrobbler/Makefile @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --enable-prefer-ape .endif .if defined(WITH_ENCODINGS_PATCH) -USE_ICONV= yes +USES+= iconv .endif post-patch:: diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile index 91d4f11e002c..26a6360ac345 100644 --- a/audio/streamripper/Makefile +++ b/audio/streamripper/Makefile @@ -22,8 +22,8 @@ OPTIONS_DEFAULT= FAAD VORBIS LICENSE= GPLv2 +USES= iconv USE_GNOME= glib20 -USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-included-libmad \ --without-included-tre \ diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index 63ea0118ed63..199a4ab1e3fa 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -21,7 +21,7 @@ LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell IGNORE= license ${LICENSE} needs confirmation, but BATCH is defined .endif -USE_ICONV= yes +USES= iconv USE_LDCONFIG= ${PREFIX}/lib/teamspeak/server USE_RC_SUBR= teamspeak SUB_FILES= pkg-message diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index e130034a5d5c..3e0023c177df 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -31,7 +31,7 @@ MAKE_JOBS_SAFE= yes USES+= gettext PLIST_SUB+= NLS="" .else -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile index db813e57381d..e2d623dbece6 100644 --- a/audio/wavpack/Makefile +++ b/audio/wavpack/Makefile @@ -16,8 +16,7 @@ COMMENT= Audio codec for lossless, lossy, and hybrid compression LICENSE= BSD USE_BZIP2= yes -USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile index 559af795034d..f94856bc75b6 100644 --- a/audio/xmms-curses/Makefile +++ b/audio/xmms-curses/Makefile @@ -19,9 +19,8 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms LIB_DEPENDS= pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \ xcb.2:${PORTSDIR}/x11/libxcb -USES= gettext +USES= gettext iconv USE_GNOME= gtk12 -USE_ICONV= yes USE_XORG= x11 xau xdmcp xext xi MAN1= ${PORTNAME}.1 diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index f3cb2d41d046..4bcad5c4dc0a 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -17,9 +17,8 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ xcb.2:${PORTSDIR}/x11/libxcb USE_AUTOTOOLS= libtool -USES= gettext +USES= gettext iconv USE_GNOME= gtk12 -USE_ICONV= yes USE_XORG= x11 xau xdmcp xext xi CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" \ diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile index 22a82e6e578e..9d8fd907aa4b 100644 --- a/audio/xmms-wma/Makefile +++ b/audio/xmms-wma/Makefile @@ -23,7 +23,7 @@ USE_LDCONFIG= yes .if defined(WITH_ICONV) CFLAGS+= -DUSE_ICONV -USE_ICONV= yes +USES= iconv .endif .include <bsd.port.pre.mk> diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile index dad2fa93c264..368d5b9d4d51 100644 --- a/benchmarks/gtkperf/Makefile +++ b/benchmarks/gtkperf/Makefile @@ -21,8 +21,7 @@ GNU_CONFIGURE= yes USE_GNOME= gtk20 gnomeprefix .if !defined(WITHOUT_NLS) -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-nls diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile index 286ee376aadc..b8218b976aeb 100644 --- a/biology/embassy/Makefile +++ b/biology/embassy/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= nucleus.6:${PORTSDIR}/biology/emboss PREFIX?= ${LOCALBASE}/emboss NO_MTREE= yes USE_SUBMAKE= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes USE_XORG= x11 diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 5a93f48a13f1..3cb4c3b35fca 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -26,9 +26,8 @@ GH_TAGNAME= ${GH_PROJECT}_${PORTVERSION} GH_COMMIT= fb52aa2 CMAKE_SOURCE_PATH= ${WRKSRC}/src -USES= cmake:outsource +USES= cmake:outsource iconv USE_DOS2UNIX= yes -USE_ICONV= yes USE_XORG= ice sm x11 xau xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm USE_GL= glu diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile index 2f4e5462c936..347f79096442 100644 --- a/cad/pdnmesh/Makefile +++ b/cad/pdnmesh/Makefile @@ -26,10 +26,9 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ OPTIONS_DEFINE= ATLAS DOCS EXAMPLES ATLAS_DESC= Enable ATLAS support -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_FORTRAN= yes USE_GL= glu -USE_ICONV= yes USE_GNOME= gdkpixbuf2 gtk20 USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xmu xi xinerama xrandr xrender xt xxf86vm diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile index 7e4c4f125478..5199d489ab87 100644 --- a/cad/repsnapper/Makefile +++ b/cad/repsnapper/Makefile @@ -37,12 +37,11 @@ LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ xcb:${PORTSDIR}/x11/libxcb MAKE_JOBS_SAFE= yes -USES= pkgconfig +USES= pkgconfig iconv USE_GNOME= gdkpixbuf2 gtk20 libxml2 USE_GL= glu glut USE_AUTOTOOLS= automake libtool USE_GMAKE= yes -USE_ICONV= yes USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xmu xrandr xrender xt xxf86vm diff --git a/chinese/docproj/Makefile b/chinese/docproj/Makefile index 0d4ee703eabe..dc2fc66811c1 100644 --- a/chinese/docproj/Makefile +++ b/chinese/docproj/Makefile @@ -22,7 +22,7 @@ COMMENT= Supportive tools for Chinese docproj build RUN_DEPENDS= gbklatex:${PORTSDIR}/print/latex-cjk -USE_ICONV= yes +USES= iconv WRKSRC= ${WRKDIR}/src diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile index c9077a06da2e..b59504b07c18 100644 --- a/chinese/miniChinput/Makefile +++ b/chinese/miniChinput/Makefile @@ -17,7 +17,7 @@ COMMENT= A tiny version of Chinput GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_XORG= x11 xt USE_LDCONFIG= yes ALL_TARGET= all data diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile index 266c94f5281f..a1a6bed0eb41 100644 --- a/chinese/oto/Makefile +++ b/chinese/oto/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Show you font info and add new 'name' and 'cmap' tables -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= YES USE_GMAKE= YES CPPFLAGS+= -I${LOCALBASE}/include diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index bd7612059b3e..4db7827ca5ed 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -19,7 +19,7 @@ GTK2_DESC= GTK2 input method module CHEWING_DESC= Chewing input module UNICODE_DESC= Unicode input module -USE_ICONV= yes +USES= iconv USE_XORG= x11 xft xpm xtst WANT_GNOME= yes diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile index 1e806aa2af01..1f260b65ac3f 100644 --- a/chinese/pcmanx/Makefile +++ b/chinese/pcmanx/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 USE_XZ= yes USE_GNOME= gtk20 intlhack USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes OPTIONS_DEFINE= NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile index ff06883999d5..62a9ddb15fb9 100644 --- a/chinese/scim-array/Makefile +++ b/chinese/scim-array/Makefile @@ -19,9 +19,7 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig -USES= gettext -USE_ICONV= yes +USES= gettext pkgconfig iconv CFLAGS+= -fPIC CPPFLAGS+= -I${LOCALBASE}/include diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile index d23f3c1b381e..be337d36c429 100644 --- a/chinese/scim-pinyin/Makefile +++ b/chinese/scim-pinyin/Makefile @@ -12,8 +12,8 @@ COMMENT= SCIM Chinese Smart Pinyin input method BUILD_DEPENDS= scim>=1.2.0:${PORTSDIR}/textproc/scim RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GNOME= gnomehack lthack -USE_ICONV= yes +USE_GNOME= lthack +USES= pathfix iconv USE_GMAKE= yes USE_AUTOTOOLS= libtool diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile index 7c3156f1a353..c425ac1e999c 100644 --- a/chinese/zhcon/Makefile +++ b/chinese/zhcon/Makefile @@ -23,9 +23,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes ONLY_FOR_ARCHS= i386 -USE_ICONV= yes # Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl -USES= gettext +USES= gettext iconv CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/converters/cocot/Makefile b/converters/cocot/Makefile index 07c1f28296bc..f06b33c47368 100644 --- a/converters/cocot/Makefile +++ b/converters/cocot/Makefile @@ -17,7 +17,7 @@ MAINTAINER= knu@FreeBSD.org COMMENT= Code Converter on TTY USE_ZIP= yes -USE_ICONV= yes +USES= iconv WRKSRC= ${WRKDIR}/vmi-${PORTNAME}-8bc9f64 GNU_CONFIGURE= yes diff --git a/converters/enca/Makefile b/converters/enca/Makefile index 668c35494a0f..cc5f8ce8a165 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -20,8 +20,7 @@ RUN_DEPENDS= umap:${PORTSDIR}/converters/p5-Unicode-Map8 LICENSE= GPLv2 USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/converters/lua-iconv/Makefile b/converters/lua-iconv/Makefile index 2bc39255fbff..3988537d9b05 100644 --- a/converters/lua-iconv/Makefile +++ b/converters/lua-iconv/Makefile @@ -16,8 +16,7 @@ COMMENT= Iconv binding for Lua 5 WRKSRC= ${WRKDIR}/lua-${PORTNAME}-${PORTVERSION} USE_LUA?= 5.1 -USE_GNOME= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile index 3645f8ee71a8..4b8b4762d8ac 100644 --- a/converters/p5-Text-Iconv/Makefile +++ b/converters/p5-Text-Iconv/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl interface to iconv() codeset conversion function -USE_ICONV= yes +USES= iconv PERL_CONFIGURE= yes CONFIGURE_ARGS+= INC="-I${LOCALBASE}/include" \ diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile index 32fadf55bdab..5193fe4fdfa5 100644 --- a/converters/py-iconv/Makefile +++ b/converters/py-iconv/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= python MAINTAINER= ports@FreeBSD.org COMMENT= An iconv wrapper with Unicode codec for Python -USE_ICONV= yes +USES= iconv USE_PYTHON= yes USE_PYDISTUTILS= yes PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g} diff --git a/converters/recode/Makefile b/converters/recode/Makefile index da28ae276d42..18d1bc523217 100644 --- a/converters/recode/Makefile +++ b/converters/recode/Makefile @@ -11,11 +11,10 @@ MASTER_SITE_SUBDIR= recode MAINTAINER= demon@FreeBSD.org COMMENT= Converts files between character sets and usages -USES= gettext +USES= gettext iconv USE_AUTOTOOLS= libtool USE_PERL5= yes USE_LDCONFIG= yes -USE_ICONV= yes CONFIGURE_ARGS= --without-included-gettext CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile index 03fa98bfd168..2cff791fc673 100644 --- a/converters/ruby-iconv/Makefile +++ b/converters/ruby-iconv/Makefile @@ -20,7 +20,7 @@ COMMENT= An iconv wrapper class for Ruby FETCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch -USE_ICONV= yes +USES= iconv USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile index 4b6e370fdbd8..fe5c6d27a832 100644 --- a/databases/drizzle/Makefile +++ b/databases/drizzle/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= ${PREFIX}/lib/drizzle BROKEN= fails to build -USE_ICONV= yes +USES= iconv .if defined(MAINTAINER_MODE) UID_FILES+= ../../UIDs diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 94a815cff016..38a09d0f1bb3 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -14,7 +14,7 @@ COMMENT= Sybase/Microsoft TDS protocol library WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} TDS_VER?= 5.0 -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env libtool diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 5af74936bc1a..9029df3f0a9c 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -14,7 +14,7 @@ COMMENT= Sybase/Microsoft TDS protocol library TDS_VER?= 5.0 -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env libtool diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 7fe074581afa..5c8ad8086ff6 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -32,8 +32,7 @@ LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_READLINE= yes USE_PERL5= yes USE_XORG= sm ice xi x11 xt xmu xext diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index c0e16f4a5def..5c251ce9b079 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -13,9 +13,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ xml2.5:${PORTSDIR}/textproc/libxml2 -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_BZIP2= yes -USE_ICONV= yes USE_PYTHON= yes CXXFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl diff --git a/databases/libmongo-client/Makefile b/databases/libmongo-client/Makefile index a26b5616ea97..1d6015db6bb8 100644 --- a/databases/libmongo-client/Makefile +++ b/databases/libmongo-client/Makefile @@ -17,9 +17,8 @@ GH_COMMIT= 13cc0ee USE_AUTOTOOLS= automake autoconf libtool GNU_CONFIGURE= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GMAKE= yes -USE_ICONV= yes USE_GNOME= glib20 USE_LDCONFIG= yes CONFIGURE_ENV+= PKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile index 5f874962c0ef..b9cb60e8fba4 100644 --- a/databases/mysql-proxy/Makefile +++ b/databases/mysql-proxy/Makefile @@ -22,8 +22,7 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc" LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv USE_LDCONFIG= yes USE_LUA= 5.1+ USE_MYSQL= yes diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile index 75e2ed465682..5eb0363a43fa 100644 --- a/databases/namazu2/Makefile +++ b/databases/namazu2/Makefile @@ -18,8 +18,7 @@ BUILD_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic RUN_DEPENDS= p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic USE_PERL5= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-perl5="${PERL}" \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile index 82e727e21443..73f1016c7216 100644 --- a/databases/postgis/Makefile +++ b/databases/postgis/Makefile @@ -17,11 +17,10 @@ RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server CONFLICTS= postgis-2.* -USES= bison +USES= bison iconv USE_GNOME= libxml2 USE_PGSQL= yes USE_GMAKE= yes -USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5_BUILD= yes diff --git a/databases/postgis20/Makefile b/databases/postgis20/Makefile index 1b6c7446722b..5f1d67ab4311 100644 --- a/databases/postgis20/Makefile +++ b/databases/postgis20/Makefile @@ -20,7 +20,7 @@ LATEST_LINK= postgis20 USE_GNOME= libxml2 USE_PGSQL= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5_BUILD= yes diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index 7ddb617c6fe3..b12ed5b1e65e 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -14,8 +14,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_PERL5= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index 076fba711fed..b30334166730 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes .if !defined(SLAVEPORT) -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS= --enable-zlib \ --enable-iconv \ --enable-pthread diff --git a/databases/ruby-sybct/Makefile b/databases/ruby-sybct/Makefile index 712f2592e597..beb4c3125abe 100644 --- a/databases/ruby-sybct/Makefile +++ b/databases/ruby-sybct/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= tds.5:${PORTSDIR}/databases/freetds USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_ICONV= yes +USES= iconv post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile index c832af392de1..a830933a0651 100644 --- a/databases/spatialite/Makefile +++ b/databases/spatialite/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/lib${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes USE_SQLITE= yes -USE_ICONV= yes +USES= iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile index be081f423e0a..4804083971fe 100644 --- a/databases/spatialite_gui/Makefile +++ b/databases/spatialite_gui/Makefile @@ -22,8 +22,7 @@ USE_WX= 2.8 WANT_UNICODE= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes -USE_GNOME= pkgconfig +USES= pkgconfig iconv CPPFLAGS+= -I${LOCALBASE}/include `${WX_CONFIG} --cppflags` LDFLAGS+= -L${LOCALBASE}/lib -liconv `${WX_CONFIG} --libs` CONFIGURE_ARGS+=CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index c265bbc608c4..58c2509367d6 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -15,7 +15,7 @@ COMMENT= ODBC library suite for Unix CONFLICTS= libiodbc-[0-9]* virtuoso-* -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static --enable-shared \ --with-libiconv-prefix=${LOCALBASE} diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile index 245a1e92fd53..c9b38319a77f 100644 --- a/deskutils/adesklets/Makefile +++ b/deskutils/adesklets/Makefile @@ -21,7 +21,7 @@ USE_PYTHON= yes USE_GMAKE= yes USE_BZIP2= yes USE_EFL= imlib2 -USE_ICONV= yes +USES= iconv WANT_PERL= yes MAN1= adesklets.1 \ diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile index 63aaaf1d0659..2efb106181b9 100644 --- a/deskutils/glipper/Makefile +++ b/deskutils/glipper/Makefile @@ -11,9 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Clipboard manager for the GNOME panel USE_BZIP2= yes -USE_ICONV= yes USE_GMAKE= yes -USES= pathfix gettext +USES= pathfix gettext iconv USE_GNOME= gnomeprefix intltool pygnomedesktop pygnomeextras USE_PYTHON= 2.5+ INSTALLS_ICONS= yes diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 754c30bbd6f3..cb8bbc63e04f 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -25,10 +25,9 @@ CONFLICTS_INSTALL= kdepim-4.4.* USE_XZ= yes USE_GNOME= libxml2 -USE_ICONV= yes USE_KDE4= kdehier kdelibs kdeprefix pimlibs \ akonadi automoc4 ontologies soprano strigi nepomuk-widgets -USES= cmake:outsource +USES= cmake:outsource iconv USE_OPENLDAP= yes USE_QT4= corelib dbus declarative designer_build gui network opengl \ script sql webkit \ diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile index 61f26febcb87..12fbf20c6922 100644 --- a/deskutils/libopensync-plugin-vformat-devel/Makefile +++ b/deskutils/libopensync-plugin-vformat-devel/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= opensync.1:${PORTSDIR}/devel/libopensync BROKEN= fails to build USE_BZIP2= yes -USE_ICONV= yes -USES= cmake +USES= cmake iconv CMAKE_ARGS+= -Wno-dev CFLAGS+= "-I${LOCALBASE}/include" diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile index 83fa63b630a8..0b2d4db44e3d 100644 --- a/deskutils/libstreamanalyzer/Makefile +++ b/deskutils/libstreamanalyzer/Makefile @@ -13,8 +13,7 @@ LIB_DEPENDS= avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFI exiv2:${PORTSDIR}/graphics/exiv2 \ streams:${PORTSDIR}/deskutils/libstreams -USES= pkgconfig -USE_ICONV= yes +USES= pkgconfig iconv USE_GNOME= libxml2 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/deskutils/libstreams/Makefile b/deskutils/libstreams/Makefile index 1d5178558067..fa4fbaeead6b 100644 --- a/deskutils/libstreams/Makefile +++ b/deskutils/libstreams/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= ${STRIGI_MASTER_SITES} MAINTAINER= kde@FreeBSD.org COMMENT= Strigi desktop search: streams library -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/deskutils/ljclive/Makefile b/deskutils/ljclive/Makefile index 05c7b5f9673d..b19d54d85f9b 100644 --- a/deskutils/ljclive/Makefile +++ b/deskutils/ljclive/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF/lj${PORTNAME}/lj${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= A command line client for posting LiveJournal entries -USE_ICONV= yes +USES= iconv MAN1= clive.1 diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile index 80d9128445d4..27dfaf249d7a 100644 --- a/deskutils/nagaina/Makefile +++ b/deskutils/nagaina/Makefile @@ -25,8 +25,7 @@ OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_GNOME= glib20 USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build USE_XORG= ice sm x11 xau xdmcp xext xrender diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 8280fb181f14..1be5599127f4 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -18,7 +18,7 @@ LICENSE= GPLv2 LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile index 3bba3f71bfa0..5f3e0e0cea8a 100644 --- a/deskutils/tpb/Makefile +++ b/deskutils/tpb/Makefile @@ -17,8 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_ICONV= yes -USES= bison +USES= bison iconv CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 81be59b30af3..89690a86934e 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -15,9 +15,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ pcre.3:${PORTSDIR}/devel/pcre USE_BZIP2= yes -USES= pkgconfig pathfix +USES= pkgconfig pathfix iconv GNU_CONFIGURE= yes -USE_ICONV= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 3937ac360c0e..80dd392f78ce 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -34,7 +34,7 @@ NSS_DESC= NSS crypto driver APR_VERSION= 1.4.6 APU_VERSION= 1.4.1 -USE_ICONV= yes +USES= iconv USE_AUTOTOOLS= automake autoconf libtool:env USE_PYTHON_BUILD= -2.7 USE_LDCONFIG= yes diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 7f3cc399fc0c..df49e8a92d80 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -32,7 +32,7 @@ DEVELOPER_ONLY_DESC= I want to test apr2 not the maintainer .include <bsd.port.options.mk> -USE_ICONV= yes +USES= iconv USE_AUTOTOOLS= automake autoconf libtool:env USE_PERL5_BUILD= yes USE_PYTHON_BUILD= -2.7 diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile index f85c3e70565a..bbd896227d3b 100644 --- a/devel/automoc4/Makefile +++ b/devel/automoc4/Makefile @@ -15,10 +15,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Automatic moc for Qt 4 packages -USE_ICONV= yes USE_QT4= corelib moc qmake_build rcc_build uic_build USE_BZIP2= yes -USES= cmake +USES= cmake iconv MAKE_JOBS_UNSAFE= yes .include <bsd.port.mk> diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index da9de87a977f..129d0211ef6e 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -24,7 +24,7 @@ BJAM_ARGS+= --without-python LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu BJAM_ARGS+= -sICU_PATH=${LOCALBASE} .else -USE_ICONV= yes +USES+= iconv BJAM_ARGS+= -sICONV_PATH=${LOCALBASE} .endif diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index 376bf42c9d79..8414a0b2ed68 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -18,7 +18,7 @@ LICENSE= GPLv2 GIT_VERSION= 1.7.4.4 USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes USE_OPENSSL= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile index 6e00646d3329..d5633173a76c 100644 --- a/devel/cxxtools/Makefile +++ b/devel/cxxtools/Makefile @@ -14,7 +14,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Collection of general-purpose C++ classes PATCH_STRIP= -p1 -USE_ICONV= yes +USES= iconv USE_CSTD= gnu89 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index c9b1b282b889..71e613dda5fa 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -18,8 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -USES= bison -USE_ICONV= yes +USES= bison iconv ALL_TARGET= all USE_PERL5= yes HAS_CONFIGURE= yes diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile index e7e4b7e84aa9..8e19fffd466f 100644 --- a/devel/ecore-main/Makefile +++ b/devel/ecore-main/Makefile @@ -17,9 +17,8 @@ LICENSE= BSD DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes -USES= pathfix pkgconfig +USES= pathfix pkgconfig iconv USE_EFL= eina libtool_hack -USE_ICONV= yes USE_LDCONFIG= yes EXAMPLESDIR= ${PREFIX}/share/examples/ecore diff --git a/devel/eina/Makefile b/devel/eina/Makefile index 9d17d10686c9..01169b7d7d22 100644 --- a/devel/eina/Makefile +++ b/devel/eina/Makefile @@ -15,9 +15,8 @@ LICENSE= LGPL21 DIST_SUBDIR= e17 USE_BZIP2= yes GNU_CONFIGURE= yes -USES= pathfix +USES= pathfix iconv USE_EFL= librt_hack libtool_hack -USE_ICONV= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-amalgamation diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 644f01f87843..952048823691 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile index d031a2b22386..d0a89d6e64f6 100644 --- a/devel/gdb66/Makefile +++ b/devel/gdb66/Makefile @@ -29,8 +29,7 @@ MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_GCC= any USE_GMAKE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 19620880798b..a5b74419ad1b 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= gettext MAINTAINER= autotools@FreeBSD.org COMMENT= GNU gettext package -USES= charsetfix -USE_ICONV= yes +USES= charsetfix iconv LIBTOOLFILES= gettext-runtime/configure \ gettext-runtime/libasprintf/configure gettext-tools/configure USE_AUTOTOOLS= libtool diff --git a/devel/git/Makefile b/devel/git/Makefile index 2edd49b288ff..b118c559a1b5 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -259,7 +259,7 @@ PLIST_SUB+= PERLSUB="@comment " .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv MAKE_ENV+= NEEDS_LIBICONV=yes \ ICONVDIR=${LOCALBASE} CONFIGURE_ARGS+= --with-iconv=${LOCALBASE} diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 8cde0a8189f0..e350b14c0ed6 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -24,10 +24,9 @@ PORTSCOUT= limitw:1,even LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ ffi:${PORTSDIR}/devel/libffi -USE_ICONV= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GNOME= gnomehack ltverhack USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 655559bab403..417e8d9141a2 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -16,12 +16,11 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Virtual File System -USE_ICONV= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \ - gnomemimedata gnomelibs -USES= gettext +USE_GNOME= gnomeprefix glib12 libxml gtk12 orbit gconf gnomemimedata \ + gnomelibs +USES= gettext iconv pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile index 446d041c085d..ba84c2507d6b 100644 --- a/devel/hs-haskeline/Makefile +++ b/devel/hs-haskeline/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD CABAL_SETUP= Setup.hs USE_CABAL= transformers>=0.2 -USE_ICONV= yes +USES+= iconv .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile index 851d22e0496b..c89caa3e8749 100644 --- a/devel/hwloc/Makefile +++ b/devel/hwloc/Makefile @@ -17,11 +17,10 @@ LIB_DEPENDS= pciaccess:${PORTSDIR}/devel/libpciaccess GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-static \ --enable-libxml2 -USES= pkgconfig +USES= pkgconfig pathfix iconv USE_BZIP2= yes -USE_ICONV= yes USE_LDCONFIG= yes -USE_GNOME= libxml2 gnomehack +USE_GNOME= libxml2 MAKE_JOBS_SAFE= yes PORTDOCS= * diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 92035bcfc787..295abb69a014 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -25,7 +25,7 @@ USE_PYTHON_BUILD= yes .endif USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_BDB= 42+ INVALID_BDB_VER= 2 3 40 41 USE_LDCONFIG= yes diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile index d94ea12ddde5..107d5e778426 100644 --- a/devel/libconfuse/Makefile +++ b/devel/libconfuse/Makefile @@ -19,10 +19,9 @@ COMMENT= Configuration file parsing library LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck .endif -USE_ICONV= yes +USES= iconv pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig CONFIGURE_ARGS+= --disable-nls CFLAGS+= -I${WRKSRC}/src .if defined(WITH_CHECK) diff --git a/devel/libdatrie/Makefile b/devel/libdatrie/Makefile index ef2f8d1294f0..2b63f06856d8 100644 --- a/devel/libdatrie/Makefile +++ b/devel/libdatrie/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL21 USE_XZ= yes GNU_CONFIGURE= yes -USES= pathfix -USE_ICONV= yes +USES= iconv pathfix USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/libevt/Makefile b/devel/libevt/Makefile index e8ae473dbc4c..073876e119ed 100644 --- a/devel/libevt/Makefile +++ b/devel/libevt/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= pathfix gettext -USE_ICONV= yes +USES= pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libevtx/Makefile b/devel/libevtx/Makefile index 0882d17cbeb9..6d13ff97dfba 100644 --- a/devel/libevtx/Makefile +++ b/devel/libevtx/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= pathfix gettext -USE_ICONV= yes +USES= pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile index 55465f27a8f7..62d09e94fdac 100644 --- a/devel/libewf/Makefile +++ b/devel/libewf/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid -USES= fuse pathfix gettext -USE_ICONV= yes +USES= fuse pathfix gettext iconv USE_LDCONFIG= yes USE_OPENSSL= yes USE_PYTHON= yes diff --git a/devel/libhtp/Makefile b/devel/libhtp/Makefile index 2a9aa909ea7c..dff6c82ebf33 100644 --- a/devel/libhtp/Makefile +++ b/devel/libhtp/Makefile @@ -16,8 +16,7 @@ GH_COMMIT= a334539 USE_AUTOTOOLS= libtool autoheader aclocal ACLOCAL_ARGS= -Im4 USE_LDCONFIG= yes -USE_GNOME= pkgconfig gnomehack -USE_ICONV= yes +USES= pkgconfig pathfix iconv CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile index 3fd576fff217..d08b829a7d9e 100644 --- a/devel/libisofs/Makefile +++ b/devel/libisofs/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= burn.4:${PORTSDIR}/devel/libburn GNU_CONFIGURE= yes -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/liblnk/Makefile b/devel/liblnk/Makefile index b83ce1762af1..3c09a876482e 100644 --- a/devel/liblnk/Makefile +++ b/devel/liblnk/Makefile @@ -14,8 +14,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= pathfix gettext -USE_ICONV= yes +USES= pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libmsiecf/Makefile b/devel/libmsiecf/Makefile index 7c83fecd4252..b0f8f2b5c112 100644 --- a/devel/libmsiecf/Makefile +++ b/devel/libmsiecf/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= pathfix gettext -USE_ICONV= yes +USES= pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libpff/Makefile b/devel/libpff/Makefile index 60787e53e015..75ca3f44682c 100644 --- a/devel/libpff/Makefile +++ b/devel/libpff/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= pathfix gettext -USE_ICONV= yes +USES= pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile index 8bc891e60903..cfa06420b9c1 100644 --- a/devel/libplist/Makefile +++ b/devel/libplist/Makefile @@ -12,9 +12,8 @@ LICENSE= LGPL21 USE_GNOME= libxml2 # Unlisted dependency. -USE_ICONV= yes USE_BZIP2= yes -USES= cmake +USES= cmake iconv # Required for iconv headers. CFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile index 47e5d355abfd..32f9966d05bf 100644 --- a/devel/librcc/Makefile +++ b/devel/librcc/Makefile @@ -24,9 +24,9 @@ LIB_DEPENDS= rcd.1:${PORTSDIR}/devel/librcd \ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack lthack libxml2 +USE_GNOME= lthack libxml2 USE_GMAKE= yes -USE_ICONV= yes +USES= pathfix iconv USE_LDCONFIG= yes USE_AUTOTOOLS= autoheader diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile index c69f86c380c4..73f66dee78dc 100644 --- a/devel/libregf/Makefile +++ b/devel/libregf/Makefile @@ -13,8 +13,7 @@ LICENSE= LGPL3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python -USES= fuse pathfix gettext -USE_ICONV= yes +USES= fuse pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile index 36b21448c1b9..35291f96c2fb 100644 --- a/devel/libslang2/Makefile +++ b/devel/libslang2/Makefile @@ -55,7 +55,7 @@ PLIST_SUB+= PNG="@comment " .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv PLIST_SUB+= ICONV="" .else CONFIGURE_ARGS+= --without-iconv diff --git a/devel/libunistring/Makefile b/devel/libunistring/Makefile index da140351dc68..5d7bb83f50b1 100644 --- a/devel/libunistring/Makefile +++ b/devel/libunistring/Makefile @@ -14,9 +14,8 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB -USES= charsetfix +USES= charsetfix iconv USE_GMAKE= yes -USE_ICONV= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes INFO= ${PORTNAME} diff --git a/devel/libvshadow/Makefile b/devel/libvshadow/Makefile index 6c29c77ad220..cbe5e04bc9d7 100644 --- a/devel/libvshadow/Makefile +++ b/devel/libvshadow/Makefile @@ -13,8 +13,7 @@ COMMENT= A library to support the Volume Service Snapshot (VSS) format LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= fuse pathfix gettext -USE_ICONV= yes +USES= fuse pathfix gettext iconv USE_PYTHON= yes USE_LDCONFIG= yes diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile index 5503d4be98ad..78587178cb0e 100644 --- a/devel/mingw32-binutils/Makefile +++ b/devel/mingw32-binutils/Makefile @@ -17,7 +17,7 @@ BINUTILVERSION= 2.23.1 USE_BZIP2= yes USE_GCC= any USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile index 35c3917ed899..c06acc8a4bf0 100644 --- a/devel/mingw32-gcc/Makefile +++ b/devel/mingw32-gcc/Makefile @@ -22,10 +22,9 @@ GCCVERSION= 4.7.2 ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 USE_LDCONFIG= yes -USES= bison +USES= bison iconv USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes USE_PERL5_BUILD= yes MAKE_JOBS_SAFE= yes diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index a8c6dffe9362..f962ce6a59b5 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre \ SUB_FILES= pkg-message USE_BZIP2= yes USE_PERL5_BUILD=yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes USE_LUA= 5.1+ @@ -64,7 +64,7 @@ USE_GCC= 4.2+ .endif .if ${PORT_OPTIONS:MNLS} -USES= gettext +USES+= gettext PLIST_FILES+= share/locale/de/LC_MESSAGES/monotone.mo \ share/locale/fr/LC_MESSAGES/monotone.mo \ share/locale/it/LC_MESSAGES/monotone.mo \ diff --git a/devel/motor/Makefile b/devel/motor/Makefile index 5a5b3dd9cfc0..25314a6aa3bb 100644 --- a/devel/motor/Makefile +++ b/devel/motor/Makefile @@ -16,7 +16,7 @@ COMMENT= A powerful text mode based programming IDE USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} .if !defined(WITHOUT_NLS) diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile index c3bdf43eafea..d1bead368e78 100644 --- a/devel/msp430-gcc/Makefile +++ b/devel/msp430-gcc/Makefile @@ -47,8 +47,7 @@ PATCH_WRKSRC= ${SRCDIR} USE_BZIP2= yes USE_GMAKE= yes -USES= bison -USE_ICONV= yes +USES= bison iconv USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes diff --git a/devel/objectivelib/Makefile b/devel/objectivelib/Makefile index 80e042fbac87..b2d1e469f4d3 100644 --- a/devel/objectivelib/Makefile +++ b/devel/objectivelib/Makefile @@ -16,7 +16,7 @@ USE_GNUSTEP_CONFIGURE= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USE_ICONV= yes +USES= iconv WRKSRC= ${WRKDIR}/${PORTNAME} CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} diff --git a/devel/popt/Makefile b/devel/popt/Makefile index e6282f454703..fa57e4927f4a 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -19,8 +19,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool -USES= pathfix -USE_ICONV= yes +USES= pathfix iconv USE_LDCONFIG= yes MAN3= popt.3 diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile index 5ccd55e78de9..894449307cbd 100644 --- a/devel/py-fusefs/Makefile +++ b/devel/py-fusefs/Makefile @@ -11,10 +11,9 @@ DISTNAME= fuse-python-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= FUSE Python bindings -USES= fuse pkgconfig +USES= fuse pkgconfig iconv USE_PYTHON= yes USE_PYDISTUTILS=easy_install -USE_ICONV= yes PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \ README.new_fusepy_api PORTEXAMPLES= _find_fuse_parts.py hello.py xmp.py diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 7abf7504af1d..dffe5c1a6240 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -23,8 +23,7 @@ USE_LDCONFIG= yes USE_GMAKE= yes GNU_CONFIGURE= yes WANT_GNOME= yes -USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= pathfix pkgconfig iconv CONFIGURE_ENV= ac_cv_header_libusbhid_h=no CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index fd25ea464afc..3ca1bd2bb5b9 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -9,8 +9,7 @@ DISTNAME= SDL-2.0.0-7046 MAINTAINER= mva@FreeBSD.org COMMENT= Cross-platform multimedia development API -USES= pathfix cmake:outsource -USE_ICONV= yes +USES= pathfix cmake:outsource iconv USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/devel/stfl/Makefile b/devel/stfl/Makefile index 78e7c1076c88..dc86dc1aa401 100644 --- a/devel/stfl/Makefile +++ b/devel/stfl/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_NCURSES= yes MAKE_JOBS_SAFE= yes ALL_TARGET= libstfl.so diff --git a/devel/styx/Makefile b/devel/styx/Makefile index 0a05a86ca36f..3e97bf4a9329 100644 --- a/devel/styx/Makefile +++ b/devel/styx/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A scanner/parser generator USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 9a88d9927738..fe8b5681a7d9 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} USE_GMAKE= yes -USE_ICONV= yes +USES= iconv PLIST_FILES= bin/tig diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile index f652febaf789..3bbdf2c7234f 100644 --- a/devel/xdg-user-dirs/Makefile +++ b/devel/xdg-user-dirs/Makefile @@ -14,8 +14,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Tool to help manage personal user directories GNU_CONFIGURE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_GMAKE= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile index e38321bc80f7..1f588b2f2923 100644 --- a/devel/yasm/Makefile +++ b/devel/yasm/Makefile @@ -27,8 +27,7 @@ CFLAGS:= ${CFLAGS:C/-O[0-9]//g} .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv .else CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix --without-libintl-prefix .endif diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile index b2c621c8a3ef..eb63b3346b32 100644 --- a/dns/idnkit/Makefile +++ b/dns/idnkit/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library to handle internationalized domain names USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \ --enable-runidn \ diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile index 95fd7cfd2f53..d73faffe0dcf 100644 --- a/dns/idnkit2/Makefile +++ b/dns/idnkit2/Makefile @@ -17,7 +17,7 @@ LATEST_LINK= ${PORTNAME}${PORTVERSION:R} CONFLICTS_INSTALL= idnkit-1.* USE_AUTOTOOLS= libtool -USE_ICONV= yes +USES= iconv USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile index 3d7ae6a3b8a0..450f7216ef6f 100644 --- a/dns/libidn/Makefile +++ b/dns/libidn/Makefile @@ -11,7 +11,7 @@ MAINTAINER= gaod@hychen.org COMMENT= Internationalized Domain Names command line tool USE_GNOME= gnomehack pkgconfig -USE_ICONV= yes +USES= iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_PERL5_BUILD= yes diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile index 3c8fe7ada997..774400fdb88d 100644 --- a/dns/mydns-ng/Makefile +++ b/dns/mydns-ng/Makefile @@ -13,7 +13,7 @@ COMMENT= A Next Generation DNS Server for sql based DNS services GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc -USE_ICONV= yes +USES= iconv USE_RC_SUBR= mydns diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile index c0485fc0585f..afbeced56410 100644 --- a/dns/mydns/Makefile +++ b/dns/mydns/Makefile @@ -16,7 +16,7 @@ COMMENT= DNS server designed to utilize the MySQL database GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc -USE_ICONV= yes +USES= iconv USE_BZIP2= yes USE_RC_SUBR= mydns diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index fcd118648b65..b9e5ff460797 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -26,8 +26,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes -USE_ICONV= yes -USES= pathfix gettext +USES= pathfix gettext iconv USE_GNOME= libxml2 gtk20 desktopfileutils librsvg2 libxslt MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes diff --git a/editors/biew/Makefile b/editors/biew/Makefile index e6c23ee90461..103c7fff54c1 100644 --- a/editors/biew/Makefile +++ b/editors/biew/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ARGS= --cc="${CC}" --with-extraincdir="${LOCALBASE}/include" \ --prefix="${PREFIX}" --datadir="${DATADIR}" USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_DOS2UNIX= ${PORTDOCS} MAKEFILE= makefile WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index c4314e103577..898705f2888c 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -38,7 +38,6 @@ CONFLICTS_BUILD=qt-3.* USE_GL= glew USE_GNOME= glib20 libxml2 libxslt -USE_ICONV= yes USE_KDE4= kactivities kdehier kdelibs kdeprefix libkdcraw nepomuk-core \ okular pimlibs attica automoc4 sharedmime soprano USE_PERL5= yes @@ -47,7 +46,7 @@ USE_QT4= dbus designer_build gui opengl phonon porting_build qt3support \ moc_build qmake_build rcc_build uic_build uic3_build USE_SQLITE= 3 USE_BZIP2= yes -USES= cmake:outsource pkgconfig +USES= cmake:outsource pkgconfig iconv CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \ -DIHAVEPATCHEDQT:BOOL=TRUE # To be removed with Qt 4.8.2. MAKE_JOBS_SAFE= yes diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 071b35aeb98e..81d1eee2bfa5 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -22,7 +22,7 @@ CONFLICTS= joe-2.* LICENSE= GPLv1 USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_NCURSES= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index 4036229d9f69..9bcf0014a4d4 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -20,7 +20,7 @@ CONFLICTS= joe-3* GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes +USES= iconv CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index daa71f6dac4a..bf42d2cee02c 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -63,8 +63,7 @@ RUN_DEPENDS+= fpcres:${PORTSDIR}/lang/fpc-utils \ ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \ ${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv MAN1= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message diff --git a/editors/mp/Makefile b/editors/mp/Makefile index 6cdbaaf9be1d..fc3256809a74 100644 --- a/editors/mp/Makefile +++ b/editors/mp/Makefile @@ -17,7 +17,7 @@ OPTIONS_RADIO_GUI= GTK3 GTK2 QT4 OPTIONS_DEFAULT= PCRE USE_NCURSES= yes -USE_ICONV= yes +USES= iconv HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config.sh CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 --without-kde4 diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile index 1e45e5892df7..740d822115e7 100644 --- a/editors/nvi-devel/Makefile +++ b/editors/nvi-devel/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_ICONV= yes +USES= iconv USE_BDB= 42+ CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \ --program-prefix=n diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 3e5ae63fd5d0..f5add35fa439 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -25,7 +25,7 @@ GTK2_DESC= Use GTK2 instead of MOTIF WRKSRC= ${WRKDIR}/Ted-${PORTVERSION} USE_XORG= xext xft -USE_ICONV= yes +USES= iconv USE_GHOSTSCRIPT_RUN= yes GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile index 899f532f2cd5..172732e678ee 100644 --- a/editors/texmacs/Makefile +++ b/editors/texmacs/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+= --without-gs .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-iconv="${LOCALBASE}" .else CONFIGURE_ARGS+= --without-iconv diff --git a/editors/vile/Makefile b/editors/vile/Makefile index d56c613370b8..63ef6a6190fa 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -37,7 +37,7 @@ PLIST_SUB+= SO_EXT="" .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-iconv PLIST_SUB+= ICONV="" .else diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 5f7a7a87eb66..6c2174db29ce 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -166,7 +166,7 @@ MAKE_ARGS+= CONF_OPT_GUI=${CONF_OPT_GUI} ${I18N} .if exists(${LOCALBASE}/lib/libiconv.so) -USE_ICONV= yes +USES+= iconv .endif diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 2a91786d117f..22081523a30f 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -48,7 +48,7 @@ PLIST_SUB+= SO_EXT="" .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= --with-iconv PLIST_SUB+= ICONV="" .else diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile index e87dd033c682..bb942bc84fbb 100644 --- a/emulators/catapult/Makefile +++ b/emulators/catapult/Makefile @@ -34,8 +34,7 @@ USE_GNOME= gdkpixbuf2 glib20 gtk20 libxml2 USE_WX= 2.6+ USE_PYTHON_BUILD=yes USE_GMAKE= yes -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \ xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE= GNUmakefile diff --git a/emulators/dolphin-emu-devel/Makefile b/emulators/dolphin-emu-devel/Makefile index 9c954915af65..ffbca9f5ab06 100644 --- a/emulators/dolphin-emu-devel/Makefile +++ b/emulators/dolphin-emu-devel/Makefile @@ -21,7 +21,6 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ REVDATE= 20130415 -USE_ICONV= yes USE_SDL= sdl USE_OPENAL= yes USE_XORG= ice xext x11 xrandr @@ -37,7 +36,7 @@ DOS2UNIX_REGEX= .*\.(h|c|cpp) USE_GCC= 4.6+ .endif -USES= cmake pkgconfig +USES= cmake pkgconfig iconv CMAKE_BUILD_TYPE= Release # Disable ao (seems buggy) and ALSA (emulated) CMAKE_ARGS+= -DDISABLE_AO:BOOL=ON \ diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile index 7caf6b3e65ea..47f97a2d626a 100644 --- a/emulators/mtools/Makefile +++ b/emulators/mtools/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFAULT=ICONV X11 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -liconv .else diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile index 4d38943049e9..c50890407377 100644 --- a/emulators/pcsxr/Makefile +++ b/emulators/pcsxr/Makefile @@ -32,7 +32,7 @@ USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp|am) USE_GNOME= gtk30 desktopfileutils glib20 -USE_ICONV= yes +USES= iconv USE_XORG= x11 xv xext xxf86vm xtst USE_SDL= sdl USE_GL= gl diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 932db7faaab4..9a67841acc2b 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -22,11 +22,10 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ xcb:${PORTSDIR}/x11/libxcb -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 USE_PERL5= yes USE_GMAKE= yes -USE_ICONV= yes USE_AUTOTOOLS= libtool libltdl CONFIGURE_ENV= ac_cv_have_isinff=no CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings diff --git a/emulators/vmw/Makefile b/emulators/vmw/Makefile index c6d1221edc00..091b481db822 100644 --- a/emulators/vmw/Makefile +++ b/emulators/vmw/Makefile @@ -10,7 +10,7 @@ COMMENT= VM Back Command Line Tools for VMware ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/${PORTNAME}/src -USE_ICONV= yes +USES= iconv SBINS= vmw vmshrink vmftp diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile index 15e4173e107e..3f3fef5556c0 100644 --- a/emulators/xcpc/Makefile +++ b/emulators/xcpc/Makefile @@ -16,9 +16,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--prefix=${PREFIX} USE_XORG= ice -USE_GNOME= pkgconfig glib20 -USE_ICONV= yes -USES= gettext +USE_GNOME= glib20 +USES= gettext iconv pkgconfig LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu \ pcre.3:${PORTSDIR}/devel/pcre \ diff --git a/finance/eqonomize-kde4/Makefile b/finance/eqonomize-kde4/Makefile index 52fa92ce7b43..a0e2db2eac09 100644 --- a/finance/eqonomize-kde4/Makefile +++ b/finance/eqonomize-kde4/Makefile @@ -13,8 +13,7 @@ COMMENT= A personal accounting software USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT4= corelib dbus gui network svg xml qmake_build moc_build uic_build rcc_build -USES= cmake gettext -USE_ICONV= yes +USES= cmake gettext iconv INSTALLS_ICONS= yes DATADIR= ${PREFIX}/share/apps/${PORTNAME} diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile index 9895c1a9028f..048e9045e372 100644 --- a/finance/grisbi/Makefile +++ b/finance/grisbi/Makefile @@ -19,7 +19,7 @@ LICENSE= GPLv2 LIB_DEPENDS= ofx.5:${PORTSDIR}/finance/libofx USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk20 glib20 libxml2 diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index 5f031e8102c0..a4536735f09b 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ GNU_CONFIGURE= yes USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ xi xinerama xrandr xrender USE_GNOME= desktopfileutils gnomehier gtk20 diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile index 55bdb2246968..935fe870e28e 100644 --- a/finance/libofx/Makefile +++ b/finance/libofx/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ osp.5:${PORTSDIR}/textproc/opensp USE_GCC= any -USE_ICONV= yes +USES= iconv USE_GMAKE= yes USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool ACLOCAL_ARGS= -I m4 diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile index 82fb2df405e4..c3f92a13fe35 100644 --- a/french/verbiste/Makefile +++ b/french/verbiste/Makefile @@ -13,10 +13,9 @@ OPTIONS_DEFINE= GTK2 GNOME LICENSE= GPLv2 -USES= pathfix pkgconfig +USES= pathfix pkgconfig iconv USE_AUTOTOOLS= libtool USE_GNOME= ltverhack libxml2 -USE_ICONV= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile index d3017241541e..e64b9d5f3511 100644 --- a/ftp/axel/Makefile +++ b/ftp/axel/Makefile @@ -21,8 +21,7 @@ OPTIONS_DEFINE= NLS DEBUG .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_ICONV= yes +USES+= gettext iconv PLIST_SUB+= NLS="" CONFIGURE_ARGS+=--i18n=1 .else diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index 29c34621c415..cd6c486d9aa5 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -20,7 +20,7 @@ LICENSE= GPLv3 LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 -USE_ICONV= yes +USES= iconv CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 1659a586a03c..de4b8937e3e2 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -110,7 +110,7 @@ CONFIGURE_ARGS+= --with-uploadscript # RFC 2640 charset conversion requested? .if ${PORT_OPTIONS:MUTF8} -USE_ICONV= YES +USES+= iconv CONFIGURE_ARGS+= --with-rfc2640 .endif diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile index b3d42f845b35..6abc425f6b29 100644 --- a/ftp/smbftpd/Makefile +++ b/ftp/smbftpd/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= "--with-pgsql" .endif .if ${PORT_OPTIONS:MICONV} -USE_ICONV= yes +USES+= iconv CONFIGURE_ARGS+= "--with-iconv" .endif diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile index e0a37e41933c..b2797864451b 100644 --- a/ftp/wput/Makefile +++ b/ftp/wput/Makefile @@ -35,8 +35,7 @@ CONFIGURE_ARGS+= --without-ssl .endif .if ${PORT_OPTIONS:MNLS} -USE_ICONV= yes -USES+= gettext +USES+= gettext iconv CONFIGURE_ARGS+= --enable-nls \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 5853f222e345..3c515c1dfa5c 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -40,7 +40,7 @@ MAN8= wzdftpd.8 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MUTF8} -USE_ICONV= yes +USES+= iconv .else CONFIGURE_ARGS+= --disable-utf8 .endif diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile index 013d07cebebe..4115e2617ff5 100644 --- a/games/briquolo/Makefile +++ b/games/briquolo/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png LICENSE= GPLv2 USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_GL= gl USE_SDL= mixer sdl ttf USE_GMAKE= yes diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile index ac20b91f86d9..e770ea454552 100644 --- a/games/capitalism/Makefile +++ b/games/capitalism/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ xcb:${PORTSDIR}/x11/libxcb -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_XORG= ice sm x11 xau xdmcp xext xrender USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ corelib gui network script xml diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile index 192db2f353da..94e625d778a2 100644 --- a/games/cosmosmash/Makefile +++ b/games/cosmosmash/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= flatzebra:${PORTSDIR}/devel/flatzebra \ USE_SDL= sdl image mixer USE_XORG= x11 xau xdmcp -USE_ICONV= yes +USES= iconv USE_GNOME= desktopfileutils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile index 2577d45f68ae..072017e50645 100644 --- a/games/cuyo/Makefile +++ b/games/cuyo/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_SDL= mixer image USE_XORG= xdmcp xau x11 -USE_ICONV= yes +USES= iconv INSTALLS_ICONS= yes MAN6= cuyo.6 cual.6 diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile index 1f7fb2775782..bcb843238b17 100644 --- a/games/freedroid/Makefile +++ b/games/freedroid/Makefile @@ -13,7 +13,7 @@ COMMENT= Clone of the Commodore game Paradroid LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png -USE_ICONV= yes +USES= iconv USE_SDL= mixer image sdl GNU_CONFIGURE= yes diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile index 911be93c4ca1..9e3bef8eba1b 100644 --- a/games/gnmm/Makefile +++ b/games/gnmm/Makefile @@ -11,9 +11,8 @@ DIST_SUBDIR= gnome MAINTAINER= ports@FreeBSD.org COMMENT= A "nine mens' morris" implementation for the GNOME Desktop Environment -USE_ICONV= yes USE_GMAKE= yes -USES= pathfix gettext +USES= pathfix gettext iconv USE_GNOME= gnomeprefix gnomelibs gdkpixbuf GNU_CONFIGURE= yes diff --git a/games/heroes/Makefile b/games/heroes/Makefile index 705965bfaa81..66ceb53ca492 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -36,8 +36,7 @@ MUSICSRC= ${WRKDIR}/${MUSICDISTNAME} USE_SDL= mixer sdl USE_GMAKE= yes -USE_ICONV= yes -USES= gettext +USES= gettext iconv GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi diff --git a/games/instead/Makefile b/games/instead/Makefile index 37f32938dcc8..08ab214f97e1 100644 --- a/games/instead/Makefile +++ b/games/instead/Makefile @@ -13,10 +13,10 @@ COMMENT= Simple Text Adventure, The Interpreter HAS_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gtk20 +USE_GNOME= gtk20 USE_LUA= 5.1 USE_SDL= sdl image ttf mixer -USE_ICONV= yes +USES= pkgconfig iconv CONFIGURE_SCRIPT= configure.sh CONFIGURE_ENV= PREFIX="${PREFIX}" diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile index c3d7a4173f80..8b9a8b2d28e2 100644 --- a/games/kajaani-kombat/Makefile +++ b/games/kajaani-kombat/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 USE_SDL= sdl image mixer net ttf USE_GMAKE= yes ALL_TARGET= client server -USE_ICONV= yes +USES= iconv MAKE_JOBS_SAFE= yes PORTDOCS= AUTHORS ChangeLog README diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile index 7ea93b2e5337..9fedf73ce24a 100644 --- a/games/klavaro/Makefile +++ b/games/klavaro/Makefile @@ -22,10 +22,9 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \ xcb:${PORTSDIR}/x11/libxcb -USES= pkgconfig gettext +USES= pkgconfig gettext iconv USE_BZIP2= yes USE_GMAKE= yes -USE_ICONV= yes USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME= gtk20 diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile index 5024ebd444c3..2e56ce6d9488 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes USE_OPENSSL= yes -USE_ICONV= yes +USES= iconv CONFIGURE_ARGS+=--libdir=${DATADIR} \ --bindir=${PREFIX}/sbin \ --enable-use-pcre \ diff --git a/games/netwalk/Makefile b/games/netwalk/Makefile index 381739d4f422..cd901fb965ee 100644 --- a/games/netwalk/Makefile +++ b/games/netwalk/Makefile @@ -24,7 +24,7 @@ GH_COMMIT= 634e7c9 USE_SDL= sdl ttf USE_GMAKE= yes -USE_ICONV= yes +USES= iconv USE_XORG= x11 xau xdmcp ALL_TARGET= MAKE_JOBS_SAFE= yes diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile index 08c5519bccf2..3e1b22550b40 100644 --- a/games/openalchemist/Makefile +++ b/games/openalchemist/Makefile @@ -28,11 +28,11 @@ ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} GNU_CONFIGURE= yes -USE_GNOME= pkgconfig pygtk2 +USE_GNOME= pygtk2 USE_XORG= xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice USE_GL= gl glu USE_SDL= sdl gfx -USE_ICONV= yes +USES= pkgconfig iconv PORTDOCS= AUTHORS ChangeLog README TODO diff --git a/games/pingus/Makefile b/games/pingus/Makefile index 1f4ae7aaecf5..2db97391d38f 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ physfs.1:${PORTSDIR}/devel/physfs USE_BZIP2= yes -USE_ICONV= yes +USES= iconv USE_SCONS= yes SCONS_ARGS= with_linuxusbmouse=0 \ with_linuxevdev=0 diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index ef8c7075e122..a07d23872c1c 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ protobuf:${PORTSDIR}/devel/protobuf BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient -USE_ICONV= yes +USES= iconv USE_BZIP2= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 4bb4e9bec1e0..2b1ef88918a1 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -34,7 +34,7 @@ LICENSE= GPLv2 LIB_DEPENDS= smpeg:${PORTSDIR}/multimedia/smpeg EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -USE_ICONV= yes +USES= iconv USE_SDL= image mixer net sdl USE_GMAKE= yes MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index a60d03313477..00915fc5479f 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -35,7 +35,7 @@ USE_SDL= mixer net sdl USE_WX= 2.4+ WX_CONF_ARGS= absolute USE_PERL5= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes USE_AUTOTOOLS= aclocal automake autoconf ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile index c6aa8fdedd83..3b8c885cbf61 100644 --- a/games/spellathon/Makefile +++ b/games/spellathon/Makefile @@ -21,8 +21,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ xcb:${PORTSDIR}/x11/libxcb CXXFLAGS+= -fPIC -USES= gettext -USE_ICONV= yes +USES= gettext iconv USE_GNOME= glib20 USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build USE_XORG= ice sm x11 xau xdmcp xext xrender diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile index b385e2cf178e..7605ffdafb03 100644 --- a/games/starfighter/Makefile +++ b/games/starfighter/Makefile @@ -17,7 +17,7 @@ COMMENT= Liberate the universe from the evil company WEAPCO LICENSE= GPLv2 -USE_ICONV= yes +USES= iconv USE_XORG= x11 xau xdmcp USE_SDL= image mixer WITH_ZLIB= yes diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile index 480bbd2fec9f..43a18565ba9a 100644 --- a/games/stepmania-devel/Makefile +++ b/games/stepmania-devel/Makefile @@ -28,10 +28,9 @@ PROJECTHOST= sm-ssc USE_BZIP2= yes USE_XORG= x11 xau xdmcp xext xrandr xrender xtst USE_GL= gl glu -USES= pathfix +USES= pathfix iconv USE_GNOME= gtk20 USE_PERL5_BUILD=yes -USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-ffmpeg INSTALLS_ICONS= yes diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile index a80e7a74ecaa..c19d326450f4 100644 --- a/games/tuxmath/Makefile +++ b/games/tuxmath/Makefile @@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION} USE_GNOME= libxml2 USE_SDL= image mixer net pango sdl USE_PERL5= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \ diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile index 4bd48001f704..2bc1ee74cdcc 100644 --- a/games/tuxtype/Makefile +++ b/games/tuxtype/Makefile @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION} USE_GNOME= libxml2 USE_SDL= image mixer net pango sdl USE_PERL5= yes -USE_ICONV= yes +USES= iconv USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \ |