From 70bb8e18e75d77bc879daaf3f8ce98683b5ec6b4 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 13 Sep 2016 11:44:06 +0000 Subject: [PATCH] replace libiconv module --- archivers/unzip/Makefile | 5 +++-- audio/cmu-sphinx3/Makefile | 7 ++++--- audio/cmu-sphinxbase/Makefile | 9 +++++---- audio/libcdio/Makefile | 8 ++++---- audio/mpc/Makefile | 9 ++++----- audio/ruby-id3lib/Makefile | 9 +++++---- cad/tkgate/Makefile | 8 ++++---- comms/smstools/Makefile | 8 ++++---- converters/p5-Text-Iconv/Makefile | 8 +++++--- converters/py-iconvcodec/Makefile | 8 +++++--- databases/freetds/Makefile | 9 ++++----- databases/sqsh/Makefile | 8 ++++---- databases/virtuoso/Makefile | 8 ++++---- 13 files changed, 55 insertions(+), 49 deletions(-) diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index ccb7dcee477..d5e00da722c 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.58 2016/01/15 19:57:24 sthen Exp $ +# $OpenBSD: Makefile,v 1.59 2016/09/13 11:44:06 naddy Exp $ PORTROACH = skipv:552 @@ -35,7 +35,8 @@ DOCS = COPYING.OLD LICENSE README WHERE LOC = -DLARGE_FILE_SUPPORT -DNO_LCHMOD -DUSE_UNSHRINK .if ${FLAVOR:L:Miconv} -MODULES += converters/libiconv +LIB_DEPENDS += converters/libiconv +WANTLIB += iconv CFLAGS += -I${LOCALBASE}/include LOC += -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE \ -DNO_WORKING_ISPRINT diff --git a/audio/cmu-sphinx3/Makefile b/audio/cmu-sphinx3/Makefile index 3d0a7ae09b5..c35a6cf3151 100644 --- a/audio/cmu-sphinx3/Makefile +++ b/audio/cmu-sphinx3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/04/27 20:55:02 eric Exp $ +# $OpenBSD: Makefile,v 1.14 2016/09/13 11:44:06 naddy Exp $ COMMENT= acoustic decoder for CMU Sphinx3 speech recognition system @@ -16,13 +16,14 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmusphinx/} -WANTLIB= blas c lapack m pthread sndio ${MODFORTRAN_WANTLIB} \ +WANTLIB= blas c iconv lapack m pthread sndio ${MODFORTRAN_WANTLIB} \ sphinxad sphinxbase -MODULES= converters/libiconv fortran +MODULES= fortran MODFORTRAN_COMPILER = g77 LIB_DEPENDS= audio/cmu-sphinxbase \ + converters/libiconv \ ${MODFORTRAN_LIB_DEPENDS} diff --git a/audio/cmu-sphinxbase/Makefile b/audio/cmu-sphinxbase/Makefile index 36fd8afe855..aacbd06ad5a 100644 --- a/audio/cmu-sphinxbase/Makefile +++ b/audio/cmu-sphinxbase/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2016/08/24 05:02:20 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.13 2016/09/13 11:44:06 naddy Exp $ COMMENT= common libraries for the CMU speech recognition engines @@ -17,12 +17,13 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmusphinx/} -WANTLIB= blas c lapack m pthread sndio ${MODFORTRAN_WANTLIB} -MODULES= converters/libiconv fortran +WANTLIB= blas c iconv lapack m pthread sndio ${MODFORTRAN_WANTLIB} +MODULES= fortran MODFORTRAN_COMPILER = g77 -LIB_DEPENDS= math/lapack \ +LIB_DEPENDS= converters/libiconv \ + math/lapack \ ${MODFORTRAN_LIB_DEPENDS} CONFIGURE_STYLE= gnu diff --git a/audio/libcdio/Makefile b/audio/libcdio/Makefile index c5811bba108..f795b930214 100644 --- a/audio/libcdio/Makefile +++ b/audio/libcdio/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2016/03/11 20:28:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.17 2016/09/13 11:44:06 naddy Exp $ COMMENT= compact disk input and control library @@ -19,10 +19,10 @@ HOMEPAGE= https://www.gnu.org/software/libcdio/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c cddb m ncurses stdc++ +WANTLIB= c cddb iconv m ncurses stdc++ -MODULES= converters/libiconv -LIB_DEPENDS= audio/libcddb +LIB_DEPENDS= audio/libcddb \ + converters/libiconv USE_GMAKE= Yes CONFIGURE_STYLE= autoconf diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index c5cd1e39b5f..9af98348bac 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2016/08/22 11:44:46 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.23 2016/09/13 11:44:07 naddy Exp $ COMMENT= command line client for mpd @@ -13,13 +13,12 @@ MAINTAINER= David Coppa # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c mpdclient -LIB_DEPENDS= audio/libmpdclient>=2.2 +WANTLIB= c iconv mpdclient +LIB_DEPENDS= audio/libmpdclient>=2.2 \ + converters/libiconv MASTER_SITES= http://www.musicpd.org/download/mpc/${VER:R}/ -MODULES= converters/libiconv - CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ac_cv_func_iconv=yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -liconv" diff --git a/audio/ruby-id3lib/Makefile b/audio/ruby-id3lib/Makefile index 377290ad062..c3bfb8dbaa6 100644 --- a/audio/ruby-id3lib/Makefile +++ b/audio/ruby-id3lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2014/01/15 02:13:57 jeremy Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/13 11:44:07 naddy Exp $ COMMENT= Ruby interface to the id3lib C++ library @@ -11,9 +11,10 @@ CATEGORIES= audio # Ruby License PERMIT_PACKAGE_CDROM= Yes -MODULES= lang/ruby converters/libiconv -WANTLIB= id3>=4 stdc++ z -LIB_DEPENDS= audio/id3lib +MODULES= lang/ruby +WANTLIB= iconv id3>=4 stdc++ z +LIB_DEPENDS= audio/id3lib \ + converters/libiconv CONFIGURE_STYLE= ruby gem ext diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index 55a51ce5498..c599e7274d4 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2015/04/07 14:00:07 kirby Exp $ +# $OpenBSD: Makefile,v 1.2 2016/09/13 11:44:07 naddy Exp $ COMMENT = Tcl/Tk based digital circuit editor and simulator @@ -16,11 +16,11 @@ MASTER_SITES = https://bitbucket.org/starling13/tkgate/downloads/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE SM X11 c m pthread ${MODTK_WANTLIB} +WANTLIB += ICE SM X11 c iconv m pthread ${MODTK_WANTLIB} -MODULES = converters/libiconv \ - x11/tk +MODULES = x11/tk +LIB_DEPENDS = converters/libiconv BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} RUN_DEPENDS = ${MODTK_RUN_DEPENDS} \ devel/desktop-file-utils diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile index 28d69dc8602..76c350a9dbe 100644 --- a/comms/smstools/Makefile +++ b/comms/smstools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2014/08/10 09:58:04 espie Exp $ +# $OpenBSD: Makefile,v 1.33 2016/09/13 11:44:07 naddy Exp $ COMMENT = gateway to send and receive SMS through GSM mobile phones @@ -14,14 +14,14 @@ MAINTAINER = Stuart Henderson # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c mm +WANTLIB = c iconv mm MASTER_SITES = ${HOMEPAGE}/packages/ # some scripts use formail RUN_DEPENDS = mail/procmail -LIB_DEPENDS = devel/mm -MODULES = converters/libiconv +LIB_DEPENDS = converters/libiconv \ + devel/mm USE_GMAKE = Yes NO_TEST = Yes diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile index ac650646485..8e801f63cec 100644 --- a/converters/p5-Text-Iconv/Makefile +++ b/converters/p5-Text-Iconv/Makefile @@ -1,16 +1,18 @@ -# $OpenBSD: Makefile,v 1.25 2016/03/20 19:56:08 naddy Exp $ +# $OpenBSD: Makefile,v 1.26 2016/09/13 11:44:07 naddy Exp $ COMMENT= interface to iconv() codeset conversion function DISTNAME= Text-Iconv-1.7 REVISION= 5 CATEGORIES= converters -MODULES= converters/libiconv cpan +MODULES= cpan # perl PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c perl +WANTLIB += c iconv perl + +LIB_DEPENDS= converters/libiconv CONFIGURE_ARGS= INC="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/converters/py-iconvcodec/Makefile b/converters/py-iconvcodec/Makefile index 0e95b759a31..385618d49ac 100644 --- a/converters/py-iconvcodec/Makefile +++ b/converters/py-iconvcodec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/03/20 16:12:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.19 2016/09/13 11:44:07 naddy Exp $ COMMENT= universal unicode codec using iconv for Python @@ -16,8 +16,10 @@ MODPY_DISTUTILS_BUILDARGS= --with-libiconv=${LOCALBASE} NO_TEST= Yes -MODULES= lang/python converters/libiconv +MODULES= lang/python -WANTLIB= pthread ${MODPY_WANTLIB} +WANTLIB= iconv pthread ${MODPY_WANTLIB} + +LIB_DEPENDS= converters/libiconv .include diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index fa80e5aaa15..6796ba8cd73 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.83 2016/07/01 11:35:51 sthen Exp $ +# $OpenBSD: Makefile,v 1.84 2016/09/13 11:44:07 naddy Exp $ COMMENT= database drivers for Sybase/Microsoft SQL Server @@ -19,12 +19,10 @@ MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ # LGPLv2+ (most things) GPLv2+ (fisql, tdspool) FDL (docs) PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c ffi gmp gnutls hogweed idn intl iodbc iodbcinst ncurses +WANTLIB += c ffi gmp gnutls hogweed iconv idn intl iodbc iodbcinst ncurses WANTLIB += nettle p11-kit pthread readline tasn1 z WANTLIB += gcrypt gpg-error -MODULES= converters/libiconv - ### AUTOHELL (pre-configure) AUTOCONF_VERSION=2.65 AUTOMAKE_VERSION=1.11 @@ -34,7 +32,8 @@ BUILD_DEPENDS+= devel/gettext \ ${MODGNU_AUTOMAKE_DEPENDS} ### end of AUTOHELL -LIB_DEPENDS= databases/iodbc,-main \ +LIB_DEPENDS= converters/libiconv \ + databases/iodbc,-main \ security/gnutls \ security/libgcrypt diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 3eceb79c6a6..c4b9f370246 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2015/11/21 01:19:33 sthen Exp $ +# $OpenBSD: Makefile,v 1.28 2016/09/13 11:44:07 naddy Exp $ COMMENT= SQL shell for FreeTDS @@ -14,12 +14,12 @@ HOMEPAGE= http://sourceforge.net/projects/sqsh/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c ct>=2 ncurses m pthread readline +WANTLIB += c ct>=2 iconv ncurses m pthread readline MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqsh/} -MODULES= converters/libiconv -LIB_DEPENDS= databases/freetds +LIB_DEPENDS= converters/libiconv \ + databases/freetds CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.69 diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 6eeddf4d30d..044f9465799 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/03/27 15:31:23 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2016/09/13 11:44:07 naddy Exp $ BROKEN-macppc = make: don't know how to make all @@ -15,17 +15,17 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt WANTLIB += bz2 c crypto djvulibre expat fftw3 fontconfig freetype -WANTLIB += jbig jpeg lcms2 lzma m openjp2 png pthread pthread-stubs +WANTLIB += iconv jbig jpeg lcms2 lzma m openjp2 png pthread pthread-stubs WANTLIB += ssl tiff webp xcb xml2 z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=virtuoso/} -MODULES = converters/libiconv BUILD_DEPENDS = devel/bison \ devel/gperf \ lang/gawk -LIB_DEPENDS = graphics/ImageMagick \ +LIB_DEPENDS = converters/libiconv \ + graphics/ImageMagick \ graphics/lcms2 \ textproc/libxml