From 6ba202c932dddc76937e6fb5634102abe74d88d7 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 13 Sep 2016 15:29:01 +0000 Subject: [PATCH] replace libiconv module --- editors/nedit/Makefile | 9 ++++----- emulators/bochs/Makefile | 8 ++++---- emulators/openmsx/Makefile | 8 ++++---- games/abuse/Makefile | 6 +++--- games/armagetronad/Makefile | 8 ++++---- games/burgerspace/Makefile | 8 ++++---- games/cosmosmash/Makefile | 8 ++++---- games/love/Makefile | 8 ++++---- games/quadrupleback/Makefile | 8 ++++---- games/residualvm/Makefile | 7 +++---- graphics/DevIL/Makefile | 8 ++++---- graphics/GraphicsMagick/Makefile | 11 +++++------ graphics/ImageMagick/Makefile | 7 +++---- graphics/agg/Makefile | 8 ++++---- graphics/delaboratory/Makefile | 9 ++++----- graphics/djvulibre/Makefile | 9 ++++----- graphics/dmtx-utils/Makefile | 8 ++++---- graphics/gd/Makefile | 9 ++++----- graphics/geomview/Makefile | 9 ++++----- graphics/luagd/Makefile | 8 ++++---- graphics/mscgen/Makefile | 9 ++++----- graphics/p5-GD/Makefile | 10 +++++----- graphics/pecl-imagick/Makefile | 10 +++++----- java/tanukiwrapper/Makefile | 9 +++++---- 24 files changed, 97 insertions(+), 105 deletions(-) diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 61f863b5ad1..31dfdc126e6 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.76 2016/05/05 19:52:28 naddy Exp $ +# $OpenBSD: Makefile,v 1.77 2016/09/13 15:29:01 naddy Exp $ COMMENT= X11/Motif GUI text editor @@ -20,11 +20,10 @@ DIST_SUBDIR= nedit PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xmu Xpm Xrender Xt -WANTLIB += c expat fontconfig freetype m z Xm +WANTLIB += c expat fontconfig freetype iconv m z Xm -MODULES= converters/libiconv - -LIB_DEPENDS+= x11/motif +LIB_DEPENDS+= converters/libiconv \ + x11/motif ALL_TARGET= openbsd diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 6671dd0705a..ff12d9b43f7 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2015/05/10 08:01:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.67 2016/09/13 15:29:01 naddy Exp $ COMMENT= x86 machine simulator @@ -43,11 +43,11 @@ WANTLIB+= curses readline .if ${FLAVOR:Mno_x11} CONFIGURE_ARGS+=--with-nogui .else -MODULES= converters/libiconv -LIB_DEPENDS+= devel/sdl +LIB_DEPENDS+= converters/libiconv \ + devel/sdl CONFIGURE_ARGS+=--with-sdl \ --with-x11 -WANTLIB+= SDL X11 Xext Xpm Xrandr Xrender sndio usbhid xcb +WANTLIB+= SDL X11 Xext Xpm Xrandr Xrender iconv sndio usbhid xcb .endif NO_TEST= Yes diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 575cf904c9b..32c3cfb1e56 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2016/01/11 09:35:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2016/09/13 15:29:01 naddy Exp $ BROKEN-powerpc =CPUCore.cc:2347: error: insn does not satisfy its constraints BROKEN-hppa = OOM when building src/cpu/CPUCore.cc @@ -27,11 +27,12 @@ MAKE_ENV += INSTALL_BASE=${PREFIX}/share/openmsx \ INSTALL_SHARE_DIR=${PREFIX}/share/openmsx \ INSTALL_DOC_DIR=${PREFIX}/share/doc/openmsx -WANTLIB += GL c freetype m pthread stdc++ z ${MODTCL_LIB} ao +WANTLIB += GL c freetype iconv m pthread stdc++ z ${MODTCL_LIB} ao WANTLIB += GLEW SDL SDL_ttf ogg png theoradec vorbis xml2 LIB_DEPENDS = audio/libao \ audio/libvorbis \ + converters/libiconv \ devel/sdl-ttf \ graphics/glew \ graphics/png \ @@ -41,8 +42,7 @@ LIB_DEPENDS = audio/libao \ NO_TEST = Yes -MODULES = converters/libiconv \ - lang/python \ +MODULES = lang/python \ lang/tcl MODPY_RUNDEP = No diff --git a/games/abuse/Makefile b/games/abuse/Makefile index 7c6757d7ee2..1dc80e57862 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2016/04/09 14:50:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.45 2016/09/13 15:29:01 naddy Exp $ COMMENT = SDL port of the legendary 2D platform shooter @@ -24,12 +24,12 @@ WANTLIB += expat MASTER_SITES = ${HOMEPAGE}raw-attachment/wiki/download/ MASTER_SITES0 = http://openbsd.fi/dist/ -MODULES = converters/libiconv # Needs AC_PROG_LIBTOOL BUILD_DEPENDS = devel/libtool \ ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} -LIB_DEPENDS = devel/sdl-mixer \ +LIB_DEPENDS = converters/libiconv \ + devel/sdl-mixer \ devel/smpeg \ audio/flac \ audio/libogg \ diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile index 57b9d5f04e1..6c856c35a13 100644 --- a/games/armagetronad/Makefile +++ b/games/armagetronad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2015/05/28 18:54:21 bcallah Exp $ +# $OpenBSD: Makefile,v 1.5 2016/09/13 15:29:01 naddy Exp $ COMMENT = 3D light cycle game @@ -12,14 +12,14 @@ HOMEPAGE = http://armagetronad.org/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += GL GLU SDL SDL_image c jpeg m png pthread stdc++ xml2 +WANTLIB += GL GLU SDL SDL_image c iconv jpeg m png pthread stdc++ xml2 WANTLIB += z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=armagetronad/} -MODULES = converters/libiconv BUILD_DEPENDS = shells/bash -LIB_DEPENDS = devel/sdl-image \ +LIB_DEPENDS = converters/libiconv \ + devel/sdl-image \ textproc/libxml USE_GMAKE = Yes diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile index 0cfd14d045c..f7f5a4c404b 100644 --- a/games/burgerspace/Makefile +++ b/games/burgerspace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2013/05/31 22:43:15 bentley Exp $ +# $OpenBSD: Makefile,v 1.29 2016/09/13 15:29:01 naddy Exp $ COMMENT= burgertime clone for X @@ -12,13 +12,13 @@ HOMEPAGE= http://sarrazip.com/dev/burgerspace.html PERMIT_PACKAGE_CDROM= Yes WANTLIB += FLAC SDL SDL_image SDL_mixer c flatzebra-0.1 -WANTLIB += jpeg m mikmod ogg png pthread smpeg sndio stdc++ tiff +WANTLIB += iconv jpeg m mikmod ogg png pthread smpeg sndio stdc++ tiff WANTLIB += usbhid vorbis vorbisfile z webp MASTER_SITES= http://sarrazip.com/dev/ -MODULES= converters/libiconv -LIB_DEPENDS= devel/flatzebra>=0.1.6 +LIB_DEPENDS= converters/libiconv \ + devel/flatzebra>=0.1.6 RUN_DEPENDS= devel/desktop-file-utils CONFIGURE_STYLE= gnu diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile index 4bec7ee5cc2..2970734ca6c 100644 --- a/games/cosmosmash/Makefile +++ b/games/cosmosmash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/08/23 07:49:29 zhuk Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/13 15:29:01 naddy Exp $ COMMENT= astrosmash clone for X @@ -12,13 +12,13 @@ HOMEPAGE= http://sarrazip.com/dev/cosmosmash.html PERMIT_PACKAGE_CDROM= Yes WANTLIB += SDL SDL_image SDL_mixer c flatzebra-0.1 m pthread stdc++ -WANTLIB += FLAC jpeg mikmod ogg png smpeg sndio tiff usbhid +WANTLIB += FLAC iconv jpeg mikmod ogg png smpeg sndio tiff usbhid WANTLIB += vorbis vorbisfile webp z MASTER_SITES= http://sarrazip.com/dev/ -MODULES = converters/libiconv -LIB_DEPENDS = devel/flatzebra>=0.1.6 +LIB_DEPENDS = converters/libiconv \ + devel/flatzebra>=0.1.6 RUN_DEPENDS= devel/desktop-file-utils CONFIGURE_STYLE= gnu diff --git a/games/love/Makefile b/games/love/Makefile index 3f782764a8e..b6daf7db6e7 100644 --- a/games/love/Makefile +++ b/games/love/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2016/01/18 14:01:36 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2016/09/13 15:29:01 naddy Exp $ COMMENT= 2D games framework for use with Lua @@ -18,20 +18,20 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ${MODLUA_WANTLIB} WANTLIB += GL Half IL Iex IexMath IlmImf IlmThread Imath SDL X11 WANTLIB += X11-xcb Xdamage Xext Xfixes Xxf86vm c drm -WANTLIB += freetype glapi jasper jpeg lcms m mng modplug mpg123 +WANTLIB += freetype glapi iconv jasper jpeg lcms m mng modplug mpg123 WANTLIB += ogg openal physfs png pthread sndio stdc++ WANTLIB += tiff usbhid vorbis vorbisfile xcb xcb-dri2 xcb-glx WANTLIB += z expat MASTER_SITES= https://bitbucket.org/rude/love/downloads/ -MODULES= converters/libiconv \ - lang/lua +MODULES= lang/lua LIB_DEPENDS= audio/libmodplug \ audio/mpg123 \ audio/openal \ audio/libvorbis \ + converters/libiconv \ devel/physfs \ devel/sdl \ graphics/DevIL \ diff --git a/games/quadrupleback/Makefile b/games/quadrupleback/Makefile index 3a60f79be74..12ca2e2c814 100644 --- a/games/quadrupleback/Makefile +++ b/games/quadrupleback/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2014/08/24 13:25:55 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2016/09/13 15:29:01 naddy Exp $ COMMENT = clone of Doubleback, an intruder circling game @@ -12,15 +12,15 @@ HOMEPAGE = http://sarrazip.com/dev/quadrupleback.html # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += FLAC SDL SDL_gfx SDL_image SDL_mixer c flatzebra-0.1 +WANTLIB += FLAC SDL SDL_gfx SDL_image SDL_mixer c flatzebra-0.1 iconv WANTLIB += jpeg m mikmod ogg png pthread smpeg sndio stdc++ tiff WANTLIB += usbhid vorbis vorbisfile webp z MASTER_SITES = http://sarrazip.com/dev/ -MODULES = converters/libiconv RUN_DEPENDS = devel/desktop-file-utils -LIB_DEPENDS = devel/flatzebra \ +LIB_DEPENDS = converters/libiconv \ + devel/flatzebra \ devel/sdl-gfx FAKE_FLAGS = docdir=${PREFIX}/share/doc/quadrupleback diff --git a/games/residualvm/Makefile b/games/residualvm/Makefile index 6235c6f88eb..105a97a1ab5 100644 --- a/games/residualvm/Makefile +++ b/games/residualvm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2015/07/07 09:15:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2016/09/13 15:29:01 naddy Exp $ COMMENT = interpreter for some LucasArts 3D games @@ -14,15 +14,14 @@ HOMEPAGE = http://residualvm.org/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += GL SDL c freetype jpeg m mad mpeg2 ogg png pthread stdc++ +WANTLIB += GL SDL c freetype iconv jpeg m mad mpeg2 ogg png pthread stdc++ WANTLIB += theoradec vorbis vorbisfile z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=residualvm/} -MODULES = converters/libiconv - LIB_DEPENDS = audio/libmad \ audio/libvorbis \ + converters/libiconv \ devel/sdl \ graphics/jpeg \ graphics/libmpeg2 \ diff --git a/graphics/DevIL/Makefile b/graphics/DevIL/Makefile index 13f2de356bf..38e4cc68403 100644 --- a/graphics/DevIL/Makefile +++ b/graphics/DevIL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/01/17 17:29:09 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2016/09/13 15:29:01 naddy Exp $ COMMENT= library for powerful image loading capabilities @@ -20,12 +20,12 @@ EXTRACT_SUFX= .zip WANTLIB += GL GLU Half ICE Iex IexMath IlmImf IlmThread Imath WANTLIB += SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi -WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm c drm glapi glut jasper +WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm c drm glapi glut iconv jasper WANTLIB += jpeg lcms m mng png pthread sndio stdc++ WANTLIB += tiff usbhid xcb xcb-dri2 xcb-glx z expat -MODULES= converters/libiconv -LIB_DEPENDS= devel/sdl \ +LIB_DEPENDS= converters/libiconv \ + devel/sdl \ graphics/freeglut \ graphics/ilmbase \ graphics/jasper \ diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 71be55b40ff..7c6f7255b3c 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2016/06/11 11:48:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.46 2016/09/13 15:29:01 naddy Exp $ COMMENT= image processing tools with stable ABI @@ -18,14 +18,13 @@ MAINTAINER= Brad Smith # http://www.graphicsmagick.org/www/Copyright.html PERMIT_PACKAGE_CDROM= Yes -WANTLIB= ICE SM X11 Xau Xdmcp Xext bz2 c freetype jasper jbig \ - jpeg lcms2 ltdl lzma m png16 pthread pthread-stubs \ - stdc++ tiff webp wmflite-0.2 xcb xml2 z - -MODULES= converters/libiconv +WANTLIB= ICE SM X11 Xau Xdmcp Xext bz2 c freetype iconv \ + jasper jbig jpeg lcms2 ltdl lzma m png16 pthread \ + pthread-stubs stdc++ tiff webp wmflite-0.2 xcb xml2 z LIB_DEPENDS= archivers/bzip2 \ archivers/xz \ + converters/libiconv \ devel/libtool,-ltdl \ graphics/jasper \ graphics/jbigkit \ diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index b0be7894c14..82ad745d0d0 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.157 2016/08/12 13:38:49 sthen Exp $ +# $OpenBSD: Makefile,v 1.158 2016/09/13 15:29:01 naddy Exp $ COMMENT= image processing tools @@ -26,14 +26,13 @@ MASTER_SITES= https://www.imagemagick.org/download/releases/ \ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt bz2 c djvulibre expat -WANTLIB += fftw3 fontconfig freetype jbig jpeg lcms2 lzma m +WANTLIB += fftw3 fontconfig freetype iconv jbig jpeg lcms2 lzma m WANTLIB += openjp2 perl png pthread pthread-stubs stdc++ tiff WANTLIB += webp xcb xml2 z -MODULES = converters/libiconv - LIB_DEPENDS = archivers/bzip2 \ archivers/xz \ + converters/libiconv \ graphics/djvulibre \ graphics/jbigkit \ graphics/png \ diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index ba827fdfca1..5aa6a007929 100644 --- a/graphics/agg/Makefile +++ b/graphics/agg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:25 naddy Exp $ +# $OpenBSD: Makefile,v 1.24 2016/09/13 15:29:01 naddy Exp $ COMMENT= anti-grain geometry graphics library @@ -15,15 +15,15 @@ HOMEPAGE= http://www.antigrain.com/ # GPL PERMIT_PACKAGE_CDROM= Yes -WANTLIB= X11 freetype m sndio usbhid xcb z SDL>=6 stdc++ pthread +WANTLIB= X11 freetype iconv m sndio usbhid xcb z SDL>=6 stdc++ pthread MASTER_SITES= ${HOMEPAGE} AUTOCONF_VERSION= 2.59 AUTOMAKE_VERSION= 1.9 -MODULES= converters/libiconv -LIB_DEPENDS= devel/sdl +LIB_DEPENDS= converters/libiconv \ + devel/sdl # XX needs libtoolize BUILD_DEPENDS= devel/autoconf/${AUTOCONF_VERSION} \ devel/libtool \ diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile index ddb99680de1..bf65fa6d18a 100644 --- a/graphics/delaboratory/Makefile +++ b/graphics/delaboratory/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2015/10/08 12:02:03 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2016/09/13 15:29:01 naddy Exp $ COMMENT = color correction utility for digital images DISTNAME = delaboratory-0.8 @@ -10,15 +10,14 @@ HOMEPAGE = https://code.google.com/p/delaboratory/ # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c m pthread stdc++ tiff wx_base wx_base_net wx_base_odbc +WANTLIB += c iconv m pthread stdc++ tiff wx_base wx_base_net wx_base_odbc WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xml2 z MASTER_SITES = https://delaboratory.googlecode.com/files/ -MODULES = converters/libiconv - -LIB_DEPENDS = textproc/libxml \ +LIB_DEPENDS = converters/libiconv \ + textproc/libxml \ x11/wxWidgets,-main RUN_DEPENDS = graphics/dcraw diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 289ad6fff5d..ac7126b332d 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2016/03/02 20:10:36 juanfra Exp $ +# $OpenBSD: Makefile,v 1.36 2016/09/13 15:29:01 naddy Exp $ COMMENT= view, decode and encode DjVu files @@ -16,11 +16,10 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/} -WANTLIB= c m jpeg pthread stdc++ tiff z +WANTLIB= c iconv m jpeg pthread stdc++ tiff z -MODULES= converters/libiconv - -LIB_DEPENDS= graphics/jpeg \ +LIB_DEPENDS= converters/libiconv \ + graphics/jpeg \ graphics/tiff RUN_DEPENDS+= misc/shared-mime-info \ diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile index 9fd055c8227..ecca6a96625 100644 --- a/graphics/dmtx-utils/Makefile +++ b/graphics/dmtx-utils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2016/05/06 21:39:03 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2016/09/13 15:29:01 naddy Exp $ COMMENT = tools for handling data matrix barcodes @@ -16,12 +16,12 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=libdmtx/} PERMIT_PACKAGE_CDROM = Yes WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt -WANTLIB += bz2 c djvulibre dmtx expat fftw3 fontconfig freetype +WANTLIB += bz2 c djvulibre dmtx expat fftw3 fontconfig freetype iconv WANTLIB += jbig jpeg lcms2 lzma m openjp2 png pthread pthread-stubs WANTLIB += tiff webp xcb xml2 z -MODULES = converters/libiconv -LIB_DEPENDS += graphics/ImageMagick \ +LIB_DEPENDS += converters/libiconv \ + graphics/ImageMagick \ graphics/libdmtx SEPARATE_BUILD = Yes diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 353afee7627..69f6479b0e1 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.68 2016/07/06 08:46:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.69 2016/09/13 15:29:02 naddy Exp $ COMMENT= library for dynamic creation of images @@ -15,7 +15,7 @@ HOMEPAGE= http://www.libgd.org/ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c expat fontconfig freetype jpeg m png pthread +WANTLIB += c expat fontconfig freetype iconv jpeg m png pthread WANTLIB += pthread-stubs stdc++ tiff vpx z MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ @@ -23,11 +23,10 @@ MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-xpm -LIB_DEPENDS= graphics/jpeg \ +LIB_DEPENDS= converters/libiconv \ + graphics/jpeg \ graphics/png \ graphics/tiff \ multimedia/libvpx -MODULES= converters/libiconv - .include diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 14963ed168e..305d2be1962 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/09/10 13:03:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2016/09/13 15:29:02 naddy Exp $ COMMENT = geometry viewer for OOGL file formats @@ -15,16 +15,15 @@ MAINTAINER = Patsy PERMIT_PACKAGE_CDROM = Yes WANTLIB += ICE SM X11 Xext Xft Xm Xmu Xrender Xt c expat fontconfig -WANTLIB += freetype jpeg m png pthread-stubs stdc++ xcb z +WANTLIB += freetype iconv jpeg m png pthread-stubs stdc++ xcb z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=geomview/} -MODULES = converters/libiconv - RUN_DEPENDS = graphics/netpbm \ print/ps2eps -LIB_DEPENDS = x11/motif +LIB_DEPENDS = converters/libiconv \ + x11/motif SUBST_VARS += V diff --git a/graphics/luagd/Makefile b/graphics/luagd/Makefile index 49195feb22e..50da675225c 100644 --- a/graphics/luagd/Makefile +++ b/graphics/luagd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/03/18 23:12:17 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2016/09/13 15:29:02 naddy Exp $ COMMENT= gd binding for the lua language @@ -14,9 +14,9 @@ MASTER_SITES= http://luaforge.net/frs/download.php/1592/ # MIT PERMIT_PACKAGE_CDROM= Yes -MODULES= lang/lua converters/libiconv -WANTLIB= freetype fontconfig z jpeg>=62 png>=2 gd>=20.33 -LIB_DEPENDS= graphics/jpeg graphics/png graphics/gd +MODULES= lang/lua +WANTLIB= freetype fontconfig z iconv jpeg>=62 png>=2 gd>=20.33 +LIB_DEPENDS= converters/libiconv graphics/jpeg graphics/png graphics/gd NO_TEST= Yes diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile index fb3cfb3a1c4..61968bb82a6 100644 --- a/graphics/mscgen/Makefile +++ b/graphics/mscgen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2015/10/08 12:02:03 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2016/09/13 15:29:02 naddy Exp $ COMMENT= utility to create Message Sequence Charts @@ -15,11 +15,10 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${HOMEPAGE}/software/ -WANTLIB += c fontconfig freetype gd jpeg m png pthread tiff vpx z +WANTLIB += c fontconfig freetype gd iconv jpeg m png pthread tiff vpx z -MODULES= converters/libiconv - -LIB_DEPENDS= graphics/gd +LIB_DEPENDS= converters/libiconv \ + graphics/gd CONFIGURE_STYLE= gnu diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index cd76f7c62d1..927c4d0dac9 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2016/03/20 19:56:43 naddy Exp $ +# $OpenBSD: Makefile,v 1.46 2016/09/13 15:29:02 naddy Exp $ COMMENT = module to interface with the GD graphics library @@ -8,12 +8,12 @@ CATEGORIES = graphics # perl PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c fontconfig freetype gd jpeg m perl png tiff vpx z +WANTLIB += c fontconfig freetype gd iconv jpeg m perl png tiff vpx z -LIB_DEPENDS = graphics/gd +LIB_DEPENDS = converters/libiconv \ + graphics/gd -MODULES = converters/libiconv \ - cpan +MODULES = cpan CONFIGURE_STYLE = modbuild diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index ccae3914baf..0d5b5221e84 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2016/04/25 14:48:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2016/09/13 15:29:02 naddy Exp $ COMMENT= PHP support for the ImageMagick library @@ -9,14 +9,14 @@ CATEGORIES= graphics PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt -WANTLIB += bz2 c djvulibre expat fftw3 fontconfig freetype jbig +WANTLIB += bz2 c djvulibre expat fftw3 fontconfig freetype iconv jbig WANTLIB += jpeg lcms2 lzma m openjp2 png pthread pthread-stubs WANTLIB += tiff webp xcb xml2 z -MODULES= converters/libiconv \ - lang/php/pecl +MODULES= lang/php/pecl CONFIGURE_STYLE= gnu -LIB_DEPENDS= graphics/ImageMagick +LIB_DEPENDS= converters/libiconv \ + graphics/ImageMagick .include diff --git a/java/tanukiwrapper/Makefile b/java/tanukiwrapper/Makefile index 9c392cfd6e8..1e7ee8f0b37 100644 --- a/java/tanukiwrapper/Makefile +++ b/java/tanukiwrapper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/18 23:12:18 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2016/09/13 15:29:02 naddy Exp $ COMMENT= Tanuki Java Service Wrapper @@ -18,8 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes EXTRACT_SUFX= .zip -MODULES= converters/libiconv \ - java +MODULES= java MODJAVA_VER= 1.6+ MODJAVA_BUILD= ant @@ -32,7 +31,9 @@ BITS=32 MODJAVA_BUILD_ARGS=-Dbits=${BITS} -WANTLIB= c m pthread +WANTLIB= c iconv m pthread + +LIB_DEPENDS= converters/libiconv USE_GMAKE= Yes