Date: Sat, 11 Jul 2015 15:27:23 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391744 - in head/databases/leveldb: . files Message-ID: <201507111527.t6BFROLS043344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Jul 11 15:27:23 2015 New Revision: 391744 URL: https://svnweb.freebsd.org/changeset/ports/391744 Log: - Convert to new options target helper - Update comment - Regenerate patch file with makepatch: Modified: head/databases/leveldb/Makefile head/databases/leveldb/files/patch-Makefile Modified: head/databases/leveldb/Makefile ============================================================================== --- head/databases/leveldb/Makefile Sat Jul 11 15:27:18 2015 (r391743) +++ head/databases/leveldb/Makefile Sat Jul 11 15:27:23 2015 (r391744) @@ -34,14 +34,6 @@ USE_GITHUB= yes GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:${PORTSDIR}/devel/google-perftools SNAPPY_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSNAPPY} -SNAPPY= 1 -.else -SNAPPY= 0 -.endif - post-patch: @${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h @@ -51,6 +43,13 @@ post-patch-GPERFTOOLS-off: post-patch-SNAPPY-off: @${REINPLACE_CMD} -e 's| -DSNAPPY||; s| -lsnappy||' ${WRKSRC}/build_detect_platform +# backward compatibility (for databases/p5-Tie-LevelDB) +pre-install-SNAPPY-off: + ${ECHO_CMD} "SNAPPY=0" >> ${WRKSRC}/build_config.mk + +pre-install-SNAPPY-on: + ${ECHO_CMD} "SNAPPY=1" >> ${WRKSRC}/build_config.mk + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/leveldb/ ${STAGEDIR}${PREFIX}/include/memenv/ ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${STAGEDIR}${PREFIX}/include/leveldb/ @@ -63,8 +62,7 @@ do-install: ${LN} -fs libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR} ${LN} -fs libmemenv.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so ${LN} -fs libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so.${SHLIB_MAJOR} -# backward compatibility - ${ECHO_CMD} "SNAPPY=${SNAPPY}" >> ${WRKSRC}/build_config.mk +# backward compatibility (for databases/p5-Tie-LevelDB) ${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PORT_CFLAGS|' >> ${WRKSRC}/build_config.mk ${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PLATFORM_CFLAGS|' >> ${WRKSRC}/build_config.mk ${INSTALL_DATA} ${WRKSRC}/build_config.mk ${STAGEDIR}${DATADIR}/ Modified: head/databases/leveldb/files/patch-Makefile ============================================================================== --- head/databases/leveldb/files/patch-Makefile Sat Jul 11 15:27:18 2015 (r391743) +++ head/databases/leveldb/files/patch-Makefile Sat Jul 11 15:27:23 2015 (r391744) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-01-08 05:07:29.000000000 +0800 -+++ Makefile 2013-04-13 03:12:17.312769320 +0800 -@@ -83,9 +83,21 @@ +--- Makefile.orig 2014-09-16 21:19:52 UTC ++++ Makefile +@@ -95,9 +95,21 @@ endif $(SHARED3): $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507111527.t6BFROLS043344>