svn commit: r316695 - in head: comms/efax-gtk comms/minicom comms/obexapp comms/scmxx converters/libiconv lang/fpc lang/gcc-aux lang/ghc lang/gnat-aux lang/php5 lang/php52 lang/php53 multimedia/avi...
Baptiste Daroussin
bapt at FreeBSD.org
Sat Apr 27 22:09:20 UTC 2013
Author: bapt
Date: Sat Apr 27 22:09:15 2013
New Revision: 316695
URL: http://svnweb.freebsd.org/changeset/ports/316695
Log:
Convert the last USE_ICONV to USES=iconv
Modified:
head/comms/efax-gtk/Makefile
head/comms/minicom/Makefile
head/comms/obexapp/Makefile
head/comms/scmxx/Makefile
head/converters/libiconv/Makefile
head/lang/fpc/Makefile.units
head/lang/gcc-aux/Makefile.common
head/lang/ghc/bsd.cabal.mk
head/lang/gnat-aux/Makefile.common
head/lang/php5/Makefile.ext
head/lang/php52/Makefile.ext
head/lang/php53/Makefile.ext
head/multimedia/avidemux2/Makefile.common
head/multimedia/mplayer/Makefile.shared
head/print/ghostscript8/files/Makefile.drivers_post
head/print/ghostscript9/files/Makefile.drivers_post
head/x11-toolkits/gtkglext/Makefile
head/x11-toolkits/open-motif/Makefile
head/x11-toolkits/p5-Prima/Makefile
head/x11-toolkits/ruby-wx/Makefile
head/x11-toolkits/scintilla/Makefile
head/x11-toolkits/termit/Makefile
head/x11-toolkits/wxgtk26/Makefile
head/x11-toolkits/wxgtk28/Makefile
head/x11-toolkits/wxgtk29/Makefile
Modified: head/comms/efax-gtk/Makefile
==============================================================================
--- head/comms/efax-gtk/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/comms/efax-gtk/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -27,8 +27,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d
xcb:${PORTSDIR}/x11/libxcb
RUN_DEPENDS= ggv:${PORTSDIR}/print/ggv
-USES= pkgconfig
-USE_ICONV= yes
+USES= pkgconfig iconv
USE_GHOSTSCRIPT_RUN=yes
USE_GNOME= gdkpixbuf2 gtk20
GNU_CONFIGURE= yes
Modified: head/comms/minicom/Makefile
==============================================================================
--- head/comms/minicom/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/comms/minicom/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -14,7 +14,7 @@ OPTIONS_DEFINE= LRZSZ
OPTIONS_DEFAULT=LRZSZ
LRZSZ_DESC= Install X/Y/ZMODEM protocol handlers
-USE_ICONV= yes
+USES= iconv
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
Modified: head/comms/obexapp/Makefile
==============================================================================
--- head/comms/obexapp/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/comms/obexapp/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -14,7 +14,7 @@ LIB_DEPENDS= openobex:${PORTSDIR}/comms/
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_ICONV= yes
+USES= iconv
PLIST_FILES= bin/obexapp
MAKE_JOBS_SAFE= yes
Modified: head/comms/scmxx/Makefile
==============================================================================
--- head/comms/scmxx/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/comms/scmxx/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -12,8 +12,7 @@ COMMENT= Data exchange utility for Sieme
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/converters/libiconv/Makefile
==============================================================================
--- head/converters/libiconv/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/converters/libiconv/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -30,11 +30,6 @@ OPTIONS_DEFAULT=ENCODINGS
ENCODINGS_DESC= Include extra character sets
PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS
-.ifdef USE_ICONV
-.error USE_ICONV is defined as an environment variable, or in the arguments \
- to "make". Please unset it and restart the build.
-.endif
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MENCODINGS}
Modified: head/lang/fpc/Makefile.units
==============================================================================
--- head/lang/fpc/Makefile.units Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/fpc/Makefile.units Sat Apr 27 22:09:15 2013 (r316695)
@@ -139,7 +139,7 @@ USE_FIREBIRD= yes
.endif
.if ${PKGNAMESUFFIX} == "-iconvenc"
-USE_ICONV= yes
+USES+= iconv
.endif
.if ${PKGNAMESUFFIX} == "-ide"
Modified: head/lang/gcc-aux/Makefile.common
==============================================================================
--- head/lang/gcc-aux/Makefile.common Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/gcc-aux/Makefile.common Sat Apr 27 22:09:15 2013 (r316695)
@@ -9,7 +9,7 @@ ONLY_FOR_ARCHS= i386 amd64
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD= yes
ALL_TARGET= default
MAKE_JOBS_SAFE= yes
Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/ghc/bsd.cabal.mk Sat Apr 27 22:09:15 2013 (r316695)
@@ -99,7 +99,7 @@ CONFIGURE_ARGS+= --with-c2hs=${C2HS_CMD}
.if defined(EXECUTABLE)
LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
-USE_ICONV= yes
+USES+= iconv
.endif
.if defined(USE_CABAL)
Modified: head/lang/gnat-aux/Makefile.common
==============================================================================
--- head/lang/gnat-aux/Makefile.common Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/gnat-aux/Makefile.common Sat Apr 27 22:09:15 2013 (r316695)
@@ -9,7 +9,7 @@ ONLY_FOR_ARCHS= i386 amd64
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD= yes
ALL_TARGET= default
MAKE_JOBS_SAFE= yes
Modified: head/lang/php5/Makefile.ext
==============================================================================
--- head/lang/php5/Makefile.ext Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/php5/Makefile.ext Sat Apr 27 22:09:15 2013 (r316695)
@@ -128,7 +128,7 @@ CONFIGURE_ARGS+=--enable-hash \
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
.endif
.if ${PHP_MODNAME} == "imap"
@@ -427,7 +427,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc
Modified: head/lang/php52/Makefile.ext
==============================================================================
--- head/lang/php52/Makefile.ext Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/php52/Makefile.ext Sat Apr 27 22:09:15 2013 (r316695)
@@ -136,7 +136,7 @@ CONFIGURE_ARGS+=--enable-hash
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
.endif
.if ${PHP_MODNAME} == "imap"
@@ -481,7 +481,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc
Modified: head/lang/php53/Makefile.ext
==============================================================================
--- head/lang/php53/Makefile.ext Sat Apr 27 20:58:01 2013 (r316694)
+++ head/lang/php53/Makefile.ext Sat Apr 27 22:09:15 2013 (r316695)
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=--enable-hash \
.if ${PHP_MODNAME} == "iconv"
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
.endif
.if ${PHP_MODNAME} == "imap"
@@ -432,7 +432,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc
Modified: head/multimedia/avidemux2/Makefile.common
==============================================================================
--- head/multimedia/avidemux2/Makefile.common Sat Apr 27 20:58:01 2013 (r316694)
+++ head/multimedia/avidemux2/Makefile.common Sat Apr 27 22:09:15 2013 (r316695)
@@ -23,9 +23,8 @@ USE_GNOME= libxml2
USE_QT4= # empty
USE_GMAKE= yes
-USE_ICONV= yes
WANT_SDL= yes
-USES= cmake:outsource pkgconfig
+USES= cmake:outsource pkgconfig iconv
CMAKE_USE_PTHREAD=yes
CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
MAKE_JOBS_UNSAFE= yes
Modified: head/multimedia/mplayer/Makefile.shared
==============================================================================
--- head/multimedia/mplayer/Makefile.shared Sat Apr 27 20:58:01 2013 (r316694)
+++ head/multimedia/mplayer/Makefile.shared Sat Apr 27 22:09:15 2013 (r316695)
@@ -22,9 +22,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/
BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+USES= iconv
USE_XZ= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_NCURSES= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
Modified: head/print/ghostscript8/files/Makefile.drivers_post
==============================================================================
--- head/print/ghostscript8/files/Makefile.drivers_post Sat Apr 27 20:58:01 2013 (r316694)
+++ head/print/ghostscript8/files/Makefile.drivers_post Sat Apr 27 22:09:15 2013 (r316695)
@@ -108,7 +108,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NGS_${D}}
.endfor
.if defined(_ICONV_DEVS)
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+=--with-libiconv=gnu
EXTRALIBS+= -liconv
.else
Modified: head/print/ghostscript9/files/Makefile.drivers_post
==============================================================================
--- head/print/ghostscript9/files/Makefile.drivers_post Sat Apr 27 20:58:01 2013 (r316694)
+++ head/print/ghostscript9/files/Makefile.drivers_post Sat Apr 27 22:09:15 2013 (r316695)
@@ -110,7 +110,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NGS_${D}}
.endfor
.if defined(_ICONV_DEVS)
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+=--with-libiconv=gnu
EXTRALIBS+= -liconv
.else
Modified: head/x11-toolkits/gtkglext/Makefile
==============================================================================
--- head/x11-toolkits/gtkglext/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/gtkglext/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -26,13 +26,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d
OPTIONS_DEFINE= DOCS
USE_BZIP2= yes
-USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xmu xrandr xrender xt xxf86vm
USE_GL= glu
-USES= pathfix pkgconfig gettext
+USES= pathfix pkgconfig gettext iconv
USE_GNOME= gdkpixbuf2 gtk20
USE_LDCONFIG= yes
Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/open-motif/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -23,8 +23,8 @@ CONFLICTS= lesstif-[0-9]*
# WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC= ${WRKDIR}/motif-${PORTVERSION}
+USES= iconv
USE_AUTOTOOLS= libtool autoconf:env automake:env
-USE_ICONV= yes
USE_GMAKE= yes
USE_XORG= xaw xbitmaps xft
GNU_CONFIGURE= yes
Modified: head/x11-toolkits/p5-Prima/Makefile
==============================================================================
--- head/x11-toolkits/p5-Prima/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/p5-Prima/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -136,7 +136,7 @@ MAN3= Prima.3 \
.if ${PORT_OPTIONS:MXFT}
USE_XORG+= xft
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
.else
CONFIGURE_ARGS+=WITH_ICONV=0
.endif
Modified: head/x11-toolkits/ruby-wx/Makefile
==============================================================================
--- head/x11-toolkits/ruby-wx/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/ruby-wx/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -17,7 +17,7 @@ COMMENT= Ruby bindings for wxWindows (ak
DEPRECATED= Does not work with Ruby 1.9
EXPIRATION_DATE= 2013-05-02
-USE_ICONV= yes
+USES= iconv
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
USE_WX= 2.4
Modified: head/x11-toolkits/scintilla/Makefile
==============================================================================
--- head/x11-toolkits/scintilla/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/scintilla/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -13,8 +13,8 @@ COMMENT= Full-featured free source code
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
+USES= iconv
USE_GMAKE= yes
-USE_ICONV= yes
MAKEFILE= makefile
USE_LDCONFIG= yes
USE_GNOME= gtk20
Modified: head/x11-toolkits/termit/Makefile
==============================================================================
--- head/x11-toolkits/termit/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/termit/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -22,8 +22,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d
xcb:${PORTSDIR}/x11/libxcb
USE_BZIP2= yes
-USES= cmake pkgconfig
-USE_ICONV= yes
+USES= cmake pkgconfig iconv
USE_LUA= yes
USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
xi xinerama xrandr xrender
Modified: head/x11-toolkits/wxgtk26/Makefile
==============================================================================
--- head/x11-toolkits/wxgtk26/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/wxgtk26/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: wxgtk26
-# Date created: June 27, 2004
-# Whom: fjoe at FreeBSD.ORG
-#
+# Created by: fjoe at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= wx
PORTVERSION= 2.6.4
@@ -22,12 +18,12 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics
expat.6:${PORTSDIR}/textproc/expat2\
mspack.1:${PORTSDIR}/archivers/libmspack
+USES= iconv
USE_BZIP2= yes
USE_XORG= x11 sm xxf86vm xinerama
USE_GL= glu
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_ICONV= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
Modified: head/x11-toolkits/wxgtk28/Makefile
==============================================================================
--- head/x11-toolkits/wxgtk28/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/wxgtk28/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -17,12 +17,12 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2
+USES= iconv
USE_BZIP2= yes
USE_XORG= x11 sm xxf86vm xinerama
USE_GL= glu
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_ICONV= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
Modified: head/x11-toolkits/wxgtk29/Makefile
==============================================================================
--- head/x11-toolkits/wxgtk29/Makefile Sat Apr 27 20:58:01 2013 (r316694)
+++ head/x11-toolkits/wxgtk29/Makefile Sat Apr 27 22:09:15 2013 (r316695)
@@ -19,13 +19,13 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics
inotify.0:${PORTSDIR}/devel/libinotify\
webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+USES+= iconv
USE_BZIP2= yes
USE_GCC= any
USE_XORG= x11 sm xxf86vm xinerama
USE_GL= glu
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_ICONV= yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
More information about the svn-ports-head
mailing list