From nobody Sun Oct 29 22:57:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SJWyB2MHYz4yKcq; Sun, 29 Oct 2023 22:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SJWyB0qngz4qL4; Sun, 29 Oct 2023 22:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698620258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EselRpmZUEJ1Qkho9RHNGVe6RoFJvAbyOopMwnaAWM=; b=qQWZJZ7VCVXbsLG/NsiPxNb1mCGIy+/8984kTmukqDCIWlckfZRz7Cx6uxazU7P9RW6XeA vHp76hP5UOZkuQvTAlqlAuTt8efeHNfPzuxezvvbeOUBIeMY12qqLVx8zjsC/FIXE82odb 27SQFhAdGVsu6Yi5FC/6vBDSSfpUugDpHxGkbVrq4tyhM36EZBh5q+Sl4KVt20UWqUd/+e 5UBjEn/p7C6tsgW6zB2xW74txjwUCHIuNk4zRIGdtfsYYBn1bFAfPdbKA96JnktIvH4puw wRwPPboZ3PiWMYHviqszPRau9m1YaFsEoZlRA5JJcZFLsaFaeeYkJeUWlkzSPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698620258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EselRpmZUEJ1Qkho9RHNGVe6RoFJvAbyOopMwnaAWM=; b=wn3ubVb7J5+h3s16u/CHcx+PqtyQJwvmDvQMDjwzjHj+/ZaVgtd8iR3DM21l++XrbDMUAE 8oEc3Jf4dfS208pcZJ8QNe05tf/KhF3kU7RsWJvEg7fo8bJvVY/G9O3+bEIfNNGbqtr5bL HHUo1lPpiJf1aArN2DCQ1qh3ZSofcO7azLMV9tB2AnmkF0ihmqMy3e0fVmFWQ29eycn2CM FuEYwsxQGmHlrKuXVDm5Rs2CPJxOYHqxdDXDNlo859HV5zCncQo4K86QkQLOpVhQvdjBgL SjnraKwQyvpwmubvaeE8LMeMmlhwPpKYKXA/huc2FazEYuLJRc2gM8minKRzTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698620258; a=rsa-sha256; cv=none; b=ADCdg1/miRLssmJGSOBPg6I4yNLN27xqUJh+GHVIKwzWZaxxyDdiCQ7d0lGn/jntj/ttMb IgtNraKe0so9dow2ZFJl44nyrgJme+HmRiAv8FoKORxBaT8cmQcJJvZWJSYPJ9tP52e+ri ljeI1mnqUYpZyV5MDKxjeZU+6dJ+k6aqVTT8zxSxdIdK75m0UhhdeWRXHI0lZ0IRfwCFGi RWrbIQfcJwcGq41rm3ePgOyP60hIRR7PmLTKVZfBo4r0hBzlc+xXaRsocZTpemuYjEbVCg RojQqMIL+ntTYzTGqZNVjwekiXR82SmnlvK/GY+FEIgjUFdhqhNSwBdf2Fk1xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJWy96yTNzxTQ; Sun, 29 Oct 2023 22:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39TMvbkS029744; Sun, 29 Oct 2023 22:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39TMvbx4029741; Sun, 29 Oct 2023 22:57:37 GMT (envelope-from git) Date: Sun, 29 Oct 2023 22:57:37 GMT Message-Id: <202310292257.39TMvbx4029741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 2b82fe1a1687 - main - devel/gearmand: Unbreak on 13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b82fe1a16879d3c3183f281a81be9fe0a480ebe Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b82fe1a16879d3c3183f281a81be9fe0a480ebe commit 2b82fe1a16879d3c3183f281a81be9fe0a480ebe Author: Muhammad Moinur Rahman AuthorDate: 2023-10-29 18:58:53 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-10-29 22:53:37 +0000 devel/gearmand: Unbreak on 13 - Utilize USES=localbase - Utilize OPTIONSNG - Pet portclippy --- devel/gearmand/Makefile | 108 +++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 70 deletions(-) diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index f9892031a87a..0ab3bf84fe37 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -8,109 +8,77 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library WWW= http://www.gearman.org/ -BROKEN_FreeBSD_13= error: use of undeclared identifier 'abi' - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid -CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.* - -USERS= gearmand -GROUPS= gearmand - -USES= compiler:c++11-lang pathfix gmake perl5 python:build libtool -USE_PERL5= build -GNU_CONFIGURE= yes +USES= compiler:c++11-lang pathfix gmake perl5 python:build \ + libtool localbase:ldflags +USE_CXXSTD= gnu++98 USE_LDCONFIG= yes +USE_PERL5= build USE_RC_SUBR= gearmand -SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} -USE_CXXSTD= gnu++98 +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE} \ --localstatedir=/var/db/${PORTNAME} --enable-static -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo + +LDFLAGS+= -lexecinfo + +CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.* + +SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} + +USERS= gearmand +GROUPS= gearmand OPTIONS_DEFINE= DRIZZLE MEMCACHED PGSQL SQLITE MYSQL HIREDIS TOKYOCAB OPTIONS_DEFAULT=SQLITE DRIZZLE_DESC= Drizzle support for persistent queue +HIREDIS_DESC= Hiredis support for persistent queue MEMCACHED_DESC= memcached support for persistent queue MYSQL_DESC= MySQL support for persistent queue PGSQL_DESC= PostgreSQL support for persistent queue SQLITE_DESC= SQLite support for persistent queue -HIREDIS_DESC= Hiredis support for persistent queue TOKYOCAB_DESC= Tokyo Cabinet support for persistent queue -.include +DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle +DRIZZLE_CONFIGURE_ENABLE= libdrizzle +HIREDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +HIREDIS_CONFIGURE_ENABLE= hires +HIREDIS_CONFIGURE_ENV= LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \ + LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib +MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached +MEMCACHED_CONFIGURE_ENABLE= libmemcached +MYSQL_USES= mysql +MYSQL_CONFIGURE_ON= --with-mysql=yes +MYSQL_CONFIGURE_OFF= --with-mysql=no +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ENABLE= libpq +SQLITE_USES= sqlite +SQLITE_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} +SQLITE_CONFIGURE_OFF= --without-sqlite3 +TOKYOCAB_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +TOKYOCAB_CONFIGURE_ENABLE= libtokyocabinet +TOKYOCAB_CONFIGURE_ENV= LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \ + LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MDRIZZLE} -LIB_DEPENDS+= libdrizzle.so:databases/libdrizzle -CONFIGURE_ARGS+= --enable-libdrizzle -.else -CONFIGURE_ARGS+= --disable-libdrizzle -.endif +.include .if ${PORT_OPTIONS:MMEMCACHED} -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -BUILD_DEPENDS+= memcached>=0:databases/memcached -CONFIGURE_ARGS+= --enable-libmemcached # This hack is required for the test programs invoked by configure, # in the event that libmemcached was compiled with SASL support. .if exists(${LOCALBASE}/lib/libsasl.so) -LDFLAGS+= -L${LOCALBASE}/lib -lsasl +LDFLAGS+= -lsasl CONFIGURE_ARGS+= --with-memcached-sasl=${LOCALBASE}/bin/memcached .elif exists(${LOCALBASE}/lib/libsasl2.a) -LDFLAGS+= -L${LOCALBASE}/lib -lsasl2 +LDFLAGS+= -lsasl2 CONFIGURE_ARGS+= --with-memcached-sasl=${LOCALBASE}/bin/memcached .else -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-memcached=${LOCALBASE}/bin/memcached .endif -.else -CONFIGURE_ARGS+= --disable-libmemcached -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USES+= mysql -CONFIGURE_ARGS+= --with-mysql=yes -.else -CONFIGURE_ARGS+= --with-mysql=no -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+= --enable-libpq -.else -CONFIGURE_ARGS+= --disable-libpq -.endif - -.if ${PORT_OPTIONS:MSQLITE} -BUILD_DEPENDS+= sqlite3>=3.0.0:databases/sqlite3 -LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 -CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-sqlite3 -.endif - -.if ${PORT_OPTIONS:MTOKYOCAB} -LIB_DEPENDS+= libtokyocabinet.so:databases/tokyocabinet -CONFIGURE_ARGS+= --enable-libtokyocabinet -CONFIGURE_ENV+= LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \ - LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-libtokyocabinet -.endif - -.if ${PORT_OPTIONS:MHIREDIS} -LIB_DEPENDS+= libhiredis.so:databases/hiredis -CONFIGURE_ARGS+= --enable-hires -CONFIGURE_ENV+= LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \ - LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-hires .endif .include