diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index a5d59dd56e7..07fcb2a8e9b 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.141 2016/08/20 19:39:37 kili Exp $ +# $OpenBSD: Makefile,v 1.142 2016/09/13 18:52:05 naddy Exp $ COMMENT = compiler for the functional language Haskell @@ -21,13 +21,15 @@ BIN_VER = 7.10.2.20160325 # Pull in lang/ghc to get MODGHC_VER and ONLY_FOR_ARCHS, which is maintained # in ghc.port.mk. lang/python needed for regression tests. -MODULES = lang/ghc lang/python converters/libiconv +MODULES = lang/ghc lang/python # BSD w/o advertising clause + LGPLv3 (from libgmp). # Distfile is bundled with other stuff like libffi, mingw # binaries, with BSD, GPLv2 and Perl artistic license. PERMIT_PACKAGE_CDROM = Yes +LIB_DEPENDS = converters/libiconv + BUILD_DEPENDS = archivers/gtar \ textproc/docbook-xsl RUN_DEPENDS = @@ -36,7 +38,7 @@ RUN_DEPENDS = # loadObj_() instead. USE_WXNEEDED = Yes -WANTLIB += c m ncursesw pthread util +WANTLIB += c iconv m ncursesw pthread util MASTER_SITES = ${HOMEPAGE}dist/${MODGHC_VER}/ \ ${HOMEPAGE}dist/stable/dist/ diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile index ca9e0b806fb..6bde541826d 100644 --- a/print/foomatic-db-engine/Makefile +++ b/print/foomatic-db-engine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2015/04/21 18:24:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.37 2016/09/13 18:52:05 naddy Exp $ COMMENT= Foomatic PPD generator @@ -13,13 +13,12 @@ MAINTAINER= Antoine Jacoutot # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c m pthread xml2 z +WANTLIB += c iconv m pthread xml2 z MASTER_SITES= http://www.openprinting.org/download/foomatic/ -MODULES= converters/libiconv - -LIB_DEPENDS= textproc/libxml +LIB_DEPENDS= converters/libiconv \ + textproc/libxml RUN_DEPENDS= databases/p5-DBI \ curl-*|wget-*:net/curl diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile index 74737f5d1db..4ab6bf3adb5 100644 --- a/print/ghostscript/gnu/Makefile +++ b/print/ghostscript/gnu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.107 2016/03/10 20:26:03 naddy Exp $ +# $OpenBSD: Makefile,v 1.108 2016/09/13 18:52:05 naddy Exp $ COMMENT= GNU PostScript interpreter @@ -25,12 +25,11 @@ SUBST_VARS= VERSION FLAVOR_STRING # only be redistributed without modifications. PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c ijs m jbig2dec jpeg>=62 lcms2 png>=6 pthread tiff z - -MODULES= converters/libiconv +WANTLIB= c iconv ijs m jbig2dec jpeg>=62 lcms2 png>=6 pthread tiff z RUN_DEPENDS= print/ghostscript/gnu-fonts>=8.11p3 -LIB_DEPENDS= graphics/jbig2dec \ +LIB_DEPENDS= converters/libiconv \ + graphics/jbig2dec \ graphics/jpeg \ graphics/lcms2 \ graphics/png \ diff --git a/print/gv/Makefile b/print/gv/Makefile index 185384b9ac3..d5789103641 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2016/03/05 17:42:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.42 2016/09/13 18:52:05 naddy Exp $ COMMENT= PostScript and PDF previewer @@ -12,11 +12,10 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gv/} # GPLv3+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c m Xaw3d Xinerama +WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c iconv m Xaw3d Xinerama -MODULES= converters/libiconv - -LIB_DEPENDS= x11/Xaw3d +LIB_DEPENDS= converters/libiconv \ + x11/Xaw3d RUN_DEPENDS= print/ghostscript/gnu CONFIGURE_STYLE= gnu diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile index 37bdd3f66c5..40859612b53 100755 --- a/print/texlive/base/Makefile +++ b/print/texlive/base/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.83 2016/06/01 12:46:35 edd Exp $ +# $OpenBSD: Makefile,v 1.84 2016/09/13 18:52:05 naddy Exp $ COMMENT = base binaries for TeXLive typesetting distribution @@ -17,7 +17,7 @@ SHARED_LIBS += texlua52 0.0 # 7.4 WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xi Xmu Xpm Xrender Xt WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2 -WANTLIB += harfbuzz harfbuzz-icu icudata icui18n icuio icuuc intl +WANTLIB += harfbuzz harfbuzz-icu iconv icudata icui18n icuio icuuc intl WANTLIB += jpeg lcms2 m openjpeg paper pcre pixman-1 png poppler WANTLIB += potrace pthread pthread-stubs stdc++ tiff vpx xcb WANTLIB += xcb-render xcb-shm z zzip @@ -30,7 +30,8 @@ RUN_DEPENDS = print/ghostscript/gnu \ print/t1utils \ texlive_texmf-buildset-${V}:print/texlive/texmf,-buildset -LIB_DEPENDS = graphics/png \ +LIB_DEPENDS = converters/libiconv \ + graphics/png \ graphics/gd \ print/poppler \ graphics/cairo \ @@ -41,7 +42,7 @@ LIB_DEPENDS = graphics/png \ archivers/zziplib \ graphics/potrace -MODULES = textproc/intltool converters/libiconv perl +MODULES = textproc/intltool perl # Never set SEPARATE_BUILD CONFIGURE_STYLE = gnu diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 392782cfc43..5fe931f8a6a 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/06/14 11:29:46 jca Exp $ +# $OpenBSD: Makefile,v 1.6 2016/09/13 18:52:05 naddy Exp $ COMMENT= open-source turn-key solution for DNSSEC @@ -17,13 +17,12 @@ WANTLIB += c crypto iconv ldns lzma m pthread xml2 z MASTER_SITES= http://dist.opendnssec.org/source/ -LIB_DEPENDS= net/ldns/libldns \ +LIB_DEPENDS= converters/libiconv \ + net/ldns/libldns \ textproc/libxml TEST_DEPENDS= security/softhsm -MODULES= converters/libiconv - FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/opendnssec CONFIGURE_STYLE= gnu diff --git a/security/rarcrack/Makefile b/security/rarcrack/Makefile index 84407f0469d..d9fa76b2fbf 100644 --- a/security/rarcrack/Makefile +++ b/security/rarcrack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2014/03/25 21:20:39 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2016/09/13 18:52:05 naddy Exp $ COMMENT= rar, 7zip and zip password bruteforcer @@ -13,11 +13,10 @@ MAINTAINER= Laurent Fanis # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c m pthread z xml2 +WANTLIB= c iconv m pthread z xml2 -MODULES= converters/libiconv - -LIB_DEPENDS= textproc/libxml +LIB_DEPENDS= converters/libiconv \ + textproc/libxml RUN_DEPENDS= archivers/p7zip \ archivers/unrar \ diff --git a/sysutils/augeas/Makefile b/sysutils/augeas/Makefile index 6a30a4a6ff5..a53e61923b0 100644 --- a/sysutils/augeas/Makefile +++ b/sysutils/augeas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2016/08/15 10:32:33 jasper Exp $ +# $OpenBSD: Makefile,v 1.35 2016/09/13 18:52:05 naddy Exp $ COMMENT= configuration editing tool and API @@ -15,14 +15,12 @@ HOMEPAGE= http://augeas.net/ # LGPLv2.1+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c lzma m ncurses pthread readline xml2 z +WANTLIB += c iconv lzma m ncurses pthread readline xml2 z MASTER_SITES= http://download.augeas.net/ -MODULES= converters/libiconv - -LIB_DEPENDS= textproc/libxml - +LIB_DEPENDS= converters/libiconv \ + textproc/libxml USE_GMAKE= Yes diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile index 240612b0c81..4984f00e46f 100644 --- a/sysutils/cfengine/Makefile +++ b/sysutils/cfengine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2016/01/22 11:38:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.55 2016/09/13 18:52:05 naddy Exp $ COMMENT = GNU system administration tool for networks @@ -13,7 +13,7 @@ MAINTAINER = Rodrigo Mosconi # GPLv3 only PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c crypto lzma m pam pcre pthread ssl qdbm xml2 z +WANTLIB += c crypto iconv lzma m pam pcre pthread ssl qdbm xml2 z MASTER_SITES = https://cfengine-package-repos.s3.amazonaws.com/tarballs/ @@ -27,8 +27,8 @@ FLAVOR ?= SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu USE_GMAKE = Yes -MODULES = converters/libiconv -LIB_DEPENDS = databases/qdbm \ +LIB_DEPENDS = converters/libiconv \ + databases/qdbm \ devel/pcre \ security/openpam \ textproc/libxml diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index bcaeb5bd903..5f39f9dbacc 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2016/03/14 21:30:29 landry Exp $ +# $OpenBSD: Makefile,v 1.17 2016/09/13 18:52:05 naddy Exp $ COMMENT = data recovery software @@ -15,8 +15,6 @@ MAINTAINER = Landry Breuil # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MODULES = converters/libiconv - SUBST_VARS += VERSION CONFIGURE_STYLE = gnu @@ -24,11 +22,12 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS = --disable-qt -LIB_DEPENDS = sysutils/e2fsprogs>=1.42.7 \ +LIB_DEPENDS = converters/libiconv \ + sysutils/e2fsprogs>=1.42.7 \ sysutils/ntfs-3g \ graphics/jpeg -WANTLIB = c com_err uuid ext2fs jpeg ncursesw ntfs-3g z +WANTLIB = c com_err iconv uuid ext2fs jpeg ncursesw ntfs-3g z post-install: ${INSTALL_DATA} ${WRKSRC}/documentation.html ${PREFIX}/share/doc/testdisk/ diff --git a/textproc/TclXML/Makefile b/textproc/TclXML/Makefile index a1779d4e289..9ab67d21724 100644 --- a/textproc/TclXML/Makefile +++ b/textproc/TclXML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2016/03/11 20:28:32 naddy Exp $ +# $OpenBSD: Makefile,v 1.27 2016/09/13 18:52:05 naddy Exp $ COMMENT = XML parser for Tcl @@ -15,11 +15,11 @@ SHARED_LIBS += Tclxml32 0.0 # custom PERMIT_PACKAGE_CDROM = Yes -MODULES = converters/libiconv \ - lang/tcl -WANTLIB += m z exslt xslt xml2 +MODULES = lang/tcl +WANTLIB += m z exslt iconv xslt xml2 BUILD_DEPENDS += ${MODTCL_BUILD_DEPENDS} -LIB_DEPENDS += textproc/libxml \ +LIB_DEPENDS += converters/libiconv \ + textproc/libxml \ textproc/libxslt RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} \ devel/tcllib diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile index b32ff9ed3f8..dc39c6736ad 100644 --- a/textproc/apertium/Makefile +++ b/textproc/apertium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/01/19 03:03:18 bentley Exp $ +# $OpenBSD: Makefile,v 1.3 2016/09/13 18:52:05 naddy Exp $ COMMENT = rule-based machine translation platform @@ -18,17 +18,16 @@ MAINTAINER = Anthony J. Bentley # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c lttoolbox3-3.3 lzma m pcre pcrecpp pcreposix pthread +WANTLIB += c iconv lttoolbox3-3.3 lzma m pcre pcrecpp pcreposix pthread WANTLIB += stdc++ xml2 z -MODULES = converters/libiconv - MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=apertium/} BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS = shells/bash \ textproc/libxslt -LIB_DEPENDS = devel/pcre \ +LIB_DEPENDS = converters/libiconv \ + devel/pcre \ textproc/lttoolbox CONFIGURE_STYLE = gnu diff --git a/textproc/clo++/Makefile b/textproc/clo++/Makefile index bd9b35a23c4..55449300742 100644 --- a/textproc/clo++/Makefile +++ b/textproc/clo++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/04/21 18:19:27 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2016/09/13 18:52:05 naddy Exp $ COMMENT= command line parser generator @@ -11,13 +11,12 @@ HOMEPAGE= http://pmade.org/~pjones/software/clo++/ # BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c m pthread stdc++ xml2>=6 z +WANTLIB += c iconv m pthread stdc++ xml2>=6 z MASTER_SITES= ${HOMEPAGE}/download/ -MODULES= converters/libiconv - -LIB_DEPENDS= textproc/libxml +LIB_DEPENDS= converters/libiconv \ + textproc/libxml CONFIGURE_STYLE= gnu diff --git a/textproc/docbook2x/Makefile b/textproc/docbook2x/Makefile index 512a69e7f42..e41afb24f69 100644 --- a/textproc/docbook2x/Makefile +++ b/textproc/docbook2x/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2013/03/11 11:42:41 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2016/09/13 18:52:05 naddy Exp $ COMMENT = convert DocBook to man pages and Texinfo @@ -13,11 +13,11 @@ HOMEPAGE = http://docbook2x.sourceforge.net/ # MIT-like PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c +WANTLIB += c iconv MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=docbook2x/} -MODULES += converters/libiconv +LIB_DEPENDS += converters/libiconv RUN_DEPENDS = textproc/libxml \ textproc/libxslt \ textproc/p5-XML-SAX diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index 5306d028f96..c27f6a4dffa 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2016/04/19 09:30:12 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.30 2016/09/13 18:52:05 naddy Exp $ COMMENT = utilities for manipulating XML documents @@ -9,17 +9,18 @@ HOMEPAGE = http://projects.haskell.org/HaXml/ MAINTAINER = David Coppa -WANTLIB = c m pthread util +WANTLIB = c iconv m pthread util # GPLv2 / LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes -MODULES = lang/ghc converters/libiconv +MODULES = lang/ghc MODGHC_BUILD = cabal hackage haddock register MODGHC_PACKAGE_KEY = 9Sfem87B5t5FBGKSIaajtJ +LIB_DEPENDS += converters/libiconv RUN_DEPENDS += devel/hs-random \ textproc/hs-polyparse>=1.10 BUILD_DEPENDS += ${RUN_DEPENDS} diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile index 9895b50e365..cfe8c7ea6f4 100644 --- a/textproc/hyperestraier/Makefile +++ b/textproc/hyperestraier/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2016/03/11 19:59:17 naddy Exp $ +# $OpenBSD: Makefile,v 1.18 2016/09/13 18:52:05 naddy Exp $ COMMENT= high performance full-text search system @@ -16,10 +16,10 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hyperestraier/} -WANTLIB= c m pthread z qdbm>=14.11 -MODULES= converters/libiconv +WANTLIB= c iconv m pthread z qdbm>=14.11 -LIB_DEPENDS= databases/qdbm +LIB_DEPENDS= converters/libiconv \ + databases/qdbm CONFIGURE_STYLE= gnu diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile index 1d7a860a078..ff5b526ea28 100644 --- a/textproc/lttoolbox/Makefile +++ b/textproc/lttoolbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/01/19 03:03:21 bentley Exp $ +# $OpenBSD: Makefile,v 1.4 2016/09/13 18:52:06 naddy Exp $ COMMENT = finite-state lexical processing toolkit @@ -18,12 +18,12 @@ MAINTAINER = Anthony J. Bentley # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c lzma m pthread stdc++ xml2 z +WANTLIB += c iconv lzma m pthread stdc++ xml2 z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=apertium/} -MODULES = converters/libiconv -LIB_DEPENDS = textproc/libxml +LIB_DEPENDS = converters/libiconv \ + textproc/libxml CONFIGURE_STYLE = gnu diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile index 814a36ac470..1c805e22d74 100644 --- a/textproc/ocaml-text/Makefile +++ b/textproc/ocaml-text/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/06/23 19:23:54 krw Exp $ +# $OpenBSD: Makefile,v 1.10 2016/09/13 18:52:06 naddy Exp $ COMMENT = library for dealing with unicode text CATEGORIES = devel textproc @@ -14,9 +14,11 @@ HOMEPAGE = http://ocaml-text.forge.ocamlcore.org/ # BSD3 PERMIT_PACKAGE_CDROM = Yes -MODULES = converters/libiconv \ - lang/ocaml +MODULES = lang/ocaml +WANTLIB = iconv + +LIB_DEPENDS = converters/libiconv RUN_DEPENDS = lang/ocaml devel/ocaml-pcre BUILD_DEPENDS = sysutils/findlib devel/ocaml-pcre lang/ocaml-camlp4 \ devel/ocaml-ocamlbuild diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile index 168a071bbc0..749a369f9cb 100644 --- a/textproc/p5-XML-LibXML/Makefile +++ b/textproc/p5-XML-LibXML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2016/08/10 12:22:33 bluhm Exp $ +# $OpenBSD: Makefile,v 1.52 2016/09/13 18:52:06 naddy Exp $ COMMENT = perl binding for libxml2 @@ -12,13 +12,14 @@ MAINTAINER = Alexander Bluhm # perl PERMIT_PACKAGE_CDROM = Yes -WANTLIB = m perl xml2 z +WANTLIB = iconv m perl xml2 z -MODULES = cpan converters/libiconv +MODULES = cpan RUN_DEPENDS = textproc/p5-XML-NamespaceSupport>=1.07 \ textproc/p5-XML-SAX>=0.11 \ textproc/p5-XML-SAX-Base -LIB_DEPENDS = textproc/libxml>=2.7.6 +LIB_DEPENDS = converters/libiconv \ + textproc/libxml>=2.7.6 TEST_DEPENDS = devel/p5-Test-LeakTrace .include diff --git a/textproc/ruby-nokogiri/Makefile b/textproc/ruby-nokogiri/Makefile index 6b70afc6f9c..a30484f9796 100644 --- a/textproc/ruby-nokogiri/Makefile +++ b/textproc/ruby-nokogiri/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2016/01/07 01:00:19 jeremy Exp $ +# $OpenBSD: Makefile,v 1.25 2016/09/13 18:52:06 naddy Exp $ COMMENT= HTML, XML, SAX and Reader parser @@ -12,10 +12,11 @@ MAINTAINER = Jeremy Evans # BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB= exslt gcrypt gpg-error xml2 xslt z -LIB_DEPENDS= textproc/libxslt +WANTLIB= exslt gcrypt gpg-error iconv xml2 xslt z +LIB_DEPENDS= converters/libiconv \ + textproc/libxslt -MODULES= lang/ruby converters/libiconv +MODULES= lang/ruby CONFIGURE_STYLE= ruby gem ext CONFIGURE_ARGS= --use-system-libraries \ diff --git a/textproc/sphinx/Makefile b/textproc/sphinx/Makefile index cea2c3afaaa..484877a77d9 100644 --- a/textproc/sphinx/Makefile +++ b/textproc/sphinx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/10/28 09:48:47 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2016/09/13 18:52:06 naddy Exp $ COMMENT = free open-source SQL full-text search engine BROKEN-hppa = internal compiler error: internal consistency failure @@ -16,16 +16,17 @@ HOMEPAGE = http://www.sphinxsearch.com/ # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c expat m pthread stdc++ z +WANTLIB = c expat iconv m pthread stdc++ z MASTER_SITES = ${HOMEPAGE}/files/ -MODULES = converters/libiconv \ - lang/php +MODULES = lang/php MODPHP_BUILDDEP = No MODPHP_RUNDEP = No +LIB_DEPENDS = converters/libiconv + LOCALSTATEDIR = ${BASELOCALSTATEDIR}/sphinx CONFIGURE_ARGS = --with-unixodbc=no diff --git a/textproc/swish-e/Makefile b/textproc/swish-e/Makefile index fc0fe3af9d8..4e655fe2ba0 100644 --- a/textproc/swish-e/Makefile +++ b/textproc/swish-e/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/10/29 18:25:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2016/09/13 18:52:06 naddy Exp $ COMMENT = web/text search engine @@ -13,11 +13,10 @@ MASTER_SITES = ${HOMEPAGE}distribution/ # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c lzma m pcre pcreposix pthread xml2 z +WANTLIB += c iconv lzma m pcre pcreposix pthread xml2 z -MODULES = converters/libiconv - -LIB_DEPENDS = devel/pcre \ +LIB_DEPENDS = converters/libiconv \ + devel/pcre \ textproc/libxml RUN_DEPENDS = www/p5-URI \ diff --git a/textproc/wkhtmltopdf/Makefile b/textproc/wkhtmltopdf/Makefile index 8222d9ee658..ce4ea645be6 100644 --- a/textproc/wkhtmltopdf/Makefile +++ b/textproc/wkhtmltopdf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2016/09/10 13:03:43 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2016/09/13 18:52:06 naddy Exp $ ONLY_FOR_ARCHS = amd64 i386 USE_WXNEEDED = Yes @@ -27,13 +27,13 @@ MAINTAINER = Frank Groeneveld # LGPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += X11 Xext Xrender c fontconfig freetype jpeg m +WANTLIB += X11 Xext Xrender c fontconfig freetype iconv jpeg m WANTLIB += png pthread stdc++ z WANTLIB += icui18n # dlopen()d via QLibrary -MODULES = converters/libiconv -LIB_DEPENDS = graphics/png \ +LIB_DEPENDS = converters/libiconv \ + graphics/png \ graphics/jpeg \ textproc/icu4c