svn commit: r354199 - in head/databases/rdfdb: . files

[Vanilla I. Shu]

Author: vanilla
Date: Fri May 16 08:05:05 2014
New Revision: 354199
URL: http://svnweb.freebsd.org/changeset/ports/354199
QAT: https://qat.redports.org/buildarchive/r354199/

Log:
  1: Support staging.
  2: use USE_RC_SUBR instead.

Added:
  head/databases/rdfdb/files/patch-librdf_db.c
     - copied unchanged from r354198, head/databases/rdfdb/files/patch-librdf::db.c
  head/databases/rdfdb/files/patch-librdf_rdflib.c
     - copied unchanged from r354198, head/databases/rdfdb/files/patch-librdf::rdflib.c
  head/databases/rdfdb/files/rdfdb-server.in
     - copied unchanged from r354198, head/databases/rdfdb/files/rdfdb-server.sh.tmpl
Deleted:
  head/databases/rdfdb/files/patch-librdf::db.c
  head/databases/rdfdb/files/patch-librdf::rdflib.c
  head/databases/rdfdb/files/rdfdb-server.sh.tmpl
Modified:
  head/databases/rdfdb/Makefile

Modified: head/databases/rdfdb/Makefile
==============================================================================
--- head/databases/rdfdb/Makefile	Fri May 16 07:58:04 2014	(r354198)
+++ head/databases/rdfdb/Makefile	Fri May 16 08:05:05 2014	(r354199)
@@ -17,17 +17,18 @@ INVALID_BDB_VER=2
 USERS=	rdfdb
 GROUPS=	rdfdb
 
-WRKSRC=	${WRKDIR}/rdfdb
-USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/rdfdb
+USES=		gmake
 MAKEFILE=	makefile
 ALL_TARGET=
 CFLAGS+=	${PTHREAD_CFLAGS} -Wno-return-type
+SUB_LIST+=	RDFDB_PORT="${RDFDB_PORT}" RDFDB_DIR="${RDFDB_DIR}"
+USE_RC_SUBR=	rdfdb-server
 
 RDFDB_PORT?=	7001
 
-PLIST_FILES=	bin/rdfdb bin/rdfdb etc/rc.d/rdfdb-server.sh
+PLIST_FILES=	bin/rdfdb
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		-e 's,%%PTHREAD_LIBS%%,${PTHREAD_LIBS:S/"//g},g' \
@@ -36,12 +37,6 @@ post-patch:
 		${WRKSRC}/makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rdfdb ${PREFIX}/bin
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%RDFDB_DIR%%|${RDFDB_DIR}|g; \
-		s|%%RDFDB_PORT%%|${RDFDB_PORT}|g" \
-		< ${FILESDIR}/rdfdb-server.sh.tmpl \
-		> ${PREFIX}/etc/rc.d/rdfdb-server.sh
-	@${CHMOD} 554 ${PREFIX}/etc/rc.d/rdfdb-server.sh
-	@${CHOWN} root:rdfdb ${PREFIX}/etc/rc.d/rdfdb-server.sh
+	${INSTALL_PROGRAM} ${WRKSRC}/rdfdb ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Copied: head/databases/rdfdb/files/patch-librdf_db.c (from r354198, head/databases/rdfdb/files/patch-librdf::db.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rdfdb/files/patch-librdf_db.c	Fri May 16 08:05:05 2014	(r354199, copy of r354198, head/databases/rdfdb/files/patch-librdf::db.c)
@@ -0,0 +1,14 @@
+--- librdf/db.c.orig	Tue Oct  3 20:23:27 2000
++++ librdf/db.c	Mon Jan  2 12:06:39 2006
+@@ -169,7 +169,11 @@
+     }
+   }
+ 
++#if DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR > 40
++  err = (*db)->open(*db, NULL, name, NULL, type, DB_CREATE | DB_THREAD , 0664);
++#else
+   err = (*db)->open(*db, name, NULL, type, DB_CREATE | DB_THREAD , 0664);
++#endif
+   if (err) {
+     printf("Problems opening %s : %s\n", name, db_strerror(err));
+     return err;

Copied: head/databases/rdfdb/files/patch-librdf_rdflib.c (from r354198, head/databases/rdfdb/files/patch-librdf::rdflib.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rdfdb/files/patch-librdf_rdflib.c	Fri May 16 08:05:05 2014	(r354199, copy of r354198, head/databases/rdfdb/files/patch-librdf::rdflib.c)
@@ -0,0 +1,11 @@
+--- librdf/rdflib.c.orig	Wed Oct  4 02:00:07 2000
++++ librdf/rdflib.c	Thu Aug 22 02:05:39 2002
+@@ -194,2 +194,4 @@
+ 
++extern FILE *rdfpGetFile(RDF_Parser rdfp);
++
+ RDF_Result 
+@@ -200,3 +202,2 @@
+                        RDF_ASSERT, getFileCode(rdfp)) && (rdfpGetFile(rdfp))) {
+-    extern FILE *rdfpGetFile(RDF_Parser rdfp);
+     FILE *file = rdfpGetFile(rdfp);

Copied: head/databases/rdfdb/files/rdfdb-server.in (from r354198, head/databases/rdfdb/files/rdfdb-server.sh.tmpl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rdfdb/files/rdfdb-server.in	Fri May 16 08:05:05 2014	(r354199, copy of r354198, head/databases/rdfdb/files/rdfdb-server.sh.tmpl)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+RDFDB_DIR=%%RDFDB_DIR%%
+RDFDB_PORT=%%RDFDB_PORT%%
+export RDFDB_DIR RDFDB_PORT
+
+case "$1" in
+	start)
+		if [ -x %%PREFIX%%/bin/rdfdb ]; then
+			su rdfdb -c 'exec %%PREFIX%%/bin/rdfdb > /dev/null &' && echo -n ' rdfdb'
+		fi
+		;;
+	stop)
+		/usr/bin/killall rdfdb > /dev/null 2>&1 && echo -n ' rdfdb'
+		;;
+	*)
+		echo ""
+		echo "Usage: `basename $0` { start | stop }"
+		echo ""
+		exit 64
+		;;
+esac