From 88c5a3338bf51489cf6916f5382a1905afa7014b Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 19 Mar 2016 21:18:37 +0000 Subject: [PATCH] For all our ports that use the pecl module, SHARED_ONLY is always defined and "c" is always added to WANTLIB. Remove the check from the module and add WANTLIB += c to the individual port Makefiles. No changes in package signature, no other modules affected. --- archivers/pecl-lzf/Makefile | 4 +++- archivers/pecl-rar/Makefile | 4 ++-- databases/pecl-redis/Makefile | 4 +++- graphics/pecl-imagick/Makefile | 4 ++-- lang/php/pecl/pecl.port.mk | 7 +------ mail/pecl-mailparse/Makefile | 4 +++- security/pecl-libsodium/Makefile | 4 ++-- www/pecl-chroot/Makefile | 4 +++- www/pecl-geoip/Makefile | 4 ++-- www/pecl-http/Makefile | 4 ++-- www/pecl-memcache/Makefile | 4 +++- www/pecl-memcached/Makefile | 4 ++-- www/pecl-proctitle/Makefile | 4 +++- www/pecl-propro/Makefile | 4 +++- www/pecl-raphf/Makefile | 4 +++- www/pecl-ssh2/Makefile | 4 ++-- www/pecl-swish/Makefile | 4 ++-- www/pecl-uploadprogress/Makefile | 4 +++- 18 files changed, 44 insertions(+), 31 deletions(-) diff --git a/archivers/pecl-lzf/Makefile b/archivers/pecl-lzf/Makefile index 7751f802b31..9b317033312 100644 --- a/archivers/pecl-lzf/Makefile +++ b/archivers/pecl-lzf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/19 21:18:37 naddy Exp $ COMMENT = PHP support for LZF de/compression @@ -10,6 +10,8 @@ REVISION = 0 # PHP PERMIT_PACKAGE_CDROM = Yes +WANTLIB = c + MODULES = lang/php/pecl CONFIGURE_STYLE = gnu diff --git a/archivers/pecl-rar/Makefile b/archivers/pecl-rar/Makefile index bc178c86c8d..42be2c6e80c 100644 --- a/archivers/pecl-rar/Makefile +++ b/archivers/pecl-rar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP support for rar archives @@ -9,7 +9,7 @@ REVISION= 2 # PHP PERMIT_PACKAGE_CDROM= Yes -WANTLIB= m stdc++ +WANTLIB= c m stdc++ MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index 42d1563483b..c4db21952a5 100644 --- a/databases/pecl-redis/Makefile +++ b/databases/pecl-redis/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/11 20:28:23 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP interface to redis @@ -10,6 +10,8 @@ CATEGORIES= databases # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index f297327a0d7..85d0a2e37e3 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2016/03/14 09:11:06 sthen Exp $ +# $OpenBSD: Makefile,v 1.29 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP support for the ImageMagick library @@ -9,7 +9,7 @@ CATEGORIES= graphics PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt -WANTLIB += bz2 djvulibre expat fftw3 fontconfig freetype jbig +WANTLIB += bz2 c djvulibre expat fftw3 fontconfig freetype jbig WANTLIB += jpeg lcms2 lzma m openjp2 png pthread pthread-stubs WANTLIB += tiff webp xcb xml2 z diff --git a/lang/php/pecl/pecl.port.mk b/lang/php/pecl/pecl.port.mk index edaee7307d4..d151978f50a 100644 --- a/lang/php/pecl/pecl.port.mk +++ b/lang/php/pecl/pecl.port.mk @@ -1,9 +1,8 @@ -# $OpenBSD: pecl.port.mk,v 1.5 2015/11/14 14:55:47 sthen Exp $ +# $OpenBSD: pecl.port.mk,v 1.6 2016/03/19 21:18:38 naddy Exp $ # PHP PECL module MODULES += lang/php -SHARED_ONLY ?= Yes CATEGORIES += www PKGNAME ?= pecl-${DISTNAME:S/pecl-//:S/_/-/:L} @@ -35,7 +34,3 @@ TEST_TARGET = test TEST_FLAGS = NO_INTERACTION=1 USE_GMAKE ?= Yes .endif - -.if ${SHARED_ONLY:L} == "yes" -WANTLIB += c -.endif diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile index 50b5f3107ea..9dc0e36cd66 100644 --- a/mail/pecl-mailparse/Makefile +++ b/mail/pecl-mailparse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $ COMMENT = PHP extension for parsing and working with rfc822/MIME mail @@ -11,6 +11,8 @@ MAINTAINER = Stuart Henderson # PHP PERMIT_PACKAGE_CDROM = Yes +WANTLIB = c + AUTOCONF_VERSION = 2.52 AUTOMAKE_VERSION = 1.4 diff --git a/security/pecl-libsodium/Makefile b/security/pecl-libsodium/Makefile index 13d1304faf0..116bc066512 100644 --- a/security/pecl-libsodium/Makefile +++ b/security/pecl-libsodium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/02/02 00:51:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/19 21:18:38 naddy Exp $ COMMENT = low-level encryption extension for PHP @@ -13,7 +13,7 @@ MAINTAINER = Stuart Henderson # BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB += sodium +WANTLIB += c sodium MODULES = lang/php/pecl LIB_DEPENDS = security/libsodium diff --git a/www/pecl-chroot/Makefile b/www/pecl-chroot/Makefile index 21fc06772f6..49067c6db12 100644 --- a/www/pecl-chroot/Makefile +++ b/www/pecl-chroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP support for chroot(2) @@ -10,6 +10,8 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + # not really PECL but close enough MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-geoip/Makefile b/www/pecl-geoip/Makefile index a8f1199ad7b..1e409bf638e 100644 --- a/www/pecl-geoip/Makefile +++ b/www/pecl-geoip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2016/03/01 00:07:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP support for geocoding IPv4 addresses @@ -8,7 +8,7 @@ REVISION= 1 # PHP PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GeoIP +WANTLIB += GeoIP c MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile index e09fb16df39..9bba401172d 100644 --- a/www/pecl-http/Makefile +++ b/www/pecl-http/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/19 21:18:38 naddy Exp $ COMMENT= extended HTTP support @@ -18,7 +18,7 @@ MODULES= lang/php/pecl \ CONFIGURE_STYLE= gnu -WANTLIB+= crypto curl event idn nghttp2 ssl z +WANTLIB+= c crypto curl event idn nghttp2 ssl z RUN_DEPENDS+= www/pecl-raphf \ www/pecl-propro TEST_DEPENDS+= ${RUN_DEPENDS} diff --git a/www/pecl-memcache/Makefile b/www/pecl-memcache/Makefile index 7a1b5015a7f..3cffd445d9f 100644 --- a/www/pecl-memcache/Makefile +++ b/www/pecl-memcache/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP interface to memcached @@ -9,6 +9,8 @@ REVISION= 0 # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-memcached/Makefile b/www/pecl-memcached/Makefile index 6bfb3eebdb3..81d501746f9 100644 --- a/www/pecl-memcached/Makefile +++ b/www/pecl-memcached/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/02/01 21:55:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP interface to memcached via libmemcached @@ -8,7 +8,7 @@ REVISION= 2 # PHP PERMIT_PACKAGE_CDROM= Yes -WANTLIB += memcached memcachedutil pthread sasl2 z +WANTLIB += c memcached memcachedutil pthread sasl2 z MODULES= lang/php/pecl LIB_DEPENDS= devel/libmemcached diff --git a/www/pecl-proctitle/Makefile b/www/pecl-proctitle/Makefile index 7db95ff0b80..1a113deff7b 100644 --- a/www/pecl-proctitle/Makefile +++ b/www/pecl-proctitle/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP support for setproctitle @@ -8,6 +8,8 @@ REVISION= 2 # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-propro/Makefile b/www/pecl-propro/Makefile index 6a6dfbe9b90..d634d065c62 100644 --- a/www/pecl-propro/Makefile +++ b/www/pecl-propro/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/19 21:18:38 naddy Exp $ COMMENT= reusable split of pecl_http's property proxy API#' @@ -8,6 +8,8 @@ REVISION= 3 # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-raphf/Makefile b/www/pecl-raphf/Makefile index 38255401dbd..3da8fdc6f37 100644 --- a/www/pecl-raphf/Makefile +++ b/www/pecl-raphf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/19 21:18:38 naddy Exp $ COMMENT= persistent handle and resource factory API @@ -8,6 +8,8 @@ REVISION= 0 # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-ssh2/Makefile b/www/pecl-ssh2/Makefile index 6bf41e135ee..0217a7bae98 100644 --- a/www/pecl-ssh2/Makefile +++ b/www/pecl-ssh2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP bindings for the libssh2 library @@ -8,7 +8,7 @@ REVISION= 0 # PHP PERMIT_PACKAGE_CDROM= Yes -WANTLIB += crypto ssh2 ssl z +WANTLIB += c crypto ssh2 ssl z MODULES= lang/php/pecl CONFIGURE_STYLE= gnu diff --git a/www/pecl-swish/Makefile b/www/pecl-swish/Makefile index 4417c7cce9b..da45b2d6909 100644 --- a/www/pecl-swish/Makefile +++ b/www/pecl-swish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2016/03/19 21:18:38 naddy Exp $ COMMENT = PHP interface to swish-e @@ -8,7 +8,7 @@ REVISION = 2 # PHP PERMIT_PACKAGE_CDROM = Yes -WANTLIB = m pcre pcreposix swish-e z +WANTLIB = c m pcre pcreposix swish-e z MODULES = lang/php/pecl CONFIGURE_STYLE = gnu diff --git a/www/pecl-uploadprogress/Makefile b/www/pecl-uploadprogress/Makefile index 20420b62625..befbefce6be 100644 --- a/www/pecl-uploadprogress/Makefile +++ b/www/pecl-uploadprogress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/19 21:18:38 naddy Exp $ COMMENT= PHP upload progress meter @@ -8,6 +8,8 @@ REVISION= 2 # PHP PERMIT_PACKAGE_CDROM= Yes +WANTLIB= c + MODULES= lang/php/pecl CONFIGURE_STYLE= gnu