Attachment 252836 Details for Bug 280866 – v1: pet portclippy

[patch] v1: pet portclippy

dovecot.diff (text/plain), 5.69 KB, created by Vladimir Druzenko on 2024-08-17 00:11:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-08-17 00:11:00 UTC

Size: 5.69 KB

patch

obsolete

>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 44f42b27f94f..712066e165bd 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -23,121 +23,114 @@ LICENSE_COMB=	dual
> LIB_DEPENDS=	libzstd.so:archivers/zstd
> 
> USES=		cpe iconv libtool pkgconfig ssl
>-USE_RC_SUBR=	dovecot
>+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
>+USE_RC_SUBR=	${PORTNAME}
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--localstatedir=/var \
> 		--with-docs \
> 		--with-ssl=openssl \
>-		--with-statedir=/var/db/dovecot \
>+		--with-statedir=/var/db/${PORTNAME} \
> 		--with-shadow=no \
> 		--with-systemd=no
> 
>-USE_LDCONFIG=	${PREFIX}/lib/dovecot
> INSTALL_TARGET=	install-strip
> 
>-USERS=		dovecot dovenull
>+CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
>+LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
>+
>+SUB_FILES+=	pkg-message
>+SUB_LIST+=	REQUIRE="${_REQUIRE}"
>+# Default requirement for dovecot rc script
>+_REQUIRE=	LOGIN
>+
>+USERS=		${PORTNAME} dovenull
> GROUPS=		${USERS}
> 
>-OPTIONS_DEFINE=	LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>-OPTIONS_DEFAULT=GSSAPI_NONE LDAP LIBWRAP
>-OPTIONS_SUB=	yes
>+DOCS=		AUTHORS COPYING INSTALL NEWS TODO README
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
>+
>+OPTIONS_DEFINE=		LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES
>+OPTIONS_DEFAULT=	GSSAPI_NONE LDAP LIBWRAP
> 
> OPTIONS_GROUP=		DB FTS
> OPTIONS_GROUP_DB=	CDB LDAP MYSQL PGSQL SQLITE
> OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
> 
> OPTIONS_SINGLE=		GSSAPI
>-OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> 
>-DB_DESC=	Database support
>-CDB_DESC=	CDB database support
>+OPTIONS_SUB=		yes
> 
>-FTS_DESC=	Full text search plugins
>-ICU_DESC=	Use libicu for FTS unicode normalization
>-LUCENE_DESC=	CLucene FTS support
>-SOLR_DESC=	Solr FTS support
>-TEXTCAT_DESC=	Libexttextcat FTS support
>-
>-GSSAPI_NONE_DESC=	Build without GSSAPI support
>+CDB_DESC=		CDB database support
>+DB_DESC=		Database support
>+FTS_DESC=		Full text search plugins
> GSSAPI_BASE_DESC=	Use GSSAPI from base
> GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
> GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
>-
>-# General options
>+GSSAPI_NONE_DESC=	Build without GSSAPI support
>+ICU_DESC=		Use libicu for FTS unicode normalization
> LIBSODIUM_DESC=		Support libsodium based crypts (ARGON2I/ARGON2ID)
>-LIBSODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
>-LIBSODIUM_CONFIGURE_WITH=	sodium
>-
>-LIBUNWIND_CONFIGURE_ON=		--with-libunwind=yes
>-LIBUNWIND_CONFIGURE_OFF=	--with-libunwind=no
> LIBUNWIND_DESC=		Get backtraces using libunwind
>-LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
>-
>-LIBWRAP_CONFIGURE_WITH=	libwrap
>-
>-LUA_CONFIGURE_WITH=	lua
>-LUA_USES=		lua:51,53
>-
>-LZ4_CONFIGURE_WITH=	lz4
>-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
>+LUCENE_DESC=		CLucene FTS support
>+SOLR_DESC=		Solr FTS support
>+TEXTCAT_DESC=		Libexttextcat FTS support
> 
>-# Databases
>-CDB_CONFIGURE_WITH=	cdb
>-CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
>+CDB_LIB_DEPENDS=		libcdb.so:databases/tinycdb
>+CDB_CONFIGURE_WITH=		cdb
> 
>-LDAP_USES=		ldap
>-LDAP_CONFIGURE_WITH=	ldap
>+GSSAPI_BASE_USES=		gssapi
>+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>+GSSAPI_MIT_USES=		gssapi:mit
>+GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
>+GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
> 
>-MYSQL_USES=		mysql
>-MYSQL_CONFIGURE_WITH=	mysql
>+ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
>+ICU_CONFIGURE_WITH=		icu
> 
>-PGSQL_USES=		pgsql
>-PGSQL_CONFIGURE_WITH=	pgsql
>+LDAP_USES=			ldap
>+LDAP_CONFIGURE_WITH=		ldap
>+LDAP_VARS=			_REQUIRE+=slapd
> 
>-SQLITE_USES=		sqlite
>-SQLITE_CONFIGURE_WITH=	sqlite
>+LIBSODIUM_LIB_DEPENDS=		libsodium.so:security/libsodium
>+LIBSODIUM_CONFIGURE_WITH=	sodium
> 
>-# FTS
>-ICU_CONFIGURE_WITH=	icu
>-ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
>+LIBUNWIND_LIB_DEPENDS=		libunwind.so:devel/libunwind
>+LIBUNWIND_CONFIGURE_ON=		--with-libunwind=yes
>+LIBUNWIND_CONFIGURE_OFF=	--with-libunwind=no
> 
>-LUCENE_CONFIGURE_WITH=	lucene stemmer
>-LUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene
>+LIBWRAP_CONFIGURE_WITH=		libwrap
> 
>-SOLR_CONFIGURE_WITH=	solr
>-SOLR_LIB_DEPENDS=	libcurl.so:ftp/curl \
>-			libexpat.so:textproc/expat2
>+LUA_USES=			lua:51,53
>+LUA_CONFIGURE_WITH=		lua
> 
>-TEXTCAT_CONFIGURE_WITH=	textcat
>-TEXTCAT_LIB_DEPENDS=	libexttextcat-2.0.so:textproc/libexttextcat
>+LUCENE_LIB_DEPENDS=		libclucene-core.so:textproc/clucene
>+LUCENE_CONFIGURE_WITH=		lucene stemmer
> 
>-# GSSAPI
>-GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
>-GSSAPI_NONE_CONFIGURE_OFF=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
>-GSSAPI_BASE_USES=		gssapi
>-GSSAPI_HEIMDAL_USES=		gssapi:heimdal
>-GSSAPI_MIT_USES=		gssapi:mit
>+LZ4_LIB_DEPENDS=		liblz4.so:archivers/liblz4
>+LZ4_CONFIGURE_WITH=		lz4
> 
>-DOCS=		AUTHORS COPYING INSTALL NEWS TODO README
>-PORTDOCS=	*
>-PORTEXAMPLES=	*
>+MYSQL_USES=			mysql
>+MYSQL_CONFIGURE_WITH=		mysql
>+MYSQL_VARS=			_REQUIRE+=mysql
> 
>-# Default requirement for dovecot rc script
>-_REQUIRE=	LOGIN
>+PGSQL_USES=			pgsql
>+PGSQL_CONFIGURE_WITH=		pgsql
>+PGSQL_VARS=			_REQUIRE+=postgresql
> 
>-LDAP_VARS=	_REQUIRE+=slapd
>-MYSQL_VARS=	_REQUIRE+=mysql
>-PGSQL_VARS=	_REQUIRE+=postgresql
>+SOLR_LIB_DEPENDS=		libcurl.so:ftp/curl \
>+				libexpat.so:textproc/expat2
>+SOLR_CONFIGURE_WITH=		solr
> 
>-SUB_LIST+=	REQUIRE="${_REQUIRE}"
>-SUB_FILES+=	pkg-message
>+SQLITE_USES=			sqlite
>+SQLITE_CONFIGURE_WITH=		sqlite
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
>-LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
>+TEXTCAT_LIB_DEPENDS=		libexttextcat-2.0.so:textproc/libexttextcat
>+TEXTCAT_CONFIGURE_WITH=		textcat
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \
>+	@${REINPLACE_CMD} -e 's,/etc/dovecot,${ETCDIR},g; \
> 		s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \
> 		${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \
> 		${WRKSRC}/doc/example-config/*.conf.ext

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 280866: 252836