kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* fix services issue

Browse source 
* change library symlinks: now libgds points to libfbembed
This commit is contained in:
Sergey Skvortsov 2006-11-15 14:40:54 +00:00
parent a590b077b0
commit 46301d9fc6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=177321
4 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
databases/firebird2-server/Makefile
View file

@ -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

19
databases/firebird2-server/files/patch-src%jrd%svc.cpp
View file

@ -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);
}

6
databases/firebird20-server/Makefile
View file

@ -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

19
databases/firebird20-server/files/patch-src%jrd%svc.cpp
View file

@ -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);
}