- Fix build on -current New file: files/patch-basictcp.h files/patch-tcp.h Remove file: files/patch-Makefile.in files/patch-configure
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Sat Jan 25 16:49:55 2014 New Revision: 341054 URL: http://svnweb.freebsd.org/changeset/ports/341054 QAT: https://qat.redports.org/buildarchive/r341054/ Log: - Fix build - Stage support PR: 184879 Submitted by: Ports Fury Added: head/benchmarks/postal/files/patch-basictcp.h (contents, props changed) head/benchmarks/postal/files/patch-tcp.h (contents, props changed) Deleted: head/benchmarks/postal/files/patch-Makefile.in head/benchmarks/postal/files/patch-configure Modified: head/benchmarks/postal/Makefile Modified: head/benchmarks/postal/Makefile ============================================================================== --- head/benchmarks/postal/Makefile Sat Jan 25 16:48:05 2014 (r341053) +++ head/benchmarks/postal/Makefile Sat Jan 25 16:49:55 2014 (r341054) @@ -15,25 +15,28 @@ LICENSE= GPLv3 OPTIONS_DEFINE= SSL OPTIONS_DEFAULT= SSL -USE_OPENSSL= yes -GNU_CONFIGURE= yes USES= gmake +USE_GCC= any +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-gnutls -PLIST_FILES= sbin/bhm sbin/postal bin/postal-list sbin/rabid - -MAN1= postal-list.1 -MAN8= bhm.8 postal.8 rabid.8 +PLIST_FILES= sbin/bhm sbin/postal bin/postal-list sbin/rabid \ + man/man1/postal-list.1.gz man/man8/bhm.8.gz \ + man/man8/postal.8.gz man/man8/rabid.8.gz -NO_STAGE= yes .include <bsd.port.options.mk> -CONFIGURE_ARGS= --disable-gnutls - -.if empty(PORT_OPTIONS:MSSL) +.if ${PORT_OPTIONS:MSSL} +USE_OPENSSL= yes +.else CONFIGURE_ARGS+= --disable-openssl .endif -CFLAGS+= ${PTHREAD_CFLAGS} -Wno-long-long -LDFLAGS+= ${PTHREAD_LIBS} +post-patch: + @${REINPLACE_CMD} -e \ + 's|-lpthread|-pthread|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-O2 -g|| ; \ + s|-lstdc|$${LDFLAGS}|' ${WRKSRC}/Makefile.in .include <bsd.port.mk> Added: head/benchmarks/postal/files/patch-basictcp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/postal/files/patch-basictcp.h Sat Jan 25 16:49:55 2014 (r341054) @@ -0,0 +1,14 @@ +--- basictcp.h.orig 2013-12-08 18:49:04.000000000 +0900 ++++ basictcp.h 2013-12-08 18:49:33.000000000 +0900 +@@ -89,7 +89,11 @@ + + #ifdef USE_SSL + #ifdef USE_OPENSSL ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_sslMeth; ++#else + SSL_METHOD *m_sslMeth; ++#endif + SSL_CTX* m_sslCtx; + SSL *m_ssl; + #else Added: head/benchmarks/postal/files/patch-tcp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/postal/files/patch-tcp.h Sat Jan 25 16:49:55 2014 (r341054) @@ -0,0 +1,14 @@ +--- tcp.h.orig ++++ tcp.h +@@ -100,7 +100,11 @@ + + #ifdef USE_SSL + #ifdef USE_OPENSSL ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *m_sslMeth; ++#else + SSL_METHOD *m_sslMeth; ++#endif + SSL_CTX* m_sslCtx; + SSL *m_ssl; + #else _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"