Date: Wed, 5 Feb 2014 19:32:01 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342821 - in head/security/cryptopp: . files Message-ID: <201402051932.s15JW1jW005403@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Wed Feb 5 19:32:00 2014 New Revision: 342821 URL: http://svnweb.freebsd.org/changeset/ports/342821 QAT: https://qat.redports.org/buildarchive/r342821/ Log: - Modernize port: - Stagify - USES=gmake instead of USE_GMAKE - Don't build with -march=native as the build box may not be identical to the run box. Modified: head/security/cryptopp/Makefile head/security/cryptopp/files/patch-GNUmakefile Modified: head/security/cryptopp/Makefile ============================================================================== --- head/security/cryptopp/Makefile Wed Feb 5 19:23:44 2014 (r342820) +++ head/security/cryptopp/Makefile Wed Feb 5 19:32:00 2014 (r342821) @@ -3,6 +3,7 @@ PORTNAME= cryptopp PORTVERSION= 5.6.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF \ http://www.cryptopp.com/ @@ -16,13 +17,12 @@ OPTIONS_DEFAULT= STATIC THREADS STATIC_DESC= Build static version only (no shared libs) GCC_DESC= Build with current GCC -NO_STAGE= yes .include <bsd.port.options.mk> NO_WRKSUBDIR= yes USE_ZIP= yes EXTRACT_BEFORE_ARGS= -aq -USE_GMAKE= yes +USES= gmake MAKEFILE= GNUmakefile LIBVERSION= 0 @@ -52,29 +52,25 @@ LDFLAGS+= ${PTHREAD_LIBS} .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${PREFIX}/bin/cryptest - ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${PREFIX}/lib - ${MKDIR} ${PREFIX}/include/cryptopp + ${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest + ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib + ${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp (for i in `${FIND} ${WRKSRC}/ -name '*.h' \ -and -not -name 'dll.h' \ -and -not -name 'resource.h'`; do \ - ${INSTALL_DATA} $$i ${PREFIX}/include/cryptopp; \ + ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \ done) .if !${PORT_OPTIONS:MSTATIC} - ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${PREFIX}/lib/libcryptopp.so.${PORTVERSION} - ${LN} -fs libcryptopp.so.${PORTVERSION} ${PREFIX}/lib/libcryptopp.so.${LIBVERSION} - ${LN} -fs libcryptopp.so.${LIBVERSION} ${PREFIX}/lib/libcryptopp.so -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${PREFIX}/share/doc/cryptopp - ${CP} ${WRKSRC}/Readme.txt ${PREFIX}/share/doc/cryptopp/README - ${CP} ${WRKSRC}/License.txt ${PREFIX}/share/doc/cryptopp/License -.endif - -.include <bsd.port.pre.mk> + ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} + ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${LIBVERSION} + ${LN} -fs libcryptopp.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so +.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cryptopp + ${CP} ${WRKSRC}/Readme.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/README + ${CP} ${WRKSRC}/License.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/License .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64: unrecognized C++ options .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/cryptopp/files/patch-GNUmakefile ============================================================================== --- head/security/cryptopp/files/patch-GNUmakefile Wed Feb 5 19:23:44 2014 (r342820) +++ head/security/cryptopp/files/patch-GNUmakefile Wed Feb 5 19:32:00 2014 (r342821) @@ -1,12 +1,21 @@ ---- GNUmakefile.orig 2013-02-20 15:30:52.000000000 -0800 -+++ GNUmakefile 2013-05-22 15:43:40.000000000 -0700 +--- ./GNUmakefile.orig 2013-02-20 15:30:52.000000000 -0500 ++++ ./GNUmakefile 2014-02-05 14:26:22.994957010 -0500 @@ -1,4 +1,4 @@ -CXXFLAGS = -DNDEBUG -g -O2 +#CXXFLAGS = -DNDEBUG -g -O2 # -O3 fails to link on Cygwin GCC version 4.5.3 # -fPIC is supported. Please report any breakage of -fPIC as a bug. # CXXFLAGS += -fPIC -@@ -165,7 +165,7 @@ +@@ -38,8 +38,6 @@ + ifneq ($(GCC42_OR_LATER),0) + ifeq ($(UNAME),Darwin) + CXXFLAGS += -arch x86_64 -arch i386 +-else +-CXXFLAGS += -march=native + endif + endif + +@@ -165,7 +163,7 @@ $(RANLIB) $@ libcryptopp.so: $(LIBOBJS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402051932.s15JW1jW005403>