svn commit: r353231 - in head/databases/fastdb: . files

[Baptiste Daroussin]

Author: bapt
Date: Wed May  7 23:54:51 2014
New Revision: 353231
URL: http://svnweb.freebsd.org/changeset/ports/353231
QAT: https://qat.redports.org/buildarchive/r353231/

Log:
  Use options
  Support stage
  Convert to USES=gmake dos2unix
  Always use gcc as a compiler

Modified:
  head/databases/fastdb/Makefile
  head/databases/fastdb/files/patch-makefile

Modified: head/databases/fastdb/Makefile
==============================================================================
--- head/databases/fastdb/Makefile	Wed May  7 23:49:46 2014	(r353230)
+++ head/databases/fastdb/Makefile	Wed May  7 23:54:51 2014	(r353231)
@@ -11,23 +11,21 @@ COMMENT=	Main Memory Relational Database
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GMAKE=	yes
+OPTIONS_DEFINE=	DOCS
+
+USES=		gmake dos2unix
+USE_GCC=	any
 MAKE_ENV=	OSTYPE="${OPSYS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
-USE_DOS2UNIX=	${MAKEFILE}
+DOS2UNIX_FILES=	${MAKEFILE}
 
 PORTDOCS=	FastDB.htm
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/FastDB.htm ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/fastdb/files/patch-makefile
==============================================================================
--- head/databases/fastdb/files/patch-makefile	Wed May  7 23:49:46 2014	(r353230)
+++ head/databases/fastdb/files/patch-makefile	Wed May  7 23:54:51 2014	(r353231)
@@ -1,5 +1,22 @@
---- makefile.orig	2012-09-12 03:22:51.000000000 +0800
-+++ makefile	2013-06-28 09:55:32.000000000 +0800
+--- ./makefile.orig	2014-05-08 01:51:14.473846505 +0200
++++ ./makefile	2014-05-08 01:52:41.930012434 +0200
+@@ -8,13 +8,13 @@
+ PREFIX ?= /usr/local
+ 
+ # Place where to copy FastDB header files
+-INCSPATH=$(PREFIX)/include/fastdb
++INCSPATH=$(DESTDIR)$(PREFIX)/include/fastdb
+ 
+ #Place where to copy Fastdb library
+-LIBSPATH=$(PREFIX)/lib
++LIBSPATH=$(DESTDIR)$(PREFIX)/lib
+ 
+ #Place where to copy Fastdb subsql utility
+-BINSPATH=$(PREFIX)/bin
++BINSPATH=$(DESTDIR)$(PREFIX)/bin
+ 
+ ifdef NO_PTHREADS
+ OBJS = class.o compiler.o database.o xml.o hashtab.o file.o symtab.o ttree.o rtree.o container.o \
 @@ -38,8 +38,8 @@
  THRLIBS=
  SUFF=
@@ -58,7 +75,7 @@
 +	${BSD_INSTALL_DATA} $(INCS) $(INCSPATH)
  	mkdir -p $(LIBSPATH)
 -	cp $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
-+	${BSD_INSTALL_DATA} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
++	${BSD_INSTALL_LIB} $(FASTDB_LIB) $(CLI_LIB) $(FASTDB_SHARED) $(CLI_SHARED) $(LIBSPATH)
  	(cd $(LIBSPATH) && ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so \
  	 && ln -f -s $(CLI_SHARED) libcli$(SUFF).so)
  	if [ -f $(JNI_LIB) ]; then cp $(JNI_LIB) $(LIBSPATH); \