From 5ca807c6ff8c2658028e4035afe8824fa063f2a5 Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 12 Sep 2016 22:20:36 +0000 Subject: [PATCH] replace libiconv module --- audio/sox/Makefile | 7 +++---- games/0ad/base/Makefile | 8 ++++---- games/pingus/Makefile | 10 +++++----- games/supertux/Makefile | 9 +++++---- sysutils/logstalgia/Makefile | 10 +++++----- textproc/pdftk/Makefile | 9 +++++---- x11/cegui/Makefile | 6 +++--- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 9498739a23d..94b05c607a7 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.64 2016/03/11 20:28:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.65 2016/09/12 22:20:36 naddy Exp $ BROKEN-hppa = bend.c:155:12: internal compiler error: in expand_expr_addr_expr_1, at expr.c:7697 @@ -15,14 +15,12 @@ MAINTAINER= Jan Stary # sox under the terms of GPLv3 to avoid license conflict. PERMIT_PACKAGE_CDROM= Yes -MODULES= converters/libiconv - WANTLIB += c m z sndio WANTLIB += FLAC gsm mad id3tag mp3lame ogg WANTLIB += sndfile vorbis vorbisenc vorbisfile WANTLIB += opencore-amrnb opencore-amrwb WANTLIB += opus opusfile twolame wavpack -WANTLIB += magic png +WANTLIB += iconv magic png MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sox/} @@ -41,6 +39,7 @@ LIB_DEPENDS= \ audio/opusfile \ audio/twolame \ audio/wavpack \ + converters/libiconv \ devel/libmagic \ graphics/png diff --git a/games/0ad/base/Makefile b/games/0ad/base/Makefile index 4504d0c4550..fd7676090df 100644 --- a/games/0ad/base/Makefile +++ b/games/0ad/base/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/08/26 05:18:58 bentley Exp $ +# $OpenBSD: Makefile,v 1.14 2016/09/12 22:20:36 naddy Exp $ COMMENT = historical real-time strategy game @@ -12,7 +12,7 @@ SO_VERSION = 0.0 SHARED_LIBS += mozjs31-ps-release ${SO_VERSION} WANTLIB += GL SDL2 X11 Xcursor boost_filesystem boost_system c curl -WANTLIB += enet execinfo gloox icui18n icuuc m miniupnpc +WANTLIB += enet execinfo gloox iconv icui18n icuuc m miniupnpc WANTLIB += nspr4 ogg openal plc4 plds4 png pthread vorbis vorbisfile WANTLIB += xml2 z @@ -20,6 +20,7 @@ BUILD_DEPENDS = archivers/zip \ shells/bash LIB_DEPENDS = audio/libvorbis \ audio/openal \ + converters/libiconv \ devel/boost \ devel/libexecinfo \ devel/nspr \ @@ -33,8 +34,7 @@ LIB_DEPENDS = audio/libvorbis \ textproc/libxml RUN_DEPENDS = devel/desktop-file-utils \ games/0ad/data -MODULES = lang/python \ - converters/libiconv +MODULES = lang/python # sync with devel/spidermonkey MODULES += gcc4 diff --git a/games/pingus/Makefile b/games/pingus/Makefile index 7d713162e47..0c88a5d8f23 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/05/28 10:17:23 pascal Exp $ +# $OpenBSD: Makefile,v 1.12 2016/09/12 22:20:36 naddy Exp $ COMMENT= free Lemmings-like game @@ -14,15 +14,15 @@ MASTER_SITES= https://pingus.googlecode.com/files/ # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL SDL X11 Xi c m png pthread z +WANTLIB += GL SDL X11 Xi c iconv m png pthread z WANTLIB += SDL_mixer>=3 SDL_image>=2 boost_signals -MODULES= converters/libiconv \ - devel/scons gcc4 +MODULES= devel/scons gcc4 MODGCC4_ARCHS= * MODGCC4_LANGS= c++ -LIB_DEPENDS= devel/sdl-mixer \ +LIB_DEPENDS= converters/libiconv \ + devel/sdl-mixer \ devel/sdl-image \ devel/boost diff --git a/games/supertux/Makefile b/games/supertux/Makefile index 377bbc23102..1ba71fc7096 100644 --- a/games/supertux/Makefile +++ b/games/supertux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/05/07 12:40:57 pascal Exp $ +# $OpenBSD: Makefile,v 1.6 2016/09/12 22:20:36 naddy Exp $ COMMENT = jump 'n' run game @@ -15,18 +15,19 @@ MAINTAINER = Pascal Stumpf # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += GL GLEW GLU SDL2 SDL2_image c curl m ogg openal physfs +WANTLIB += GL GLEW GLU SDL2 SDL2_image c curl iconv m ogg openal physfs WANTLIB += pthread vorbis vorbisfile MASTER_SITES = https://github.com/SuperTux/supertux/releases/download/v${V}/ EXTRACT_SUFX = .tar.bz2 -MODULES += converters/libiconv devel/cmake gcc4 +MODULES += devel/cmake gcc4 MODGCC4_ARCHS = * MODGCC4_LANGS = c c++ BUILD_DEPENDS = devel/boost RUN_DEPENDS = devel/desktop-file-utils -LIB_DEPENDS = devel/sdl2-image \ +LIB_DEPENDS = converters/libiconv \ + devel/sdl2-image \ devel/physfs \ graphics/glew \ net/curl \ diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile index 05ff304ba9e..7b6c7ca4522 100644 --- a/sysutils/logstalgia/Makefile +++ b/sysutils/logstalgia/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/15 15:03:57 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.10 2016/09/12 22:20:36 naddy Exp $ COMMENT = website access log visualization @@ -13,11 +13,10 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = https://github.com/acaudwell/Logstalgia/releases/download/${DISTNAME}/ -WANTLIB += GL GLEW GLU SDL2 SDL2_image c freetype m pcre png pthread +WANTLIB += GL GLEW GLU SDL2 SDL2_image c freetype iconv m pcre png pthread WANTLIB += z -MODULES = converters/libiconv \ - gcc4 +MODULES = gcc4 MODGCC4_ARCHS = * MODGCC4_LANGS = c c++ @@ -28,7 +27,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ BUILD_DEPENDS = graphics/glm \ devel/boost -LIB_DEPENDS = graphics/glew \ +LIB_DEPENDS = converters/libiconv \ + graphics/glew \ devel/pcre \ devel/sdl2-image diff --git a/textproc/pdftk/Makefile b/textproc/pdftk/Makefile index 8ee0a86b488..10ccb7ae356 100644 --- a/textproc/pdftk/Makefile +++ b/textproc/pdftk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/05/28 10:17:25 pascal Exp $ +# $OpenBSD: Makefile,v 1.13 2016/09/12 22:20:36 naddy Exp $ BROKEN-sparc64= gcj blows during build COMMENT= pdf swiss army knife @@ -13,16 +13,17 @@ MAINTAINER= Christopher Zimmermann # GPLv2+ (main program), see ${WRKDIST}/license_gpl_pdftk/ for libraries PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ${MODGCC4_GCJWANTLIB} c m pthread z +WANTLIB += ${MODGCC4_GCJWANTLIB} c iconv m pthread z HOMEPAGE = http://www.pdflabs.com/tools/pdftk-server/ MASTER_SITES = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ -MODULES= converters/libiconv gcc4 +MODULES= gcc4 MODGCC4_ARCHS= * MODGCC4_LANGS= java c++ -LIB_DEPENDS= ${MODGCC4_GCJLIBDEP} +LIB_DEPENDS= ${MODGCC4_GCJLIBDEP} \ + converters/libiconv WRKDIST= ${WRKDIR}/$(DISTNAME)-dist WRKSRC= $(WRKDIST)/pdftk diff --git a/x11/cegui/Makefile b/x11/cegui/Makefile index 27ec465334c..3bcf285596c 100644 --- a/x11/cegui/Makefile +++ b/x11/cegui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/08/31 16:18:58 pascal Exp $ +# $OpenBSD: Makefile,v 1.7 2016/09/12 22:20:36 naddy Exp $ COMMENT = widgets library for graphics engines @@ -25,19 +25,19 @@ MAINTAINER = Pascal Stumpf PERMIT_PACKAGE_CDROM = Yes WANTLIB += GL GLEW GLU Irrlicht OIS OgreMain SDL2 SDL2_image boost_system-mt -WANTLIB += boost_thread-mt c expat freeimage freetype m pcre pthread +WANTLIB += boost_thread-mt c expat freeimage freetype iconv m pcre pthread MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crayzedsgui/} EXTRACT_SUFX = .tar.bz2 MODULES = devel/cmake \ - converters/libiconv \ gcc4 MODGCC4_ARCHS = * MODGCC4_LANGS += c++ BUILD_DEPENDS = graphics/glm LIB_DEPENDS = x11/ogre \ x11/irrlicht \ + converters/libiconv \ devel/pcre \ graphics/glew \ devel/sdl2-image \