Date: Wed, 8 Jun 2005 12:36:47 -0300 (BRST) From: Renato Botelho <freebsd@galle.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82040: [MAINTAINER] databases/firebird-server: Back to install -client on ${PREFIX}/firebird. It fixes -server port Message-ID: <200506081536.j58FalHA070490@data.galle.com.br> Resent-Message-ID: <200506081540.j58Fe4nv005842@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82040 >Category: ports >Synopsis: [MAINTAINER] databases/firebird-server: Back to install -client on ${PREFIX}/firebird. It fixes -server port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 08 15:40:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.4-RELEASE i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Tue May 10 09:20:42 BRST 2005 >Description: Some people are trying to make a patch to unbreak -server port, but, while we can't have a real solution, I'm backing to install -client stuffs on ${PREFIX}/firebird. It fix the problems on -server ports. Removed file(s): - files/patch-src::jrd::gds.cpp Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- firebird-server-1.5.2_3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 23 May 2005 11:13:23 -0000 1.41 +++ Makefile 8 Jun 2005 15:34:41 -0000 @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 1.5.2 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -37,6 +37,9 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/${DISTNAME} +DOCSDIR= ${PREFIX}/firebird/doc +EXAMPLESDIR= ${PREFIX}/firebird/examples +SUB_FILES+= pkg-install .if !defined(CLIENT_ONLY) # Server part stuff @@ -48,15 +51,7 @@ ALL_TARGET= firebird_boot ref_databases msgs intl otherfiles \ inet_server extlib -# Use own user and group when install server part -BINGRP= firebird -BINMODE= 550 -SHAREGRP= firebird - -SUB_FILES= pkg-install pkg-message aliases.conf - -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGINSTALL= ${WRKDIR}/pkg-install +SUB_FILES+= pkg-message aliases.conf SERVER_BIN= fb_inet_server fb_lock_mgr UDF_SO= ib_udf.so fbudf.so @@ -65,20 +60,14 @@ CONFLICTS= firebird-devel-[0-9]* .else # Client part stuff -AUTOGENARGS= --prefix=${PREFIX} \ +AUTOGENARGS= --prefix=${PREFIX}/firebird \ --with-editline ALL_TARGET= firebird_basic libfbembed embed_gfix embed_gbak embed_isql embed_gpre \ embed_util embed_gdef embed_qli libfbclient extlib INSTALLS_SHLIB= yes -LIBDATADIR= ${PREFIX}/libdata/firebird -PLIST_SUB+= LIBDATADIR="libdata/firebird" CLIENT_BIN= fb_lock_print gbak gdef gds_drop gfix gpre gsec gstat isql qli - -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif .endif .include <bsd.port.pre.mk> @@ -101,18 +90,16 @@ post-patch: .if !defined(CLIENT_ONLY) - @${REINPLACE_CMD} -e 's|^\(LINK_OPTS +=.*\)$$|\1 -L${LOCALBASE}/lib|' \ + @${REINPLACE_CMD} -e 's|^\(LINK_OPTS +=.*\)$$|\1 -L${LOCALBASE}/firebird/lib|' \ ${WRKSRC}/builds/posix/Makefile.in.inet_server .endif - @${REINPLACE_CMD} -e 's|%%LIBDATADIR%%|${LIBDATADIR}|g' \ - ${WRKSRC}/src/jrd/gds.cpp -.if !defined(CLIENT_ONLY) pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL + @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL + @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if !defined(CLIENT_ONLY) @${CAT} ${PKGMESSAGE} .endif @@ -123,71 +110,80 @@ post-configure: @${REINPLACE_CMD} -e 's|__attribute__ ((__unused__));||' \ ${WRKSRC}/src/dsql/parse.cpp - @${REINPLACE_CMD} -e 's|firebird\.conf|${PREFIX}/etc/firebird.conf|g; \ - s|root_dir + string(CONFIG_FILE)|string(CONFIG_FILE)|g' \ - ${WRKSRC}/src/jrd/os/posix/config_root.cpp do-build: @(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${GMAKE} ${ALL_TARGET}) do-install: + ${MKDIR} ${PREFIX}/firebird + ${MKDIR} ${PREFIX}/firebird/bin + .if !defined(CLIENT_ONLY) - ${MKDIR} ${PREFIX}/firebird -.for f in UDF bin help intl +.for f in UDF help intl ${MKDIR} ${PREFIX}/firebird/${f} - ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/firebird/${f} + ${CHOWN} firebird:firebird ${PREFIX}/firebird/${f} .endfor +.if !exists(${PREFIX}/firebird/aliases.conf) + ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${PREFIX}/firebird +.endif ${INSTALL_DATA} ${WRKDIR}/aliases.conf ${PREFIX}/firebird/aliases.conf.sample - ${INSTALL_DATA} -m 660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ +.if !exists(${PREFIX}/firebird/security.fdb) + ${INSTALL_DATA} -m 660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${PREFIX}/firebird +.endif + ${INSTALL_DATA} -m 660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ ${PREFIX}/firebird/security.fdb.sample - ${INSTALL_DATA} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${PREFIX}/firebird/help + ${INSTALL_DATA} -m 0440 -o firebird -g firebird ${WRKSRC}/gen/firebird/help/help.fdb \ + ${PREFIX}/firebird/help - ${INSTALL_DATA} ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} \ + ${INSTALL_DATA} -o firebird -g firebird ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} \ ${UDF_SQL:S!^!${WRKSRC}/!} ${PREFIX}/firebird/UDF - ${INSTALL_PROGRAM} -o firebird \ + ${INSTALL_PROGRAM} -o firebird -g firebird \ ${SERVER_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/firebird/bin ${CHMOD} u+s ${SERVER_BIN:S!^!${PREFIX}/firebird/bin/!} - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/intl/libfbintl.so ${PREFIX}/firebird/intl/fbintl + ${INSTALL_DATA} -o firebird -g firebird ${WRKSRC}/gen/firebird/intl/libfbintl.so \ + ${PREFIX}/firebird/intl/fbintl ${INSTALL_DATA} ${FILESDIR}/RELNOTES ${PREFIX}/firebird - # runtime files (.lock, .log) still placed to ${PREFIX}/firebird - ${CHOWN} firebird:firebird ${PREFIX}/firebird - ${CHOWN} -R firebird:firebird ${PREFIX}/firebird/help - + ${TOUCH} ${PREFIX}/firebird/firebird.log + ${CHOWN} firebird:firebird ${PREFIX}/firebird/firebird.log + ${CHMOD} 660 ${PREFIX}/firebird/firebird.log .else # defined CLIENT_ONLY + +.for f in lib include + ${MKDIR} ${PREFIX}/firebird/${f} +.endfor + ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} \ - ${PREFIX}/bin + ${PREFIX}/firebird/bin - @${MKDIR} ${PREFIX}/etc -.if !exists(${PREFIX}/etc/firebird.conf) - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${PREFIX}/etc +.if !exists(${PREFIX}/firebird/firebird.conf) + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${PREFIX}/firebird .endif - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${PREFIX}/etc/firebird.conf.sample + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/misc/firebird.conf ${PREFIX}/firebird/firebird.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ - ${PREFIX}/lib + ${PREFIX}/firebird/lib - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.1 - ${LN} -fs libfbclient.so.1 ${PREFIX}/lib/libfbclient.so + ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/firebird/lib/libfbclient.so.1 + ${LN} -fs libfbclient.so.1 ${PREFIX}/firebird/lib/libfbclient.so - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.1 - ${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libfbembed.so - ${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libgds.so.1 - ${LN} -fs libfbembed.so.1 ${PREFIX}/lib/libgds.so + ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/firebird/lib/libfbembed.so.1 + ${LN} -fs libfbembed.so.1 ${PREFIX}/firebird/lib/libfbembed.so + ${LN} -fs libfbembed.so.1 ${PREFIX}/firebird/lib/libgds.so.1 + ${LN} -fs libfbembed.so.1 ${PREFIX}/firebird/lib/libgds.so - @${MKDIR} ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/firebird/include - @${MKDIR} ${LIBDATADIR} - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${LIBDATADIR} + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${PREFIX}/firebird .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/sql.extensions Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/pkg-plist,v retrieving revision 1.11 diff -u -r1.11 pkg-plist --- pkg-plist 23 May 2005 11:13:23 -0000 1.11 +++ pkg-plist 8 Jun 2005 15:34:41 -0000 @@ -19,7 +19,7 @@ firebird/security.fdb.sample @exec [ -f %B/security.fdb ] || cp %B/%f %B/security.fdb @dirrm firebird/UDF -@dirrm firebird/bin @dirrm firebird/help @dirrm firebird/intl +@unexec rmdir %D/firebird/bin 2>/dev/null || true @unexec rmdir %D/firebird 2>/dev/null || true Index: pkg-plist.client =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/pkg-plist.client,v retrieving revision 1.3 diff -u -r1.3 pkg-plist.client --- pkg-plist.client 23 May 2005 11:13:23 -0000 1.3 +++ pkg-plist.client 8 Jun 2005 15:34:41 -0000 @@ -1,37 +1,37 @@ @comment $FreeBSD: ports/databases/firebird-server/pkg-plist.client,v 1.3 2005/05/23 11:13:23 skv Exp $ -bin/fb_lock_print -bin/gbak -bin/gdef -bin/gds_drop -bin/gfix -bin/gpre -bin/gsec -bin/gstat -bin/isql -bin/qli -include/blr.h -include/gds.h -include/ib_util.h -include/ibase.h -include/iberror.h -include/perf.h -lib/libfbclient.so -lib/libfbclient.so.1 -lib/libfbclient.so.%%FIREBIRD_VERSION%% -lib/libfbembed.so -lib/libfbembed.so.1 -lib/libfbembed.so.%%FIREBIRD_VERSION%% -lib/libgds.so -lib/libgds.so.1 -lib/libib_util.so -@unexec if cmp -s %D/etc/firebird.conf %D/etc/firebird.conf.sample; then rm -f %D/etc/firebird.conf; fi -etc/firebird.conf.sample +@unexec rm -f %%LOCALBASE%%/etc/rc.d/000.firebird.sh +firebird/bin/fb_lock_print +firebird/bin/gbak +firebird/bin/gdef +firebird/bin/gds_drop +firebird/bin/gfix +firebird/bin/gpre +firebird/bin/gsec +firebird/bin/gstat +firebird/bin/isql +firebird/bin/qli +firebird/include/blr.h +firebird/include/gds.h +firebird/include/ib_util.h +firebird/include/ibase.h +firebird/include/iberror.h +firebird/include/perf.h +firebird/lib/libfbclient.so +firebird/lib/libfbclient.so.1 +firebird/lib/libfbclient.so.%%FIREBIRD_VERSION%% +firebird/lib/libfbembed.so +firebird/lib/libfbembed.so.1 +firebird/lib/libfbembed.so.%%FIREBIRD_VERSION%% +firebird/lib/libgds.so +firebird/lib/libgds.so.1 +firebird/lib/libib_util.so +@unexec if cmp -s %D/firebird/firebird.conf %D/firebird/firebird.conf.sample; then rm -f %D/firebird/firebird.conf; fi +firebird/firebird.conf.sample @exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf -%%LIBDATADIR%%/de_DE.msg -%%LIBDATADIR%%/firebird.msg -%%LIBDATADIR%%/fr_FR.msg -%%LIBDATADIR%%/ja_JP.msg -@dirrm %%LIBDATADIR%% +firebird/de_DE.msg +firebird/firebird.msg +firebird/fr_FR.msg +firebird/ja_JP.msg %%EXAMPLESDIR%%/align.h %%EXAMPLESDIR%%/api1.c %%EXAMPLESDIR%%/api10.c @@ -79,4 +79,34 @@ %%EXAMPLESDIR%%/stat9.e %%EXAMPLESDIR%%/udf.sql %%EXAMPLESDIR%%/udflib.c +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.NTSecurity +%%PORTDOCS%%%%DOCSDIR%%/README.Win32LibraryInstallation.txt +%%PORTDOCS%%%%DOCSDIR%%/README.build.mingw.html +%%PORTDOCS%%%%DOCSDIR%%/README.build.msvc.html +%%PORTDOCS%%%%DOCSDIR%%/README.install.Solaris_on_Intel +%%PORTDOCS%%%%DOCSDIR%%/README.instsvc +%%PORTDOCS%%%%DOCSDIR%%/README.makefiles +%%PORTDOCS%%%%DOCSDIR%%/README.user +%%PORTDOCS%%%%DOCSDIR%%/README.user.embedded +%%PORTDOCS%%%%DOCSDIR%%/README.user.troubleshooting +%%PORTDOCS%%%%DOCSDIR%%/WhatsNew +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.aggregate_tracking +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.case +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.coalesce +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.context_variables +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.data_types +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.exception_handling +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.execute_statement +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.explicit_locks +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.nullif +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.order_by_expressions_nulls +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.savepoints +%%PORTDOCS%%%%DOCSDIR%%/sql.extensions/README.universal_triggers +@dirrm %%PORTDOCS%%%%DOCSDIR%%/sql.extensions +@dirrm %%PORTDOCS%%%%DOCSDIR%% @dirrm %%EXAMPLESDIR%% +@dirrm firebird/bin +@dirrm firebird/include +@dirrm firebird/lib +@unexec rmdir %D/firebird 2>/dev/null || true Index: files/patch-src::jrd::gds.cpp =================================================================== RCS file: files/patch-src::jrd::gds.cpp diff -N files/patch-src::jrd::gds.cpp --- files/patch-src::jrd::gds.cpp 23 May 2005 11:13:23 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- src/jrd/gds.cpp.orig Sun May 22 18:52:41 2005 -+++ src/jrd/gds.cpp Sun May 22 18:55:44 2005 -@@ -1732,8 +1732,8 @@ - - if (ib_prefix_msg == NULL) { - if (!(ib_prefix_msg = getenv(FB_MSG_ENV))) { -+ strncpy(ib_prefix_msg_val, "%%LIBDATADIR%%", MAXPATHLEN); - ib_prefix_msg = ib_prefix_msg_val; -- gds__prefix(ib_prefix_msg, ""); - } - else { - strcat(ib_prefix_msg_val, ib_prefix_msg); Index: files/pkg-install.in =================================================================== RCS file: /home/ncvs/ports/databases/firebird-server/files/pkg-install.in,v retrieving revision 1.2 diff -u -r1.2 pkg-install.in --- files/pkg-install.in 21 May 2005 08:01:24 -0000 1.2 +++ files/pkg-install.in 8 Jun 2005 15:34:41 -0000 @@ -7,65 +7,76 @@ case $2 in PRE-INSTALL) -if [ `id -u` -ne 0 ]; then - echo; echo "You must be root to run this step!"; echo; echo - exit 1 -fi +if [ "${1%%-1*}" = "firebird-server" ]; then + if [ `id -u` -ne 0 ]; then + echo; echo "You must be root to run this step!"; echo; echo + exit 1 + fi -nofbuid=0 -fbUID=`id -u firebird 2>/dev/null` -if [ $? -ne 0 ]; then - fbUID=90 - while [ ! -z `id -un $fbUID 2>/dev/null` ] - do - fbUID=$(($fbUID+1)) - done - nofbuid=1 -fi + nofbuid=0 + fbUID=`id -u firebird 2>/dev/null` + if [ $? -ne 0 ]; then + fbUID=90 + while [ ! -z `id -un $fbUID 2>/dev/null` ] + do + fbUID=$(($fbUID+1)) + done + nofbuid=1 + fi -fbGID=`pw groupshow firebird 2>/dev/null` -if [ $? -ne 0 ]; then - fbGID=90 - while [ ! -z `id -gn $fbGID 2>/dev/null` ] - do - fbGID=$(($fbGID+1)) - done - echo "firebird:*:$fbGID:" >> /etc/group -else - fbGID=`echo $fbGID | awk -F: '{print $3}'` -fi + fbGID=`pw groupshow firebird 2>/dev/null` + if [ $? -ne 0 ]; then + fbGID=90 + while [ ! -z `id -gn $fbGID 2>/dev/null` ] + do + fbGID=$(($fbGID+1)) + done + echo "firebird:*:$fbGID:" >> /etc/group + else + fbGID=`echo $fbGID | awk -F: '{print $3}'` + fi -echo "firebird user using uid $fbUID" -echo "firebird user using gid $fbGID" + echo "firebird user using uid $fbUID" + echo "firebird user using gid $fbGID" -if which -s pw; then - if [ $nofbuid -ne 0 ]; then - pw useradd firebird -u $fbUID -g $fbGID -h - -s /bin/sh \ - -d $PKG_PREFIX/firebird -c "Firebird Database Administrator" + if which -s pw; then + if [ $nofbuid -ne 0 ]; then + pw useradd firebird -u $fbUID -g $fbGID -h - -s /bin/sh \ + -d $PKG_PREFIX/firebird -c "Firebird Database Administrator" + fi + else + echo -n "unable to create user firebird - please create it manually," + echo " before reinstalling this package." + exit 1 fi -else - echo -n "unable to create user firebird - please create it manually," - echo " before reinstalling this package." - exit 1 fi ;; POST-INSTALL) -cd $PKG_PREFIX/firebird -# Lock files +if [ "${1%%-1*}" = "firebird-server" ]; then + cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 -do - FileName=$i.`hostname` - touch $FileName - chmod uga=rw $FileName - chown firebird:firebird $FileName -done - -touch firebird.log -chown firebird:firebird firebird.log + # Lock files + for i in isc_init1 isc_lock1 isc_event1 + do + FileName=$i.`hostname` + touch $FileName + chmod uga=rw $FileName + chown firebird:firebird $FileName + done + touch firebird.log + chown firebird:firebird firebird.log +else + # shared lib startup script + if [ -d $PKG_PREFIX/etc/rc.d ]; then + ( + echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/firebird/lib ] && /sbin/ldconfig -m $PKG_PREFIX/firebird/lib" + ) > %%LOCALBASE%%/etc/rc.d/000.firebird.sh + chmod a=rx %%LOCALBASE%%/etc/rc.d/000.firebird.sh + fi +fi ;; esac --- firebird-server-1.5.2_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506081536.j58FalHA070490>