Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jan 2014 16:24:42 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339435 - head/security/mcrypt
Message-ID:  <201401111624.s0BGOg0t038483@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Sat Jan 11 16:24:42 2014
New Revision: 339435
URL: http://svnweb.freebsd.org/changeset/ports/339435

Log:
  - Fix build w/o NLS (don't hardcode libintl link)
  - Always install docs and examples into stagedir - let plist handle it
    This avoids the need for <bsd.port.options.mk>
  
  Submitted by:	mat

Modified:
  head/security/mcrypt/Makefile

Modified: head/security/mcrypt/Makefile
==============================================================================
--- head/security/mcrypt/Makefile	Sat Jan 11 16:15:59 2014	(r339434)
+++ head/security/mcrypt/Makefile	Sat Jan 11 16:24:42 2014	(r339435)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/se
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-static --with-catgets
 
 OPTIONS_DEFINE=	DOCS NLS EXAMPLES
@@ -29,16 +29,10 @@ NLS_CONFIGURE_ENABLE=	nls
 post-patch:
 	${REINPLACE_CMD} -e '/malloc\.h/d' ${WRKSRC}/src/rfc2440.c
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd  ${WRKSRC}/doc && ${INSTALL_DATA} FORMAT magic ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>



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