From owner-svn-ports-head@freebsd.org Sat Jul 11 15:27:25 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F268E998465; Sat, 11 Jul 2015 15:27:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.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 C0AE01F99; Sat, 11 Jul 2015 15:27:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6BFRONW043346; Sat, 11 Jul 2015 15:27:24 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6BFROLS043344; Sat, 11 Jul 2015 15:27:24 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201507111527.t6BFROLS043344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 11 Jul 2015 15:27:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391744 - in head/databases/leveldb: . files 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.20 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: Sat, 11 Jul 2015 15:27:25 -0000 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 - -.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)