diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2006-11-15 14:40:54 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2006-11-15 14:40:54 +0000 |
| commit | 46301d9fc678d59f941ae904abe69a87110be59f (patch) | |
| tree | 2919c75a70f49b20c1a482cdb050b330091ed6a4 /databases | |
| parent | a590b077b00c5fbd3882d3b69fab29c4f6d31f08 (diff) | |
| download | ports-46301d9fc678d59f941ae904abe69a87110be59f.tar.gz ports-46301d9fc678d59f941ae904abe69a87110be59f.zip | |
* fix services issue
* change library symlinks: now libgds points to libfbembed
Notes
Notes:
svn path=/head/; revision=177321
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/firebird2-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/firebird2-server/files/patch-src%jrd%svc.cpp | 19 | ||||
| -rw-r--r-- | databases/firebird20-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/firebird20-server/files/patch-src%jrd%svc.cpp | 19 |
4 files changed, 34 insertions, 16 deletions
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile index 3ad760e1ae5c..509df22b931f 100644 --- a/databases/firebird2-server/Makefile +++ b/databases/firebird2-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION?= 3 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -209,8 +209,8 @@ do-install: ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so + ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 + ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so @${MKDIR} ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include diff --git a/databases/firebird2-server/files/patch-src%jrd%svc.cpp b/databases/firebird2-server/files/patch-src%jrd%svc.cpp index ed93b6d68d13..a76b1568b036 100644 --- a/databases/firebird2-server/files/patch-src%jrd%svc.cpp +++ b/databases/firebird2-server/files/patch-src%jrd%svc.cpp @@ -1,13 +1,22 @@ ---- src/jrd/svc.cpp.orig Tue Aug 15 23:06:16 2006 -+++ src/jrd/svc.cpp Tue Aug 15 23:06:50 2006 -@@ -1742,8 +1742,8 @@ +--- src/jrd/svc.cpp.orig Mon Jul 31 11:43:28 2006 ++++ src/jrd/svc.cpp Wed Nov 15 16:56:13 2006 +@@ -583,7 +583,8 @@ + { + #ifndef SERVICE_THREAD + TEXT service_path[MAXPATHLEN]; +- gds__prefix(service_path, serv->serv_executable); ++ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); ++ strlcat(service_path, serv->serv_executable, MAXPATHLEN); + service_fork(service_path, service); + #else + /* if service is single threaded, only call if not currently running */ +@@ -1742,7 +1743,8 @@ TEXT service_path[MAXPATHLEN]; if (serv->serv_executable) { - gds__prefix(service_path, serv->serv_executable); -- service->svc_flags = SVC_forked; + strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); + strlcat(service_path, serv->serv_executable, MAXPATHLEN); + service->svc_flags = SVC_forked; service_fork(service_path, service); } - diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index 3ad760e1ae5c..509df22b931f 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION?= 3 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -209,8 +209,8 @@ do-install: ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libgds.so + ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 + ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so @${MKDIR} ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include diff --git a/databases/firebird20-server/files/patch-src%jrd%svc.cpp b/databases/firebird20-server/files/patch-src%jrd%svc.cpp index ed93b6d68d13..a76b1568b036 100644 --- a/databases/firebird20-server/files/patch-src%jrd%svc.cpp +++ b/databases/firebird20-server/files/patch-src%jrd%svc.cpp @@ -1,13 +1,22 @@ ---- src/jrd/svc.cpp.orig Tue Aug 15 23:06:16 2006 -+++ src/jrd/svc.cpp Tue Aug 15 23:06:50 2006 -@@ -1742,8 +1742,8 @@ +--- src/jrd/svc.cpp.orig Mon Jul 31 11:43:28 2006 ++++ src/jrd/svc.cpp Wed Nov 15 16:56:13 2006 +@@ -583,7 +583,8 @@ + { + #ifndef SERVICE_THREAD + TEXT service_path[MAXPATHLEN]; +- gds__prefix(service_path, serv->serv_executable); ++ strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); ++ strlcat(service_path, serv->serv_executable, MAXPATHLEN); + service_fork(service_path, service); + #else + /* if service is single threaded, only call if not currently running */ +@@ -1742,7 +1743,8 @@ TEXT service_path[MAXPATHLEN]; if (serv->serv_executable) { - gds__prefix(service_path, serv->serv_executable); -- service->svc_flags = SVC_forked; + strlcpy(service_path, FB_EXEC_PREFIX "/", MAXPATHLEN); + strlcat(service_path, serv->serv_executable, MAXPATHLEN); + service->svc_flags = SVC_forked; service_fork(service_path, service); } - |