Finish converting security from WITHOUT_NLS to PORT_OPTIONS:MNLS

This commit is contained in:
Baptiste Daroussin 2013-05-06 09:39:25 +00:00
parent c40e544251
commit 86c6fbb45f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=317496
3 changed files with 17 additions and 23 deletions

View file

@ -50,15 +50,15 @@ PLIST_SUB+= CXX="@comment "
PLIST_SUB+= CXX="" PLIST_SUB+= CXX=""
.endif .endif
.if defined(WITHOUT_NLS) .if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
USES+= gettext USES+= gettext
PLIST_SUB+= NLS="" PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif .endif
.if !defined(NOPORTDOCS) .if ${PORT_OPTIONS:MDOCS}
PORTDOCS= AUTHORS NEWS README THANKS PORTDOCS= AUTHORS NEWS README THANKS
.endif .endif
EXAMPLES= doc/examples/*.c EXAMPLES= doc/examples/*.c
@ -72,7 +72,7 @@ pre-configure:
post-install: post-install:
@${MKDIR} ${EXAMPLESDIR} @${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
.if !defined(NOPORTDOCS) .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS} .for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}

View file

@ -26,19 +26,15 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN5= pam_krb5.5 MAN5= pam_krb5.5
MAN8= pam_krb5.8 pam_krb5_cchelper.8 MAN8= pam_krb5.8 pam_krb5_cchelper.8
.if defined(WITHOUT_NLS) .include <bsd.port.options.mk>
PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+=--disable-nls .if ${PORT_OPTIONS:MNLS}
.else
PLIST_SUB+= NLS="" PLIST_SUB+= NLS=""
LDFLAGS+= -lintl LDFLAGS+= -lintl
USES+= gettext USES+= gettext
.endif .else
PLIST_SUB+= NLS="@comment "
.include <bsd.port.pre.mk> CONFIGURE_ARGS+=--disable-nls
.if ${OSVERSION} < 800000
BROKEN= does not build on FreeBSD 7.x
.endif .endif
post-patch: post-patch:
@ -50,4 +46,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|PAM_AUTHTOK_RECOVER_ERR|PAM_AUTHTOK_RECOVERY_ERR|g' \ @${REINPLACE_CMD} -e 's|PAM_AUTHTOK_RECOVER_ERR|PAM_AUTHTOK_RECOVERY_ERR|g' \
${WRKSRC}/src/password.c ${WRKSRC}/src/password.c
.include <bsd.port.post.mk> .include <bsd.port.mk>

View file

@ -1,9 +1,5 @@
# New ports collection Makefile for: pidgin-encryption # Created by: ports@c0decafe.net
# Date created: 2004-05-01
# Whom: ports@c0decafe.net
#
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= pidgin PORTNAME= pidgin
PORTVERSION= 3.1 PORTVERSION= 3.1
@ -32,7 +28,9 @@ CONFIGURE_ARGS= --with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-includes=${LOCALBASE}/include/nss/nss \
--with-nss-libs=${LOCALBASE}/lib/nss --with-nss-libs=${LOCALBASE}/lib/nss
.if !defined(WITHOUT_NLS) .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
USES+= gettext USES+= gettext
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB+= NLS="" PLIST_SUB+= NLS=""