From owner-svn-ports-head@FreeBSD.ORG Wed Jan 14 10:59:20 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3926EF8; Wed, 14 Jan 2015 10:59:19 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D495CED0; Wed, 14 Jan 2015 10:59:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0EAxJa6019100; Wed, 14 Jan 2015 10:59:19 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0EAxJgC019099; Wed, 14 Jan 2015 10:59:19 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201501141059.t0EAxJgC019099@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Wed, 14 Jan 2015 10:59:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377008 - head/sysutils/ucspi-tcp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2015 10:59:20 -0000 Author: garga Date: Wed Jan 14 10:59:18 2015 New Revision: 377008 URL: https://svnweb.freebsd.org/changeset/ports/377008 QAT: https://qat.redports.org/buildarchive/r377008/ Log: - Fix build with SSL adding -lcrypto back to linker options - Remove ugly hack from pre-bsd.options.mk era and set USE_OPENSSL=yes - Make install verbose to silence portlint No bump on PORTREVISION since SSL is off by default PR: 196469 Modified: head/sysutils/ucspi-tcp/Makefile Modified: head/sysutils/ucspi-tcp/Makefile ============================================================================== --- head/sysutils/ucspi-tcp/Makefile Wed Jan 14 10:29:56 2015 (r377007) +++ head/sysutils/ucspi-tcp/Makefile Wed Jan 14 10:59:18 2015 (r377008) @@ -47,18 +47,13 @@ SCRIPTS= date@ \ who@ \ tcpcat -.include +.include # SSL and LIMITS can't coexist .if ${PORT_OPTIONS:MSSL} && ${PORT_OPTIONS:MLIMITS} BROKEN= SSL and LIMITS options cannot coexist, please choose one of them .endif -# Restrict optimization to -O - -O2 causes problems at least on amd64 -.if ${ARCH} == "amd64" -CFLAGS+= -O -.endif - MASTER_SITES+= http://smarden.org/pape/djb/manpages/:man \ ${MASTER_SITE_LOCAL:S/$/:man/} MASTER_SITE_SUBDIR+= garga/ucspi-tcp/:man @@ -74,8 +69,7 @@ PATCHFILES+= ucspi-rss.diff:rss .endif .if ${PORT_OPTIONS:MSSL} -# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +USE_OPENSSL= yes PATCH_SITES+= http://www.nrg4u.com/qmail/:ssl PATCHFILES+= ucspi-tcp-ssl-20050405.patch.gz:ssl .endif @@ -107,12 +101,19 @@ PATCHFILES+= ucspi-tcp-0.88-ipv6.diff19. PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:rss,ssl,rbl2smtpd/} PATCH_SITE_SUBDIR+= garga/ucspi-tcp/:rss,ssl,rbl2smtpd +.include + +# Restrict optimization to -O - -O2 causes problems at least on amd64 +.if ${ARCH} == "amd64" +CFLAGS+= -O +.endif + post-patch: @${REINPLACE_CMD} -e 's/^extern int errno;/#include /' \ ${WRKSRC}/error.h .if ${PORT_OPTIONS:MSSL} - @${REINPLACE_CMD} -e 's|#INCS=-I/usr/local/include|INCS=-I${OPENSSLBASE}/include|g; \ - s|-lcrypto|-L${OPENSSLBASE}/lib |g' \ + @${REINPLACE_CMD} -e 's|#INCS=-I/usr/local/include|INCS=-I${OPENSSLINC}|g; \ + /^LIBS=/s|-lcrypto|-L${OPENSSLLIB} &|g' \ ${WRKSRC}/Makefile .endif @@ -123,10 +124,10 @@ post-configure: do-install: .for file_name in ${PROGRAMS} - @${INSTALL_PROGRAM} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin .endfor .for file_name in ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin .endfor .for file_name in ${MAN_FILES} ${INSTALL_MAN} ${WRKSRC}-man/${file_name} ${STAGEDIR}${MAN1PREFIX}/man/man1/