svn commit: r481362 - in head/databases/sqlcached: . files

[Tobias Kortkamp]

Author: tobik
Date: Sat Oct  6 10:30:45 2018
New Revision: 481362
URL: https://svnweb.freebsd.org/changeset/ports/481362

Log:
  databases/sqlcached: Switch to sqlite3 and respect {C,LD}FLAGS
  
  PR:		231992
  Submitted by:	tobik
  Approved by:	ivoras (maintainer, via mail)

Added:
  head/databases/sqlcached/files/
  head/databases/sqlcached/files/patch-Makefile   (contents, props changed)
Modified:
  head/databases/sqlcached/Makefile

Modified: head/databases/sqlcached/Makefile
==============================================================================
--- head/databases/sqlcached/Makefile	Sat Oct  6 10:09:13 2018	(r481361)
+++ head/databases/sqlcached/Makefile	Sat Oct  6 10:30:45 2018	(r481362)
@@ -3,19 +3,15 @@
 
 PORTNAME=	sqlcached
 PORTVERSION=	r6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ivoras at FreeBSD.org
 COMMENT=	Cache daemon using SQL for data manipulation
 
-LIB_DEPENDS=	libsqlite.so:databases/sqlite2
+USES=		localbase:ldflags ncurses readline sqlite tar:tgz
 
-USES=		readline ncurses tar:tgz
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	${PORTNAME}.html ${PORTNAME}.txt
@@ -26,7 +22,6 @@ PLIST_FILES=	bin/${PORTNAME} etc/rc.d/${PORTNAME} \
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/FreeBSD/${PORTNAME}
 

Added: head/databases/sqlcached/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlcached/files/patch-Makefile	Sat Oct  6 10:30:45 2018	(r481362)
@@ -0,0 +1,21 @@
+--- 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}