Index: head/Mk/Uses/iconv.mk =================================================================== --- head/Mk/Uses/iconv.mk (revision 325936) +++ head/Mk/Uses/iconv.mk (revision 325937) @@ -1,21 +1,29 @@ # $FreeBSD$ # # handle dependency on the iconv port # # MAINTAINER: portmgr@FreeBSD.org # # Feature: iconv -# Usage: USES=iconv -# Valid ARGS: does not require args +# Usage: USES=iconv or USES=iconv:ARGS +# Valid ARGS: lib (default, implicit), build, patch # # .if !defined(_INCLUDE_USES_ICONV_MK) _INCLUDE_USES_ICONV_MK= yes -.if defined(iconv_ARGS) -IGNORE= USES=iconv does not require args +ICONV_CMD= ${LOCALBASE}/bin/iconv + +.if !defined(iconv_ARGS) +iconv_ARGS= lib .endif +.if ${iconv_ARGS} == "lib" LIB_DEPENDS+= libiconv.so.3:${PORTSDIR}/converters/libiconv +.elif ${iconv_ARGS} == "build" +BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv +.elif ${iconv_ARGS} == "patch" +PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv +.endif .endif Index: head/devel/common_lib/Makefile =================================================================== --- head/devel/common_lib/Makefile (revision 325936) +++ head/devel/common_lib/Makefile (revision 325937) @@ -1,54 +1,54 @@ # $FreeBSD$ PORTNAME= common_lib PORTVERSION= 3.3.4 CATEGORIES= devel MASTER_SITES= GH MAINTAINER= olgeni@FreeBSD.org COMMENT= Library of commonly used Erlang functions BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang \ - txt2tags:${PORTSDIR}/textproc/txt2tags \ - iconv:${PORTSDIR}/converters/libiconv + txt2tags:${PORTSDIR}/textproc/txt2tags RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang PLIST_SUB= VERSION="${PORTVERSION}" USE_GITHUB= yes GH_ACCOUNT= iamaleksey GH_PROJECT= common_lib GH_COMMIT= c242861 GH_TAGNAME= ${PORTVERSION} USE_GMAKE= yes USE_DOS2UNIX= Makefile ALL_TARGET= compile doc +USES= iconv:build MAN1= common_lib.1 MAN3= cl_application.3 cl_binary.3 cl_calendar.3 cl_consumer.3 \ cl_csv.3 cl_dqueue.3 cl_lists.3 cl_math.3 cl_pool.3 cl_queue.3 \ cl_queue_srv.3 cl_queue_tab.3 cl_stats.3 cl_string.3 cl_timer.3 .include post-extract: @${REINPLACE_CMD} -e "s@<@<@g" -e "s@>@>@g" ${WRKSRC}/doc/*.ndoc do-install: .for manpage in ${MAN1} ${MAN3} - @iconv -f UTF-8 -t ISO-8859-1 ${WRKSRC}/doc/man/${manpage} > ${WRKSRC}/doc/man/${manpage}.iconv + @${ICONV_CMD} -f UTF-8 -t ISO-8859-1 ${WRKSRC}/doc/man/${manpage} > ${WRKSRC}/doc/man/${manpage}.iconv .endfor .for manpage in ${MAN1} @${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage}.iconv ${MAN1PREFIX}/man/man1/${manpage} .endfor .for manpage in ${MAN3} @${INSTALL_MAN} ${WRKSRC}/doc/man/${manpage}.iconv ${MAN3PREFIX}/man/man3/${manpage} .endfor @${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION} @${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin @${MKDIR} ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src @${INSTALL_DATA} ${WRKSRC}/ebin/* ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/ebin @${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/common_lib-${PORTVERSION}/src .include Index: head/devel/liblangtag/Makefile =================================================================== --- head/devel/liblangtag/Makefile (revision 325936) +++ head/devel/liblangtag/Makefile (revision 325937) @@ -1,28 +1,27 @@ # $FreeBSD$ PORTNAME= liblangtag PORTVERSION= 0.5.1 CATEGORIES= devel textproc MASTER_SITES= https://cdn.bitbucket.org/tagoh/liblangtag/downloads/ \ LOCAL MASTER_SITE_SUBDIR= jkim MAINTAINER= office@FreeBSD.org COMMENT= An interface library to access tags for identifying languages LICENSE= LGPL3 MPL LICENSE_COMB= dual -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes -USES= pathfix pkgconfig +USES= iconv:build pathfix pkgconfig CONFIGURE_ARGS= --disable-introspection .include Index: head/emulators/vice/Makefile =================================================================== --- head/emulators/vice/Makefile (revision 325936) +++ head/emulators/vice/Makefile (revision 325937) @@ -1,168 +1,167 @@ # Created by: dchapes@ddm.on.ca # $FreeBSD$ PORTNAME= vice PORTVERSION= 2.4 PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ gif:${PORTSDIR}/graphics/giflib \ mp3lame:${PORTSDIR}/audio/lame .if defined(VICE_WITH_XAW3D) LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d .endif RESTRICTED= ROMs are copyrighted by Commodore Business Machines LICENSE= GPLv2 USES= pkgconfig USE_XORG= xpm ice sm xext xv xt x11 xmu USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" .if defined(VICE_WITH_XAW3D) GNOME_SUFFIX= -xaw3d CONFIGURE_ARGS= --with-xaw3d --disable-gnomeui CONFLICTS?= vice-gnome-1.* vice-1.* .else .if !defined(VICE_WITHOUT_GNOME) GNOME_SUFFIX= -gnome USE_GNOME= gtk20 vte CONFIGURE_ARGS= --enable-gnomeui CONFLICTS?= vice-1.* vice-xaw3d-1.* .else CONFIGURE_ARGS= --without-xaw3d --disable-gnomeui CONFLICTS?= vice-xaw3d-1.* vice-gnome-1.* USE_XORG+= xaw .endif .endif CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 --disable-dependency-tracking #CONFIGURE_ARGS+= --enable-ethernet # libpcap or libnet #CONFIGURE_ARGS+= --enable-sdlui #CONFIGURE_ARGS+= --enable-gp2x #CONFIGURE_ARGS+= --enable-wiz #CONFIGURE_ARGS+= --enable-parsid #CONFIGURE_ARGS+= --enable-memmap Optional Features: MAN1= vice.1 c1541.1 petcat.1 MLINKS= vice.1 x64.1 \ vice.1 x128.1 \ vice.1 xvic.1 \ vice.1 xpet.1 \ vice.1 xplus4.1 \ vice.1 xcbm2.1 FIX_XAW= src/arch/unix/x11/xaw/about.c \ src/arch/unix/x11/xaw/uicartridge.c \ src/arch/unix/x11/xaw/uiedisk.c \ src/arch/unix/x11/xaw/uimenu.c \ src/arch/unix/x11/xaw/uiscreenshot.c \ src/arch/unix/x11/xaw/uisnapshot.c \ src/arch/unix/x11/xaw/x11ui.c \ src/arch/unix/x11/xaw/widgets/FileSel.c \ src/arch/unix/x11/xaw/widgets/FileSelP.h \ src/arch/unix/x11/xaw/widgets/MultiList.h \ src/arch/unix/x11/xaw/widgets/MultiListP.h \ src/arch/unix/x11/xaw/widgets/ScrList.c \ .include .if ${PORT_OPTIONS:MDOCS} INFO= vice .endif .if exists(${LOCALBASE}/bin/fc-cache) PLIST_SUB+= FCCACHE="" PLIST_SUB+= NOFCCACHE="@comment " .else PLIST_SUB+= FCCACHE="@comment " PLIST_SUB+= NOFCCACHE="" .endif # will be picked up by configure .if exists(${LOCALBASE}/include/ffmpeg/avformat.h) LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext -PATCH_DEPENDS+= ${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv +USES+= gettext iconv:patch CONFIGURE_ARGS+= --enable-nls --localedir=${LOCALBASE}/share/locale # causes vice to crash: #LDFLAGS+= -lgettextlib PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_SDL) USE_SDL= sdl CONFIGURE_ARGS+= --with-sdlsound CPPFLAGS+= -I${LOCALBASE}/include/SDL .endif .if defined(VICE_WITH_ASOUND) LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib .endif post-extract: @${RM} -f ${WRKSRC}/doc/vice.info* post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/man/vice.1 ${REINPLACE_CMD} -e "s|^localedir.*|localedir = ${LOCALBASE}/share/locale|" \ ${WRKSRC}/po/Makefile.in.in ${REINPLACE_CMD} -e 's|lungif|lgif|g' -e 's|== "x|= "x|' \ -e 's|"DATADIRNAME"/locale|share/locale|' \ ${WRKSRC}/configure .for i in da.po de.po fr.po hu.po it.po nl.po pl.po sv.po tr.po ${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin" - ${LOCALBASE}/bin/iconv -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}" + ${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}" .endfor .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in .endif .if ! ${PORT_OPTIONS:MDOCS} .if defined(VICE_WITH_XAW3D) .for i in ${FIX_XAW} ${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i} .endfor .endif .endif pre-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .endif ${MKDIR} ${PREFIX}/lib/vice/fonts ${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \ ${PREFIX}/lib/vice/fonts/ post-install: .if ${PORT_OPTIONS:MDOCS} @${LN} -sf vice_toc.html ${DOCSDIR}/index.html .endif .include Index: head/hebrew/hunspell/Makefile =================================================================== --- head/hebrew/hunspell/Makefile (revision 325936) +++ head/hebrew/hunspell/Makefile (revision 325937) @@ -1,39 +1,37 @@ # New ports collection makefile for: hunspell # Date created: 2011-07-20 # Whom: Baptiste Daroussin # # $FreeBSD$ # PORTNAME= hunspell PORTVERSION= 1.2 CATEGORIES= hebrew textproc MASTER_SITES= http://hspell.ivrix.org.il/ \ LOCAL/sunpoet/${PORTNAME} DISTNAME= hspell-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Hebrew hunspell dictionaries -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv - -USES= perl5 +USES= iconv:build perl5 ALL_TARGET= hunspell CONFIGURE_ARGS= --enable-fatverb GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= build PLIST_FILES= %%DATADIR%%/he.aff \ %%DATADIR%%/he.dic PLIST_DIRSTRY= %%DATADIR%% post-patch: @${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/pmerge do-install: ${MKDIR} ${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/he.aff ${WRKSRC}/he.dic ${DATADIR}/ .include Index: head/japanese/gjiten/Makefile =================================================================== --- head/japanese/gjiten/Makefile (revision 325936) +++ head/japanese/gjiten/Makefile (revision 325937) @@ -1,80 +1,80 @@ # New ports collection makefile for: gjiten # Date created: 2012-09-03 # Whom: Stephane Lapie # # $FreeBSD$ # PORTNAME= gjiten PORTVERSION= 2.6 CATEGORIES= japanese gnome MASTER_SITES= http://gjiten.sourceforge.net/ MAINTAINER= stephane.lapie@darkbsd.org COMMENT= Japanese dictionary program for GNOME OPTIONS_DEFINE= UTF8 KANJIPAD DOCS NLS UTF8_DESC= Use UTF-8 edict dictionaries KANJIPAD_DESC= Use Kanjipad USE_GNOME= gtk20 gconf2 libglade libgnomeui USE_GMAKE= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= gjiten-doc.ja.html MAN1= gjiten.1 GCONF_SCHEMAS= gjiten-dicfiles.schemas gjiten.schemas .include .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " MAKE_ENV+= USE_NLS=no .endif .if ${PORT_OPTIONS:MUTF8} EDICT_DIR= ${LOCALBASE}/share/dict/edict-utf-8 EDICT_FILE= ${EDICT_DIR}/edict RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict-utf-8 .else EDICT_DIR= ${LOCALBASE}/share/dict/edict EDICT_FILE= ${EDICT_DIR}/edict RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict -BUILD_DEPENDS+= ${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv +USES+= iconv:build .endif DICTIONARIES= kanjidic edict compdic GJITEN_DICS= ${DATADIR}/dics/ .if ${PORT_OPTIONS:MKANJIPAD} RUN_DEPENDS+= ${LOCALBASE}/bin/kanjipad:${PORTSDIR}/japanese/kanjipad .endif BUILD_DEPENDS+= ${LOCALBASE}/bin/xmlto:${PORTSDIR}/textproc/xmlto post-install: .if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/help/ja/${f} ${DOCSDIR} .endfor .endif @${INSTALL} -d ${GJITEN_DICS} .if ${PORT_OPTIONS:MUTF8} .for f in ${DICTIONARIES} ${INSTALL_DATA} ${EDICT_DIR}/${f} ${GJITEN_DICS} .endfor .else .for f in ${DICTIONARIES} - ${LOCALBASE}/bin/iconv -c -f EUC-JP -t UTF-8 ${EDICT_DIR}/${f} > ${GJITEN_DICS}/${f} + ${ICONV_CMD} -c -f EUC-JP -t UTF-8 ${EDICT_DIR}/${f} > ${GJITEN_DICS}/${f} .endfor .endif -@update-desktop-database .include Index: head/japanese/platex-japanese/Makefile =================================================================== --- head/japanese/platex-japanese/Makefile (revision 325936) +++ head/japanese/platex-japanese/Makefile (revision 325937) @@ -1,72 +1,70 @@ # New ports collection makefile for: platex-japanese # Date created: 2007-11-19 # Whom: Koji Yokota # # $FreeBSD$ # PORTNAME= japanese PORTVERSION= 1.3 PORTREVISION= 5 CATEGORIES= japanese print MASTER_SITES= ${MASTER_SITE_TEX_CTAN} MASTER_SITE_SUBDIR= language/japanese PKGNAMEPREFIX= platex- DISTNAME= ${PORTNAME} DIST_SUBDIR= latex MAINTAINER= yokota@res.otaru-uc.ac.jp COMMENT= pLaTeX package that literally provides Japanese option to babel -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv - USE_ZIP= yes USE_TEX= latex ptex +USES= iconv:build TEXMFDIR= share/texmf STYDIR= tex/generic/babel DOCSDIR= doc/generic/babel/${PORTNAME} INSFILE= ${PORTNAME}.ins DTXFILE= ${PORTNAME}.dtx LDFFILE= ${PORTNAME}.ldf SAMPLEFILE= sample.tex PDFFILE= sample.pdf TEXTFILE= README ENCODING?= EUC-JP -ICONV= ${LOCALBASE}/bin/iconv MKTEXLSR= ${LOCALBASE}/bin/mktexlsr .SILENT:: pre-configure: @${ECHO_MSG} @${ECHO_MSG} Using ${ENCODING} to set locale of installing files. @${ECHO_MSG} To change it, set the $$\{ENCODING\} variable to a desirable iconv\'s locale. @${ECHO_MSG} See \'iconv -l\' for available values. @${ECHO_MSG} post-configure: ( cd ${WRKSRC} && ${MV} ${INSFILE} ${INSFILE:S/$/.orig/} && \ ${SED} -e 's/\(sample\.tex\)/j\1/g' ${INSFILE:S/$/.orig/} \ > ${INSFILE} && \ ${MV} ${DTXFILE} ${DTXFILE}.orig && \ - ${ICONV} -f ISO-2022-JP -t ${ENCODING} ${DTXFILE}.orig > ${DTXFILE} ) + ${ICONV_CMD} -f ISO-2022-JP -t ${ENCODING} ${DTXFILE}.orig > ${DTXFILE} ) do-build: ( cd ${WRKSRC} && platex ${INSFILE} && \ ${MV} j${SAMPLEFILE} ${SAMPLEFILE}) do-install: ( cd ${WRKSRC} && \ ${MKDIR} ${PREFIX}/${TEXMFDIR}/${STYDIR} && \ ${CP} -pv ${LDFFILE} ${PREFIX}/${TEXMFDIR}/${STYDIR} ) .if !defined(NOPORTDOCS) ( cd ${WRKSRC} && \ ${MKDIR} ${PREFIX}/${TEXMFDIR}/${DOCSDIR} && \ for _FILE in ${PDFFILE} ${TEXTFILE} ${SAMPLEFILE} ; do \ ${CP} -pv $${_FILE} ${PREFIX}/${TEXMFDIR}/${DOCSDIR} ; done ) .endif post-install: ${MKTEXLSR} ${PREFIX}/${TEXMFDIR} .include Index: head/sysutils/djmount/Makefile =================================================================== --- head/sysutils/djmount/Makefile (revision 325936) +++ head/sysutils/djmount/Makefile (revision 325937) @@ -1,31 +1,30 @@ # Created by: Eric L. Camachat # $FreeBSD$ PORTNAME= djmount PORTVERSION= 0.71 PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF MAINTAINER= eric@camachat.org COMMENT= Mount UPnP A/V Media LIB_DEPENDS= upnp.9:${PORTSDIR}/devel/upnp -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv PLIST_FILES= bin/${PORTNAME} GNU_CONFIGURE= yes -USES= fuse pkgconfig +USES= fuse iconv:build pkgconfig CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-fuse-prefix=${LOCALBASE} \ --with-external-libupnp --with-libupnp-prefix=${LOCALBASE} PORTDOCS= AUTHORS ChangeLog NEWS README TODO post-install: .ifndef NOPORTDOCS @${INSTALL} -d ${DOCSDIR}/ @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ .endif .include Index: head/ukrainian/hunspell/Makefile =================================================================== --- head/ukrainian/hunspell/Makefile (revision 325936) +++ head/ukrainian/hunspell/Makefile (revision 325937) @@ -1,31 +1,29 @@ # $FreeBSD$ PORTNAME= hunspell PORTVERSION= 1.6.5 PORTREVISION= 1 CATEGORIES= ukrainian textproc MASTER_SITES= SF/ispell-uk/spell-uk/${PORTVERSION} DISTNAME= spell-uk-${PORTVERSION} EXTRACT_SUFX= .tgz DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Ukrainian hunspell dictionaries -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv - -USES= shebangfix perl5 +USES= iconv:build shebangfix perl5 ALL_TARGET= myspell USE_GMAKE= yes USE_PERL5= build SHEBANG_FILES= bin/*.pl PLIST_FILES= %%DATADIR%%/uk_UA.aff \ %%DATADIR%%/uk_UA.dic PLIST_DIRSTRY= %%DATADIR%% do-install: ${MKDIR} ${DATADIR}/ cd ${WRKSRC}/dist/my${DISTNAME}/ && ${INSTALL_DATA} uk_UA.aff uk_UA.dic ${DATADIR}/ .include