Attachment 169457 Details for Bug 208909 – svn diff for ftp/proftpd

[patch] svn diff for ftp/proftpd

patch-ftp_proftpd-FreeBSD-10 (text/plain), 2.07 KB, created by Bernard Spil on 2016-04-18 20:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2016-04-18 20:20:25 UTC

Size: 2.07 KB

patch

obsolete

>Index: ftp/proftpd/Makefile
>===================================================================
>--- ftp/proftpd/Makefile	(revision 413536)
>+++ ftp/proftpd/Makefile	(working copy)
>@@ -48,7 +48,7 @@
> .endif
> 
> MAKE_JOBS_UNSAFE=	yes
>-USES+=		cpe gmake libtool
>+USES=		cpe gmake libtool
> USE_AUTOTOOLS=	autoconf
> GNU_CONFIGURE=	yes
> 
>@@ -93,11 +93,10 @@
> MEMCACHE_DESC=		Memcache support using libmemcached
> 
> PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATEDIR}"
>+OPTIONS_SUB=	yes
> 
> .endif #!defined(_BUILDING_PROFTPD_MODULE)
> 
>-.include <bsd.port.options.mk>
>-
> .if !defined(_BUILDING_PROFTPD_MODULE)
> CPPFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
> LIBS+=		-lssl -lcrypto -L${OPENSSLLIB}
>@@ -142,38 +141,18 @@
> 		mod_wrap2_file \
> 		mod_wrap2_sql
> 
>-.if ${PORT_OPTIONS:MIPV6}
>-CONFIGURE_ARGS+=	--enable-ipv6
>-.else
>-CONFIGURE_ARGS+=	--disable-ipv6
>-.endif
>+IPV6_CONFIGURE_ENABLE=	ipv6
> 
>-.if ${PORT_OPTIONS:MNLS}
>-CONFIGURE_ARGS+=	--enable-nls
>-USES+=	gettext iconv
>-PLIST_SUB+=	NLS=""
>-.else
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>+NLS_CONFIGURE_ON=	--enable-nls
>+NLS_USES=	gettext iconv
> 
>-.if ${PORT_OPTIONS:MPCRE}
>-LIB_DEPENDS+=		libpcre.so:devel/pcre
>-CONFIGURE_ARGS+=	--enable-pcre
>-.else
>-CONFIGURE_ARGS+=	--disable-pcre
>-.endif
>+PCRE_CONFIGURE_ENABLE=	pcre
>+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-.if ${PORT_OPTIONS:MMEMCACHE}
>-MODULES+=		mod_memcache \
>-			mod_tls_memcache
>-LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
>-CONFIGURE_ARGS+=	--enable-memcache
>-LIBS+=			-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
>-PLIST_SUB+=	MEMCACHE=""
>-.else
>-CONFIGURE_ARGS+=	--disable-memcache
>-PLIST_SUB+=	MEMCACHE="@comment "
>-.endif
>+MEMCACHE_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
>+MEMCACHE_CONFIGURE_ENABLE=	memcache
>+MEMCACHE_VARS=		MODULES+="mod_memcache mod_tls_memcache" \
>+			LIBS+="-L${LOCALBASE}/lib -lmemcached -lmemcachedutil"
> 
> # Generate modules configuration string
> .for m in ${MODULES}
>@@ -192,7 +171,7 @@
> 
> .if !defined(_BUILDING_PROFTPD_MODULE)
> 
>-.if empty(ICONV_LIB)
>+.if empty(ICONV_PREFIX)
> CONFIGURE_ARGS+=	ac_cv_lib_iconv_iconv_open=no \
> 			ac_cv_lib_iconv_libiconv_open=no
> .endif

Actions: View | Diff

Attachments on bug 208909: 169457 | 169501