Attachment #197827 for bug #231992

View | Details | Raw Unified | Return to bug 231992
Collapse All | Expand All





PORTNAME=	sqlcached
PORTVERSION=	r6
PORTREVISION=	3
CATEGORIES=	databases net
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}


MAINTAINER=	ivoras@FreeBSD.org
COMMENT=	Cache daemon using SQL for data manipulation

USES=		localbase ncurses readline sqlite tar:tgz

USES=		readline ncurses tar:tgz

LDFLAGS+=	-L${LOCALBASE}/lib

WRKSRC=		${WRKDIR}/${PORTNAME}

PORTDOCS=	${PORTNAME}.html ${PORTNAME}.txt




--- Makefile.orig	2013-09-26 13:45:50 UTC
+++ Makefile
@@ -1,7 +1,5 @@
-MYCFLAGS=-O3 -Wall -I/usr/local/include #-g -pg
-MYLDFLAGS=-L/usr/local/lib -lsqlite #-g -pg 
-#MYCFLAGS=-O3 -Wall -I/usr/local/include -DSQLITE3
-#MYLDFLAGS=-L/usr/local/lib -lsqlite3
+MYCFLAGS= ${CFLAGS} -DSQLITE3
+MYLDFLAGS= ${LDFLAGS} -lsqlite3
 
 all: sqlcached sc_client sc_client_bench libsqlcached_client.so libsqlcached_client.a
 	
@@ -20,7 +18,7 @@ server_protocol.o: server_protocol.c common.h
 	cc -o server_protocol.o -c server_protocol.c ${MYCFLAGS}
 
 sc_client: client.o sqlcached_client.o
-	cc -o sc_client client.o sqlcached_client.o ${MYLDFLAGS} -lreadline -lcurses
+	cc -o sc_client client.o sqlcached_client.o ${MYLDFLAGS} -lreadline -lncurses
 
 client.o: client.c common.h
 	cc -o client.o -c client.c ${MYCFLAGS}

Return to bug 231992

Lines 3-9 Link Here

(-)Makefile (-6 / +2 lines)
3		3
4	PORTNAME= sqlcached	4	PORTNAME= sqlcached
5	PORTVERSION= r6	5	PORTVERSION= r6
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= databases net	7	CATEGORIES= databases net
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9		9
Lines 10-21 Link Here
10	MAINTAINER= ivoras@FreeBSD.org	10	MAINTAINER= ivoras@FreeBSD.org
11	COMMENT= Cache daemon using SQL for data manipulation	11	COMMENT= Cache daemon using SQL for data manipulation
12		12
13	LIB_DEPENDS= libsqlite.so:databases/sqlite2	13	USES= localbase ncurses readline sqlite tar:tgz
14		14
15	USES= readline ncurses tar:tgz
16
17	LDFLAGS+= -L${LOCALBASE}/lib
18
19	WRKSRC= ${WRKDIR}/${PORTNAME}	15	WRKSRC= ${WRKDIR}/${PORTNAME}
20		16
21	PORTDOCS= ${PORTNAME}.html ${PORTNAME}.txt	17	PORTDOCS= ${PORTNAME}.html ${PORTNAME}.txt

Line 0 Link Here

(-)files/patch-Makefile (+21 lines)
	1	--- Makefile.orig 2013-09-26 13:45:50 UTC
	2	+++ Makefile
	3	@@ -1,7 +1,5 @@
	4	-MYCFLAGS=-O3 -Wall -I/usr/local/include #-g -pg
	5	-MYLDFLAGS=-L/usr/local/lib -lsqlite #-g -pg
	6	-#MYCFLAGS=-O3 -Wall -I/usr/local/include -DSQLITE3
	7	-#MYLDFLAGS=-L/usr/local/lib -lsqlite3
	8	+MYCFLAGS= ${CFLAGS} -DSQLITE3
	9	+MYLDFLAGS= ${LDFLAGS} -lsqlite3
	10
	11	all: sqlcached sc_client sc_client_bench libsqlcached_client.so libsqlcached_client.a
	12
	13	@@ -20,7 +18,7 @@ server_protocol.o: server_protocol.c common.h
	14	cc -o server_protocol.o -c server_protocol.c ${MYCFLAGS}
	15
	16	sc_client: client.o sqlcached_client.o
	17	- cc -o sc_client client.o sqlcached_client.o ${MYLDFLAGS} -lreadline -lcurses
	18	+ cc -o sc_client client.o sqlcached_client.o ${MYLDFLAGS} -lreadline -lncurses
	19
	20	client.o: client.c common.h
	21	cc -o client.o -c client.c ${MYCFLAGS}