Index: head/databases/leveldb/Makefile
===================================================================
--- head/databases/leveldb/Makefile	(revision 284519)
+++ head/databases/leveldb/Makefile	(revision 284520)
@@ -1,49 +1,52 @@
 # New ports collection makefile for:	leveldb
 # Date created:		2011-10-04
 # Whom:			Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	leveldb
 PORTVERSION=	1.2.20111024
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A fast and lightweight key/value database library by Google
 
-OPTIONS=	PERFTOOLS	"Build with Google perftools" on \
+OPTIONS=	PERFTOOLS	"Build with Google perftools" off \
 		SNAPPY		"Build with snappy" on
 
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XZ=		yes
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PERFTOOLS)
+.if defined(WITH_PERFTOOLS)
 LIB_DEPENDS+=	tcmalloc:${PORTSDIR}/devel/google-perftools
 .endif
 
 .if !defined(WITHOUT_SNAPPY)
 LIB_DEPENDS+=	snappy:${PORTSDIR}/archivers/snappy
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/build_detect_platform
-.if defined(WITHOUT_PERFTOOLS)
-	@${REINPLACE_CMD} -e '/^LDFLAGS=/ s| $$(GOOGLE_PERFTOOLS_LDFLAGS)||' ${WRKSRC}/Makefile
+.if !defined(WITH_PERFTOOLS)
+	@${REINPLACE_CMD} -e '/^GOOGLE_PERFTOOLS_LDFLAGS=/ s|=.*|=|' ${WRKSRC}/Makefile
 .endif
 .if defined(WITHOUT_SNAPPY)
-	@${REINPLACE_CMD} -e '/^LDFLAGS=/ s| $$(SNAPPY_LDFLAGS)||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^SNAPPY_LDFLAGS=/ s|=.*|=|' ${WRKSRC}/Makefile
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/include/leveldb/ ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${PREFIX}/include/leveldb/
 	${INSTALL_LIB} ${WRKSRC}/libleveldb.* ${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/build_config.mk ${DATADIR}/
 	${LN} -s libleveldb.so.0 ${PREFIX}/lib/libleveldb.so
 
 .include <bsd.port.mk>

Property changes on: head/databases/leveldb/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/leveldb/files/patch-Makefile
===================================================================
--- head/databases/leveldb/files/patch-Makefile	(revision 284519)
+++ head/databases/leveldb/files/patch-Makefile	(revision 284520)
@@ -1,60 +1,63 @@
 --- Makefile.orig	2011-10-24 18:02:13.000000000 +0800
-+++ Makefile	2011-10-27 18:37:46.857260892 +0800
++++ Makefile	2011-10-28 19:12:16.103454748 +0800
 @@ -2,13 +2,13 @@
  # Use of this source code is governed by a BSD-style license that can be
  # found in the LICENSE file. See the AUTHORS file for names of contributors.
  
 -CC = g++
 +CC ?= g++
  
  #-----------------------------------------------
  # Uncomment exactly one of the lines labelled (A), (B), and (C) below
  # to switch between compilation modes.
  
 -OPT = -O2 -DNDEBUG       # (A) Production use (optimized mode)
 +OPT ?= -O2 -DNDEBUG       # (A) Production use (optimized mode)
  # OPT = -g2              # (B) Debug mode, w/ full line-level debugging symbols
  # OPT = -O2 -g2 -DNDEBUG # (C) Profiling mode: opt, but w/debugging symbols
  #-----------------------------------------------
-@@ -36,7 +36,7 @@
+@@ -36,9 +36,9 @@
  GOOGLE_PERFTOOLS_LDFLAGS=
  endif
  
 -CFLAGS = -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS)
 +CFLAGS += -c -fPIC -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS)
  
- LDFLAGS=$(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS)
+-LDFLAGS=$(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS)
++LDFLAGS += $(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS)
  
+ LIBOBJECTS = \
+ 	./db/builder.o \
 @@ -103,15 +103,19 @@
  BENCHMARKS = db_bench_sqlite3 db_bench_tree_db
  
  LIBRARY = libleveldb.a
 +SHARED_LIBRARY = libleveldb.so
 +SHARED_LIBRARY_VER = 0
  MEMENVLIBRARY = libmemenv.a
  
 -all: $(LIBRARY)
 +SHARED_LIBOBJECTS = $(LIBOBJECTS:.o=.so)
 +
 +all: $(LIBRARY) $(SHARED_LIBRARY)
  
  check: $(PROGRAMS) $(TESTS)
  	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
  
  clean:
 -	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o
 +	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED_LIBRARY) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o
  	-rm -rf ios-x86/* ios-arm/*
  	-rm build_config.mk
  
 @@ -119,6 +123,10 @@
  	rm -f $@
  	$(AR) -rs $@ $(LIBOBJECTS)
  
 +$(SHARED_LIBRARY): $(LIBOBJECTS)
 +	rm -f $@
 +	$(CC) -shared -Wl,-soname,$@.$(SHARED_LIBRARY_VER) -o $@.$(SHARED_LIBRARY_VER) $(LDFLAGS) $(LIBOBJECTS)
 +
  db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL)
  	$(CC) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@
  

Property changes on: head/databases/leveldb/files/patch-Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property