From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 11 16:24:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AA0A9B9C;
 Sat, 11 Jan 2014 16:24:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 958FA1E71;
 Sat, 11 Jan 2014 16:24:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BGOgEh038484;
 Sat, 11 Jan 2014 16:24:42 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BGOg0t038483;
 Sat, 11 Jan 2014 16:24:42 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201401111624.s0BGOg0t038483@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sat, 11 Jan 2014 16:24:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339435 - head/security/mcrypt
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jan 2014 16:24:42 -0000

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>