Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Oct 2023 22:57:37 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2b82fe1a1687 - main - devel/gearmand: Unbreak on 13
Message-ID:  <202310292257.39TMvbx4029741@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2b82fe1a16879d3c3183f281a81be9fe0a480ebe

commit 2b82fe1a16879d3c3183f281a81be9fe0a480ebe
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-10-29 18:58:53 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310292257.39TMvbx4029741>