From owner-svn-ports-head@FreeBSD.ORG Tue Apr 23 17:15:36 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DDE35B91; Tue, 23 Apr 2013 17:15:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BFE3D1197; Tue, 23 Apr 2013 17:15:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NHFawx015612; Tue, 23 Apr 2013 17:15:36 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3NHFaOm015609; Tue, 23 Apr 2013 17:15:36 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201304231715.r3NHFaOm015609@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 23 Apr 2013 17:15:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316380 - 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.14 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: Tue, 23 Apr 2013 17:15:36 -0000 Author: sunpoet Date: Tue Apr 23 17:15:35 2013 New Revision: 316380 URL: http://svnweb.freebsd.org/changeset/ports/316380 Log: - Build/install memenv header file and shared/static library - Bump PORTREVISION for package change - Cosmetic change Requested by: mi Tested by: mi, Robert Backhaus (net-p2p/bitcoin maintainer) Added: head/databases/leveldb/files/ head/databases/leveldb/files/patch-Makefile (contents, props changed) Modified: head/databases/leveldb/Makefile head/databases/leveldb/pkg-plist (contents, props changed) Modified: head/databases/leveldb/Makefile ============================================================================== --- head/databases/leveldb/Makefile Tue Apr 23 17:13:28 2013 (r316379) +++ head/databases/leveldb/Makefile Tue Apr 23 17:15:35 2013 (r316380) @@ -3,6 +3,7 @@ PORTNAME= leveldb PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE @@ -48,16 +49,21 @@ post-patch: .endif do-install: - ${MKDIR} ${PREFIX}/include/leveldb/ ${DATADIR}/ + ${MKDIR} ${PREFIX}/include/leveldb/ ${PREFIX}/include/memenv/ ${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${PREFIX}/include/leveldb/ + ${INSTALL_DATA} ${WRKSRC}/helpers/memenv/memenv.h ${PREFIX}/include/memenv/ ${INSTALL_LIB} ${WRKSRC}/libleveldb.a ${PREFIX}/lib/ ${INSTALL_LIB} ${WRKSRC}/libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/libmemenv.a ${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${PREFIX}/lib/ + ${LN} -s libleveldb.so.${SHLIB_MAJOR} ${PREFIX}/lib/libleveldb.so + ${LN} -s libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR} + ${LN} -s libmemenv.so.${SHLIB_MAJOR} ${PREFIX}/lib/libmemenv.so + ${LN} -s libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${PREFIX}/lib/libmemenv.so.${SHLIB_MAJOR} # backward compatibility ${ECHO} "SNAPPY=${SNAPPY}" >> ${WRKSRC}/build_config.mk ${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 ${DATADIR}/ - ${LN} -s libleveldb.so.${SHLIB_MAJOR} ${PREFIX}/lib/libleveldb.so - ${LN} -s libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR} .include Added: head/databases/leveldb/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/leveldb/files/patch-Makefile Tue Apr 23 17:15:35 2013 (r316380) @@ -0,0 +1,25 @@ +--- Makefile.orig 2013-01-08 05:07:29.000000000 +0800 ++++ Makefile 2013-04-13 03:12:17.312769320 +0800 +@@ -83,9 +83,21 @@ + $(SHARED3): + $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS) + ++SHARED += $(MEMENVLIBRARY_SHARED1) $(MEMENVLIBRARY_SHARED2) $(MEMENVLIBRARY_SHARED3) ++MEMENVLIBRARY_SHARED1 = libmemenv.$(PLATFORM_SHARED_EXT) ++MEMENVLIBRARY_SHARED2 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR) ++MEMENVLIBRARY_SHARED3 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR) ++MEMENVLIBRARY_SHARED = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR) ++$(MEMENVLIBRARY_SHARED1): $(MEMENVLIBRARY_SHARED3) ++ ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED1) ++$(MEMENVLIBRARY_SHARED2): $(MEMENVLIBRARY_SHARED3) ++ ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED2) ++$(MEMENVLIBRARY_SHARED3): ++ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(MEMENVLIBRARY_SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(MEMENV_SOURCES) -o $(MEMENVLIBRARY_SHARED) $(LIBS) ++ + endif # PLATFORM_SHARED_EXT + +-all: $(SHARED) $(LIBRARY) ++all: $(SHARED) $(LIBRARY) $(MEMENVLIBRARY) + + check: all $(PROGRAMS) $(TESTS) + for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done Modified: head/databases/leveldb/pkg-plist ============================================================================== --- head/databases/leveldb/pkg-plist Tue Apr 23 17:13:28 2013 (r316379) +++ head/databases/leveldb/pkg-plist Tue Apr 23 17:15:35 2013 (r316380) @@ -11,10 +11,16 @@ include/leveldb/status.h include/leveldb/table.h include/leveldb/table_builder.h include/leveldb/write_batch.h +include/memenv/memenv.h lib/libleveldb.a lib/libleveldb.so lib/libleveldb.so.%%SHLIB_MAJOR%% lib/libleveldb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +lib/libmemenv.a +lib/libmemenv.so +lib/libmemenv.so.%%SHLIB_MAJOR%% +lib/libmemenv.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%DATADIR%%/build_config.mk @dirrm %%DATADIR%% +@dirrm include/memenv @dirrm include/leveldb