diff options
55 files changed, 295 insertions, 620 deletions
diff --git a/databases/firebird-client/Makefile b/databases/firebird-client/Makefile index 227d8c4a3a44..486467c2efda 100644 --- a/databases/firebird-client/Makefile +++ b/databases/firebird-client/Makefile @@ -6,19 +6,20 @@ # PORTNAME= firebird -PORTVERSION= 0.9 -PORTREVISION= 4 +PORTVERSION= 1.0 CATEGORIES= databases MASTER_SITES= http://firebird.sourceforge.net/download/ \ + http://www.aims.com.au/chris/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird -DISTFILES= firebird-boot-kit.tar.gz \ +DISTFILES= bootkit-1.0.0.796.tar.gz \ + bootkit-freebsd-1.0.0.796.tar.gz \ interbase0.9-4-v5examples.tar.gz \ - interbase0.9-4src.tar.gz + Firebird-1.0.0.796.src.tar.gz MAINTAINER= chris@aims.com.au -WRKSRC= ${WRKDIR}/interbase +WRKSRC= ${WRKDIR}/firebird-1.0.0.796 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/firebird/lib MSG_FILE= ${PKGDIR}/pkg-message @@ -31,9 +32,12 @@ ONLY_FOR_ARCHS= i386 do-extract: @${MKDIR} ${WRKDIR} @( \ - cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz; \ - cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz; \ - ${CP} msgs/msg.gbak misc/msg.gbak \ + cd ${WRKDIR}; ${TAR} -zxf \ + ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz; \ + cd firebird-1.0.0.796; \ + ${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz; \ + ${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz; \ + ${CP} -f msgs/msg.gbak misc/msg.gbak \ ) post-patch: @@ -47,11 +51,17 @@ post-patch: do-configure: @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} buildBootDatabases; \ - ${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot; \ + NOPROMPT_SETUP=yes; export NOPROMPT_SETUP; \ + FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO; \ + ${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r' \ + > builds_win32/original/build_no.ksh.fix; \ + ${MV} -f builds_win32/original/build_no.ksh.fix \ + builds_win32/original/build_no.ksh; \ + ${SH} Configure.sh PROD FREEBSD; \ ) do-build: @@ -60,15 +70,21 @@ do-build: '[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + ${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb \ + ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb; \ + ${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb \ + ${WRKDIR}/firebird-1.0.0.796/msg.gdb; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} boot.freebsd; \ ) do-install: @( \ - cd ${WRKDIR}/interbase; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + ${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb; \ + ${CP} /dev/null interbase/interbase.log; \ ${CP} -Rp interbase ${PREFIX}/firebird; \ ${RM} ${PREFIX}/firebird/install; \ ${RM} ${PREFIX}/firebird/lib/libgds.so.1.0; \ diff --git a/databases/firebird-client/distinfo b/databases/firebird-client/distinfo index 67c42987376e..dfdff30e23a3 100644 --- a/databases/firebird-client/distinfo +++ b/databases/firebird-client/distinfo @@ -1,3 +1,4 @@ -MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64 +MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155 +MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a -MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652 +MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8 diff --git a/databases/firebird-client/files/RELNOTES b/databases/firebird-client/files/RELNOTES index d2fd1d4fc88d..5434347e24d2 100644 --- a/databases/firebird-client/files/RELNOTES +++ b/databases/firebird-client/files/RELNOTES @@ -1,6 +1,6 @@ -Firebird 0.9_4 FreeBSD Release Notes 13-Jan-2001 ------------------------------------- -FB-T0.9.4.34 Firebird Test1 +Firebird 1.0.0 FreeBSD Release Notes 13-Mar-2002 +-------------------------------------- +FB-T6.2.796 Firebird Final Release Welcome to the FreeBSD Firebird port! Users should note that there was a package called `firebird-1.0.tgz' released in mid-August @@ -75,5 +75,5 @@ and InterBase can be found at the following: http://www.interbase2000.org/ http://www.firebirdsql.org/ -Geoff Speicher -<geoff@sea-incorporated.com> +Chris Knight +<chris@aims.com.au> diff --git a/databases/firebird-client/files/patch-aa b/databases/firebird-client/files/patch-aa index f2db9a68750d..e69de29bb2d1 100644 --- a/databases/firebird-client/files/patch-aa +++ b/databases/firebird-client/files/patch-aa @@ -1,11 +0,0 @@ ---- buildBootDatabases.orig Tue Oct 10 23:00:39 2000 -+++ buildBootDatabases Tue Oct 10 23:00:46 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - #-------------------------------------------------------------------- diff --git a/databases/firebird-client/files/patch-ab b/databases/firebird-client/files/patch-ab index f054a4b23007..e69de29bb2d1 100644 --- a/databases/firebird-client/files/patch-ab +++ b/databases/firebird-client/files/patch-ab @@ -1,11 +0,0 @@ ---- setup_dirs.boot.orig Tue Oct 10 23:00:07 2000 -+++ setup_dirs.boot Tue Oct 10 23:00:22 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - diff --git a/databases/firebird-client/files/patch-ac b/databases/firebird-client/files/patch-ac index bf5de43b75fb..e69de29bb2d1 100644 --- a/databases/firebird-client/files/patch-ac +++ b/databases/firebird-client/files/patch-ac @@ -1,58 +0,0 @@ ---- builds/original/prefix.freebsd 2000/10/08 15:36:25 1.2 -+++ builds/original/prefix.freebsd 2001/01/11 19:17:58 -@@ -28,7 +28,7 @@ - - - PROD_DEBUG_OBJECTS= nodebug.o --PROD_SHRLIB_DIR= -+PROD_SHRLIB_DIR= -Lsource/jrd - PROD_VERSION_FLAG= -DPROD_BUILD - PROD_CFLAGS= -O -m486 -fpic -DFLINTSTONE - -@@ -48,7 +48,7 @@ - UDF_LINK_CMD= gcc - UDF_CFLAGS= -fPIC -mieee-fp - UDF_LFLAGS= -shared --UDF_SHRLIBS= -L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt -+UDF_SHRLIBS= $(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt - - #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules - # to workaround the Solaris threading problems with signals -@@ -69,16 +69,14 @@ - FUNCTIONS= functions.bin - FUNCSHR= source/interbase/lib/gdsf.so - GDS_LINK= $(GDSSHR_LINK) --#GDS_PYXIS= - GDS_PYXIS= gds_pyxis.a - GDSLIB_BACKEND= source/interbase/lib/gds_b.a - GDSLIB_LINK= -Lsource/jrd -lgds_b -lc -ldescrypt - - GDSSHR= source/interbase/lib/gds.so - LINUX_GDSSHR= $(GDSSHR) --GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt --PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis --#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -+GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt -+PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis - HLPDIR= source/qli/ - HOSTNAME= `hostname | cut -d'.' -f1` - INCLUDES= include_so include_so_ada -@@ -106,11 +104,6 @@ - MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm - PIC_FLAGS= $(CFLAGS) -fPIC - PIPE= gds.a gds_pipe --#PYXIS= --#PYXIS_MISC_OBJS= --#PYXIS_P_MISC_OBJS= --#PYXIS_OBJECTS= --#PYXIS_MISC_OBJECTS= - PYXIS= pyxis - PYXIS_MISC_OBJS= $(PYXIS_MISC) - PYXIS_P_MISC_OBJS= $(PYXIS_P_MISC) -@@ -167,5 +160,8 @@ - SHRLIB_EXT= .so - - V3PRINTER= source/lock/printv3.o -+ -+# Forces library build for FreeBSD -+PYXIS_LIBRARY= libpyxis.a diff --git a/databases/firebird-client/files/patch-ad b/databases/firebird-client/files/patch-ad index 7ce937566bc3..4bcb2c1ce13c 100644 --- a/databases/firebird-client/files/patch-ad +++ b/databases/firebird-client/files/patch-ad @@ -1,13 +1,12 @@ ---- jrd/enc.c.orig Fri Aug 4 06:50:03 2000 -+++ jrd/enc.c Sun Nov 18 19:17:19 2001 -@@ -31,6 +31,10 @@ - * - **************************************/ - -+#ifdef FREEBSD -+crypt_set_format("des"); -+#endif -+ - return CRYPT_FUNC( string, salt); +--- setup_dirs.orig Tue Aug 7 05:00:12 2001 ++++ setup_dirs Fri Dec 28 16:12:49 2001 +@@ -60,7 +60,8 @@ + DefaultAns=$2 + echo -n "${1}" + Answer="$DefaultAns" +- read Answer ++# read Answer ++ echo "" } - #endif + + diff --git a/databases/firebird-client/pkg-descr b/databases/firebird-client/pkg-descr index b080060395eb..c0ac8b0093af 100644 --- a/databases/firebird-client/pkg-descr +++ b/databases/firebird-client/pkg-descr @@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has been closed. For more information on Firebird and InterBase, see: + +http://sourceforge.net/projects/firebird/ http://www.ibphoenix.com/ http://www.interbase2000.org/ http://www.interbase.com/ http://www.firebirdsql.org/ -and of course the firebird page itself: -WWW: http://sourceforge.net/projects/firebird/ - For more information on the locksmith back door, see: https://www.kb.cert.org/vuls/id/247371 diff --git a/databases/firebird-client/pkg-install b/databases/firebird-client/pkg-install index c6b00320cd7e..af43f63a3943 100644 --- a/databases/firebird-client/pkg-install +++ b/databases/firebird-client/pkg-install @@ -29,7 +29,7 @@ if 0; if( \$> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( \$null, \$null, \$fbUID ) = getpwnam( "firebird" ); @@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PKG_PREFIX/firebird -print` do FileName=$i @@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so cd $PKG_PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird-client/scripts/createuser b/databases/firebird-client/scripts/createuser index b61d47fd84bd..eba7ce1b887d 100644 --- a/databases/firebird-client/scripts/createuser +++ b/databases/firebird-client/scripts/createuser @@ -8,7 +8,7 @@ if 0; if( $> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( $null, $null, $fbUID ) = getpwnam( "firebird" ); diff --git a/databases/firebird-client/scripts/post-install b/databases/firebird-client/scripts/post-install index c2515fde278c..68b4ccadb907 100644 --- a/databases/firebird-client/scripts/post-install +++ b/databases/firebird-client/scripts/post-install @@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PREFIX/firebird -print` do FileName=$i @@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so cd $PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile index 227d8c4a3a44..486467c2efda 100644 --- a/databases/firebird-server/Makefile +++ b/databases/firebird-server/Makefile @@ -6,19 +6,20 @@ # PORTNAME= firebird -PORTVERSION= 0.9 -PORTREVISION= 4 +PORTVERSION= 1.0 CATEGORIES= databases MASTER_SITES= http://firebird.sourceforge.net/download/ \ + http://www.aims.com.au/chris/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird -DISTFILES= firebird-boot-kit.tar.gz \ +DISTFILES= bootkit-1.0.0.796.tar.gz \ + bootkit-freebsd-1.0.0.796.tar.gz \ interbase0.9-4-v5examples.tar.gz \ - interbase0.9-4src.tar.gz + Firebird-1.0.0.796.src.tar.gz MAINTAINER= chris@aims.com.au -WRKSRC= ${WRKDIR}/interbase +WRKSRC= ${WRKDIR}/firebird-1.0.0.796 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/firebird/lib MSG_FILE= ${PKGDIR}/pkg-message @@ -31,9 +32,12 @@ ONLY_FOR_ARCHS= i386 do-extract: @${MKDIR} ${WRKDIR} @( \ - cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz; \ - cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz; \ - ${CP} msgs/msg.gbak misc/msg.gbak \ + cd ${WRKDIR}; ${TAR} -zxf \ + ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz; \ + cd firebird-1.0.0.796; \ + ${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz; \ + ${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz; \ + ${CP} -f msgs/msg.gbak misc/msg.gbak \ ) post-patch: @@ -47,11 +51,17 @@ post-patch: do-configure: @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} buildBootDatabases; \ - ${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot; \ + NOPROMPT_SETUP=yes; export NOPROMPT_SETUP; \ + FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO; \ + ${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r' \ + > builds_win32/original/build_no.ksh.fix; \ + ${MV} -f builds_win32/original/build_no.ksh.fix \ + builds_win32/original/build_no.ksh; \ + ${SH} Configure.sh PROD FREEBSD; \ ) do-build: @@ -60,15 +70,21 @@ do-build: '[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + ${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb \ + ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb; \ + ${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb \ + ${WRKDIR}/firebird-1.0.0.796/msg.gdb; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} boot.freebsd; \ ) do-install: @( \ - cd ${WRKDIR}/interbase; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + ${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb; \ + ${CP} /dev/null interbase/interbase.log; \ ${CP} -Rp interbase ${PREFIX}/firebird; \ ${RM} ${PREFIX}/firebird/install; \ ${RM} ${PREFIX}/firebird/lib/libgds.so.1.0; \ diff --git a/databases/firebird-server/distinfo b/databases/firebird-server/distinfo index 67c42987376e..dfdff30e23a3 100644 --- a/databases/firebird-server/distinfo +++ b/databases/firebird-server/distinfo @@ -1,3 +1,4 @@ -MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64 +MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155 +MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a -MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652 +MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8 diff --git a/databases/firebird-server/files/RELNOTES b/databases/firebird-server/files/RELNOTES index d2fd1d4fc88d..5434347e24d2 100644 --- a/databases/firebird-server/files/RELNOTES +++ b/databases/firebird-server/files/RELNOTES @@ -1,6 +1,6 @@ -Firebird 0.9_4 FreeBSD Release Notes 13-Jan-2001 ------------------------------------- -FB-T0.9.4.34 Firebird Test1 +Firebird 1.0.0 FreeBSD Release Notes 13-Mar-2002 +-------------------------------------- +FB-T6.2.796 Firebird Final Release Welcome to the FreeBSD Firebird port! Users should note that there was a package called `firebird-1.0.tgz' released in mid-August @@ -75,5 +75,5 @@ and InterBase can be found at the following: http://www.interbase2000.org/ http://www.firebirdsql.org/ -Geoff Speicher -<geoff@sea-incorporated.com> +Chris Knight +<chris@aims.com.au> diff --git a/databases/firebird-server/files/patch-aa b/databases/firebird-server/files/patch-aa index f2db9a68750d..e69de29bb2d1 100644 --- a/databases/firebird-server/files/patch-aa +++ b/databases/firebird-server/files/patch-aa @@ -1,11 +0,0 @@ ---- buildBootDatabases.orig Tue Oct 10 23:00:39 2000 -+++ buildBootDatabases Tue Oct 10 23:00:46 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - #-------------------------------------------------------------------- diff --git a/databases/firebird-server/files/patch-ab b/databases/firebird-server/files/patch-ab index f054a4b23007..e69de29bb2d1 100644 --- a/databases/firebird-server/files/patch-ab +++ b/databases/firebird-server/files/patch-ab @@ -1,11 +0,0 @@ ---- setup_dirs.boot.orig Tue Oct 10 23:00:07 2000 -+++ setup_dirs.boot Tue Oct 10 23:00:22 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - diff --git a/databases/firebird-server/files/patch-ac b/databases/firebird-server/files/patch-ac index bf5de43b75fb..e69de29bb2d1 100644 --- a/databases/firebird-server/files/patch-ac +++ b/databases/firebird-server/files/patch-ac @@ -1,58 +0,0 @@ ---- builds/original/prefix.freebsd 2000/10/08 15:36:25 1.2 -+++ builds/original/prefix.freebsd 2001/01/11 19:17:58 -@@ -28,7 +28,7 @@ - - - PROD_DEBUG_OBJECTS= nodebug.o --PROD_SHRLIB_DIR= -+PROD_SHRLIB_DIR= -Lsource/jrd - PROD_VERSION_FLAG= -DPROD_BUILD - PROD_CFLAGS= -O -m486 -fpic -DFLINTSTONE - -@@ -48,7 +48,7 @@ - UDF_LINK_CMD= gcc - UDF_CFLAGS= -fPIC -mieee-fp - UDF_LFLAGS= -shared --UDF_SHRLIBS= -L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt -+UDF_SHRLIBS= $(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt - - #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules - # to workaround the Solaris threading problems with signals -@@ -69,16 +69,14 @@ - FUNCTIONS= functions.bin - FUNCSHR= source/interbase/lib/gdsf.so - GDS_LINK= $(GDSSHR_LINK) --#GDS_PYXIS= - GDS_PYXIS= gds_pyxis.a - GDSLIB_BACKEND= source/interbase/lib/gds_b.a - GDSLIB_LINK= -Lsource/jrd -lgds_b -lc -ldescrypt - - GDSSHR= source/interbase/lib/gds.so - LINUX_GDSSHR= $(GDSSHR) --GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt --PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis --#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -+GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt -+PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis - HLPDIR= source/qli/ - HOSTNAME= `hostname | cut -d'.' -f1` - INCLUDES= include_so include_so_ada -@@ -106,11 +104,6 @@ - MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm - PIC_FLAGS= $(CFLAGS) -fPIC - PIPE= gds.a gds_pipe --#PYXIS= --#PYXIS_MISC_OBJS= --#PYXIS_P_MISC_OBJS= --#PYXIS_OBJECTS= --#PYXIS_MISC_OBJECTS= - PYXIS= pyxis - PYXIS_MISC_OBJS= $(PYXIS_MISC) - PYXIS_P_MISC_OBJS= $(PYXIS_P_MISC) -@@ -167,5 +160,8 @@ - SHRLIB_EXT= .so - - V3PRINTER= source/lock/printv3.o -+ -+# Forces library build for FreeBSD -+PYXIS_LIBRARY= libpyxis.a diff --git a/databases/firebird-server/files/patch-ad b/databases/firebird-server/files/patch-ad index 7ce937566bc3..4bcb2c1ce13c 100644 --- a/databases/firebird-server/files/patch-ad +++ b/databases/firebird-server/files/patch-ad @@ -1,13 +1,12 @@ ---- jrd/enc.c.orig Fri Aug 4 06:50:03 2000 -+++ jrd/enc.c Sun Nov 18 19:17:19 2001 -@@ -31,6 +31,10 @@ - * - **************************************/ - -+#ifdef FREEBSD -+crypt_set_format("des"); -+#endif -+ - return CRYPT_FUNC( string, salt); +--- setup_dirs.orig Tue Aug 7 05:00:12 2001 ++++ setup_dirs Fri Dec 28 16:12:49 2001 +@@ -60,7 +60,8 @@ + DefaultAns=$2 + echo -n "${1}" + Answer="$DefaultAns" +- read Answer ++# read Answer ++ echo "" } - #endif + + diff --git a/databases/firebird-server/pkg-descr b/databases/firebird-server/pkg-descr index b080060395eb..c0ac8b0093af 100644 --- a/databases/firebird-server/pkg-descr +++ b/databases/firebird-server/pkg-descr @@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has been closed. For more information on Firebird and InterBase, see: + +http://sourceforge.net/projects/firebird/ http://www.ibphoenix.com/ http://www.interbase2000.org/ http://www.interbase.com/ http://www.firebirdsql.org/ -and of course the firebird page itself: -WWW: http://sourceforge.net/projects/firebird/ - For more information on the locksmith back door, see: https://www.kb.cert.org/vuls/id/247371 diff --git a/databases/firebird-server/pkg-install b/databases/firebird-server/pkg-install index c6b00320cd7e..af43f63a3943 100644 --- a/databases/firebird-server/pkg-install +++ b/databases/firebird-server/pkg-install @@ -29,7 +29,7 @@ if 0; if( \$> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( \$null, \$null, \$fbUID ) = getpwnam( "firebird" ); @@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PKG_PREFIX/firebird -print` do FileName=$i @@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so cd $PKG_PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird-server/scripts/createuser b/databases/firebird-server/scripts/createuser index b61d47fd84bd..eba7ce1b887d 100644 --- a/databases/firebird-server/scripts/createuser +++ b/databases/firebird-server/scripts/createuser @@ -8,7 +8,7 @@ if 0; if( $> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( $null, $null, $fbUID ) = getpwnam( "firebird" ); diff --git a/databases/firebird-server/scripts/post-install b/databases/firebird-server/scripts/post-install index c2515fde278c..68b4ccadb907 100644 --- a/databases/firebird-server/scripts/post-install +++ b/databases/firebird-server/scripts/post-install @@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PREFIX/firebird -print` do FileName=$i @@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so cd $PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird/Makefile b/databases/firebird/Makefile index 227d8c4a3a44..486467c2efda 100644 --- a/databases/firebird/Makefile +++ b/databases/firebird/Makefile @@ -6,19 +6,20 @@ # PORTNAME= firebird -PORTVERSION= 0.9 -PORTREVISION= 4 +PORTVERSION= 1.0 CATEGORIES= databases MASTER_SITES= http://firebird.sourceforge.net/download/ \ + http://www.aims.com.au/chris/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird -DISTFILES= firebird-boot-kit.tar.gz \ +DISTFILES= bootkit-1.0.0.796.tar.gz \ + bootkit-freebsd-1.0.0.796.tar.gz \ interbase0.9-4-v5examples.tar.gz \ - interbase0.9-4src.tar.gz + Firebird-1.0.0.796.src.tar.gz MAINTAINER= chris@aims.com.au -WRKSRC= ${WRKDIR}/interbase +WRKSRC= ${WRKDIR}/firebird-1.0.0.796 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/firebird/lib MSG_FILE= ${PKGDIR}/pkg-message @@ -31,9 +32,12 @@ ONLY_FOR_ARCHS= i386 do-extract: @${MKDIR} ${WRKDIR} @( \ - cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz; \ - cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz; \ - ${CP} msgs/msg.gbak misc/msg.gbak \ + cd ${WRKDIR}; ${TAR} -zxf \ + ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz; \ + cd firebird-1.0.0.796; \ + ${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz; \ + ${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz; \ + ${CP} -f msgs/msg.gbak misc/msg.gbak \ ) post-patch: @@ -47,11 +51,17 @@ post-patch: do-configure: @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} buildBootDatabases; \ - ${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot; \ + NOPROMPT_SETUP=yes; export NOPROMPT_SETUP; \ + FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO; \ + ${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r' \ + > builds_win32/original/build_no.ksh.fix; \ + ${MV} -f builds_win32/original/build_no.ksh.fix \ + builds_win32/original/build_no.ksh; \ + ${SH} Configure.sh PROD FREEBSD; \ ) do-build: @@ -60,15 +70,21 @@ do-build: '[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + ${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb \ + ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb; \ + ${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb \ + ${WRKDIR}/firebird-1.0.0.796/msg.gdb; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} boot.freebsd; \ ) do-install: @( \ - cd ${WRKDIR}/interbase; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + ${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb; \ + ${CP} /dev/null interbase/interbase.log; \ ${CP} -Rp interbase ${PREFIX}/firebird; \ ${RM} ${PREFIX}/firebird/install; \ ${RM} ${PREFIX}/firebird/lib/libgds.so.1.0; \ diff --git a/databases/firebird/distinfo b/databases/firebird/distinfo index 67c42987376e..dfdff30e23a3 100644 --- a/databases/firebird/distinfo +++ b/databases/firebird/distinfo @@ -1,3 +1,4 @@ -MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64 +MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155 +MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a -MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652 +MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8 diff --git a/databases/firebird/files/RELNOTES b/databases/firebird/files/RELNOTES index d2fd1d4fc88d..5434347e24d2 100644 --- a/databases/firebird/files/RELNOTES +++ b/databases/firebird/files/RELNOTES @@ -1,6 +1,6 @@ -Firebird 0.9_4 FreeBSD Release Notes 13-Jan-2001 ------------------------------------- -FB-T0.9.4.34 Firebird Test1 +Firebird 1.0.0 FreeBSD Release Notes 13-Mar-2002 +-------------------------------------- +FB-T6.2.796 Firebird Final Release Welcome to the FreeBSD Firebird port! Users should note that there was a package called `firebird-1.0.tgz' released in mid-August @@ -75,5 +75,5 @@ and InterBase can be found at the following: http://www.interbase2000.org/ http://www.firebirdsql.org/ -Geoff Speicher -<geoff@sea-incorporated.com> +Chris Knight +<chris@aims.com.au> diff --git a/databases/firebird/files/patch-aa b/databases/firebird/files/patch-aa index f2db9a68750d..e69de29bb2d1 100644 --- a/databases/firebird/files/patch-aa +++ b/databases/firebird/files/patch-aa @@ -1,11 +0,0 @@ ---- buildBootDatabases.orig Tue Oct 10 23:00:39 2000 -+++ buildBootDatabases Tue Oct 10 23:00:46 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - #-------------------------------------------------------------------- diff --git a/databases/firebird/files/patch-ab b/databases/firebird/files/patch-ab index f054a4b23007..e69de29bb2d1 100644 --- a/databases/firebird/files/patch-ab +++ b/databases/firebird/files/patch-ab @@ -1,11 +0,0 @@ ---- setup_dirs.boot.orig Tue Oct 10 23:00:07 2000 -+++ setup_dirs.boot Tue Oct 10 23:00:22 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - diff --git a/databases/firebird/files/patch-ac b/databases/firebird/files/patch-ac index bf5de43b75fb..e69de29bb2d1 100644 --- a/databases/firebird/files/patch-ac +++ b/databases/firebird/files/patch-ac @@ -1,58 +0,0 @@ ---- builds/original/prefix.freebsd 2000/10/08 15:36:25 1.2 -+++ builds/original/prefix.freebsd 2001/01/11 19:17:58 -@@ -28,7 +28,7 @@ - - - PROD_DEBUG_OBJECTS= nodebug.o --PROD_SHRLIB_DIR= -+PROD_SHRLIB_DIR= -Lsource/jrd - PROD_VERSION_FLAG= -DPROD_BUILD - PROD_CFLAGS= -O -m486 -fpic -DFLINTSTONE - -@@ -48,7 +48,7 @@ - UDF_LINK_CMD= gcc - UDF_CFLAGS= -fPIC -mieee-fp - UDF_LFLAGS= -shared --UDF_SHRLIBS= -L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt -+UDF_SHRLIBS= $(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt - - #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules - # to workaround the Solaris threading problems with signals -@@ -69,16 +69,14 @@ - FUNCTIONS= functions.bin - FUNCSHR= source/interbase/lib/gdsf.so - GDS_LINK= $(GDSSHR_LINK) --#GDS_PYXIS= - GDS_PYXIS= gds_pyxis.a - GDSLIB_BACKEND= source/interbase/lib/gds_b.a - GDSLIB_LINK= -Lsource/jrd -lgds_b -lc -ldescrypt - - GDSSHR= source/interbase/lib/gds.so - LINUX_GDSSHR= $(GDSSHR) --GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt --PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis --#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -+GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt -+PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis - HLPDIR= source/qli/ - HOSTNAME= `hostname | cut -d'.' -f1` - INCLUDES= include_so include_so_ada -@@ -106,11 +104,6 @@ - MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm - PIC_FLAGS= $(CFLAGS) -fPIC - PIPE= gds.a gds_pipe --#PYXIS= --#PYXIS_MISC_OBJS= --#PYXIS_P_MISC_OBJS= --#PYXIS_OBJECTS= --#PYXIS_MISC_OBJECTS= - PYXIS= pyxis - PYXIS_MISC_OBJS= $(PYXIS_MISC) - PYXIS_P_MISC_OBJS= $(PYXIS_P_MISC) -@@ -167,5 +160,8 @@ - SHRLIB_EXT= .so - - V3PRINTER= source/lock/printv3.o -+ -+# Forces library build for FreeBSD -+PYXIS_LIBRARY= libpyxis.a diff --git a/databases/firebird/files/patch-ad b/databases/firebird/files/patch-ad index 7ce937566bc3..4bcb2c1ce13c 100644 --- a/databases/firebird/files/patch-ad +++ b/databases/firebird/files/patch-ad @@ -1,13 +1,12 @@ ---- jrd/enc.c.orig Fri Aug 4 06:50:03 2000 -+++ jrd/enc.c Sun Nov 18 19:17:19 2001 -@@ -31,6 +31,10 @@ - * - **************************************/ - -+#ifdef FREEBSD -+crypt_set_format("des"); -+#endif -+ - return CRYPT_FUNC( string, salt); +--- setup_dirs.orig Tue Aug 7 05:00:12 2001 ++++ setup_dirs Fri Dec 28 16:12:49 2001 +@@ -60,7 +60,8 @@ + DefaultAns=$2 + echo -n "${1}" + Answer="$DefaultAns" +- read Answer ++# read Answer ++ echo "" } - #endif + + diff --git a/databases/firebird/pkg-descr b/databases/firebird/pkg-descr index b080060395eb..c0ac8b0093af 100644 --- a/databases/firebird/pkg-descr +++ b/databases/firebird/pkg-descr @@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has been closed. For more information on Firebird and InterBase, see: + +http://sourceforge.net/projects/firebird/ http://www.ibphoenix.com/ http://www.interbase2000.org/ http://www.interbase.com/ http://www.firebirdsql.org/ -and of course the firebird page itself: -WWW: http://sourceforge.net/projects/firebird/ - For more information on the locksmith back door, see: https://www.kb.cert.org/vuls/id/247371 diff --git a/databases/firebird/pkg-install b/databases/firebird/pkg-install index c6b00320cd7e..af43f63a3943 100644 --- a/databases/firebird/pkg-install +++ b/databases/firebird/pkg-install @@ -29,7 +29,7 @@ if 0; if( \$> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( \$null, \$null, \$fbUID ) = getpwnam( "firebird" ); @@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PKG_PREFIX/firebird -print` do FileName=$i @@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so cd $PKG_PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird/scripts/createuser b/databases/firebird/scripts/createuser index b61d47fd84bd..eba7ce1b887d 100644 --- a/databases/firebird/scripts/createuser +++ b/databases/firebird/scripts/createuser @@ -8,7 +8,7 @@ if 0; if( $> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( $null, $null, $fbUID ) = getpwnam( "firebird" ); diff --git a/databases/firebird/scripts/post-install b/databases/firebird/scripts/post-install index c2515fde278c..68b4ccadb907 100644 --- a/databases/firebird/scripts/post-install +++ b/databases/firebird/scripts/post-install @@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PREFIX/firebird -print` do FileName=$i @@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so cd $PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile index 227d8c4a3a44..486467c2efda 100644 --- a/databases/firebird2-server/Makefile +++ b/databases/firebird2-server/Makefile @@ -6,19 +6,20 @@ # PORTNAME= firebird -PORTVERSION= 0.9 -PORTREVISION= 4 +PORTVERSION= 1.0 CATEGORIES= databases MASTER_SITES= http://firebird.sourceforge.net/download/ \ + http://www.aims.com.au/chris/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird -DISTFILES= firebird-boot-kit.tar.gz \ +DISTFILES= bootkit-1.0.0.796.tar.gz \ + bootkit-freebsd-1.0.0.796.tar.gz \ interbase0.9-4-v5examples.tar.gz \ - interbase0.9-4src.tar.gz + Firebird-1.0.0.796.src.tar.gz MAINTAINER= chris@aims.com.au -WRKSRC= ${WRKDIR}/interbase +WRKSRC= ${WRKDIR}/firebird-1.0.0.796 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/firebird/lib MSG_FILE= ${PKGDIR}/pkg-message @@ -31,9 +32,12 @@ ONLY_FOR_ARCHS= i386 do-extract: @${MKDIR} ${WRKDIR} @( \ - cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz; \ - cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz; \ - ${CP} msgs/msg.gbak misc/msg.gbak \ + cd ${WRKDIR}; ${TAR} -zxf \ + ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz; \ + cd firebird-1.0.0.796; \ + ${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz; \ + ${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz; \ + ${CP} -f msgs/msg.gbak misc/msg.gbak \ ) post-patch: @@ -47,11 +51,17 @@ post-patch: do-configure: @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} buildBootDatabases; \ - ${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot; \ + NOPROMPT_SETUP=yes; export NOPROMPT_SETUP; \ + FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO; \ + ${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r' \ + > builds_win32/original/build_no.ksh.fix; \ + ${MV} -f builds_win32/original/build_no.ksh.fix \ + builds_win32/original/build_no.ksh; \ + ${SH} Configure.sh PROD FREEBSD; \ ) do-build: @@ -60,15 +70,21 @@ do-build: '[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + ${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb \ + ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb; \ + ${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb \ + ${WRKDIR}/firebird-1.0.0.796/msg.gdb; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} boot.freebsd; \ ) do-install: @( \ - cd ${WRKDIR}/interbase; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + ${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb; \ + ${CP} /dev/null interbase/interbase.log; \ ${CP} -Rp interbase ${PREFIX}/firebird; \ ${RM} ${PREFIX}/firebird/install; \ ${RM} ${PREFIX}/firebird/lib/libgds.so.1.0; \ diff --git a/databases/firebird2-server/distinfo b/databases/firebird2-server/distinfo index 67c42987376e..dfdff30e23a3 100644 --- a/databases/firebird2-server/distinfo +++ b/databases/firebird2-server/distinfo @@ -1,3 +1,4 @@ -MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64 +MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155 +MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a -MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652 +MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8 diff --git a/databases/firebird2-server/files/RELNOTES b/databases/firebird2-server/files/RELNOTES index d2fd1d4fc88d..5434347e24d2 100644 --- a/databases/firebird2-server/files/RELNOTES +++ b/databases/firebird2-server/files/RELNOTES @@ -1,6 +1,6 @@ -Firebird 0.9_4 FreeBSD Release Notes 13-Jan-2001 ------------------------------------- -FB-T0.9.4.34 Firebird Test1 +Firebird 1.0.0 FreeBSD Release Notes 13-Mar-2002 +-------------------------------------- +FB-T6.2.796 Firebird Final Release Welcome to the FreeBSD Firebird port! Users should note that there was a package called `firebird-1.0.tgz' released in mid-August @@ -75,5 +75,5 @@ and InterBase can be found at the following: http://www.interbase2000.org/ http://www.firebirdsql.org/ -Geoff Speicher -<geoff@sea-incorporated.com> +Chris Knight +<chris@aims.com.au> diff --git a/databases/firebird2-server/files/patch-aa b/databases/firebird2-server/files/patch-aa index f2db9a68750d..e69de29bb2d1 100644 --- a/databases/firebird2-server/files/patch-aa +++ b/databases/firebird2-server/files/patch-aa @@ -1,11 +0,0 @@ ---- buildBootDatabases.orig Tue Oct 10 23:00:39 2000 -+++ buildBootDatabases Tue Oct 10 23:00:46 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - #-------------------------------------------------------------------- diff --git a/databases/firebird2-server/files/patch-ab b/databases/firebird2-server/files/patch-ab index f054a4b23007..e69de29bb2d1 100644 --- a/databases/firebird2-server/files/patch-ab +++ b/databases/firebird2-server/files/patch-ab @@ -1,11 +0,0 @@ ---- setup_dirs.boot.orig Tue Oct 10 23:00:07 2000 -+++ setup_dirs.boot Tue Oct 10 23:00:22 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - diff --git a/databases/firebird2-server/files/patch-ac b/databases/firebird2-server/files/patch-ac index bf5de43b75fb..e69de29bb2d1 100644 --- a/databases/firebird2-server/files/patch-ac +++ b/databases/firebird2-server/files/patch-ac @@ -1,58 +0,0 @@ ---- builds/original/prefix.freebsd 2000/10/08 15:36:25 1.2 -+++ builds/original/prefix.freebsd 2001/01/11 19:17:58 -@@ -28,7 +28,7 @@ - - - PROD_DEBUG_OBJECTS= nodebug.o --PROD_SHRLIB_DIR= -+PROD_SHRLIB_DIR= -Lsource/jrd - PROD_VERSION_FLAG= -DPROD_BUILD - PROD_CFLAGS= -O -m486 -fpic -DFLINTSTONE - -@@ -48,7 +48,7 @@ - UDF_LINK_CMD= gcc - UDF_CFLAGS= -fPIC -mieee-fp - UDF_LFLAGS= -shared --UDF_SHRLIBS= -L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt -+UDF_SHRLIBS= $(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt - - #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules - # to workaround the Solaris threading problems with signals -@@ -69,16 +69,14 @@ - FUNCTIONS= functions.bin - FUNCSHR= source/interbase/lib/gdsf.so - GDS_LINK= $(GDSSHR_LINK) --#GDS_PYXIS= - GDS_PYXIS= gds_pyxis.a - GDSLIB_BACKEND= source/interbase/lib/gds_b.a - GDSLIB_LINK= -Lsource/jrd -lgds_b -lc -ldescrypt - - GDSSHR= source/interbase/lib/gds.so - LINUX_GDSSHR= $(GDSSHR) --GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt --PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis --#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -+GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt -+PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis - HLPDIR= source/qli/ - HOSTNAME= `hostname | cut -d'.' -f1` - INCLUDES= include_so include_so_ada -@@ -106,11 +104,6 @@ - MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm - PIC_FLAGS= $(CFLAGS) -fPIC - PIPE= gds.a gds_pipe --#PYXIS= --#PYXIS_MISC_OBJS= --#PYXIS_P_MISC_OBJS= --#PYXIS_OBJECTS= --#PYXIS_MISC_OBJECTS= - PYXIS= pyxis - PYXIS_MISC_OBJS= $(PYXIS_MISC) - PYXIS_P_MISC_OBJS= $(PYXIS_P_MISC) -@@ -167,5 +160,8 @@ - SHRLIB_EXT= .so - - V3PRINTER= source/lock/printv3.o -+ -+# Forces library build for FreeBSD -+PYXIS_LIBRARY= libpyxis.a diff --git a/databases/firebird2-server/files/patch-ad b/databases/firebird2-server/files/patch-ad index 7ce937566bc3..4bcb2c1ce13c 100644 --- a/databases/firebird2-server/files/patch-ad +++ b/databases/firebird2-server/files/patch-ad @@ -1,13 +1,12 @@ ---- jrd/enc.c.orig Fri Aug 4 06:50:03 2000 -+++ jrd/enc.c Sun Nov 18 19:17:19 2001 -@@ -31,6 +31,10 @@ - * - **************************************/ - -+#ifdef FREEBSD -+crypt_set_format("des"); -+#endif -+ - return CRYPT_FUNC( string, salt); +--- setup_dirs.orig Tue Aug 7 05:00:12 2001 ++++ setup_dirs Fri Dec 28 16:12:49 2001 +@@ -60,7 +60,8 @@ + DefaultAns=$2 + echo -n "${1}" + Answer="$DefaultAns" +- read Answer ++# read Answer ++ echo "" } - #endif + + diff --git a/databases/firebird2-server/pkg-descr b/databases/firebird2-server/pkg-descr index b080060395eb..c0ac8b0093af 100644 --- a/databases/firebird2-server/pkg-descr +++ b/databases/firebird2-server/pkg-descr @@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has been closed. For more information on Firebird and InterBase, see: + +http://sourceforge.net/projects/firebird/ http://www.ibphoenix.com/ http://www.interbase2000.org/ http://www.interbase.com/ http://www.firebirdsql.org/ -and of course the firebird page itself: -WWW: http://sourceforge.net/projects/firebird/ - For more information on the locksmith back door, see: https://www.kb.cert.org/vuls/id/247371 diff --git a/databases/firebird2-server/pkg-install b/databases/firebird2-server/pkg-install index c6b00320cd7e..af43f63a3943 100644 --- a/databases/firebird2-server/pkg-install +++ b/databases/firebird2-server/pkg-install @@ -29,7 +29,7 @@ if 0; if( \$> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( \$null, \$null, \$fbUID ) = getpwnam( "firebird" ); @@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PKG_PREFIX/firebird -print` do FileName=$i @@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so cd $PKG_PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird2-server/scripts/createuser b/databases/firebird2-server/scripts/createuser index b61d47fd84bd..eba7ce1b887d 100644 --- a/databases/firebird2-server/scripts/createuser +++ b/databases/firebird2-server/scripts/createuser @@ -8,7 +8,7 @@ if 0; if( $> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( $null, $null, $fbUID ) = getpwnam( "firebird" ); diff --git a/databases/firebird2-server/scripts/post-install b/databases/firebird2-server/scripts/post-install index c2515fde278c..68b4ccadb907 100644 --- a/databases/firebird2-server/scripts/post-install +++ b/databases/firebird2-server/scripts/post-install @@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PREFIX/firebird -print` do FileName=$i @@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so cd $PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index 227d8c4a3a44..486467c2efda 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -6,19 +6,20 @@ # PORTNAME= firebird -PORTVERSION= 0.9 -PORTREVISION= 4 +PORTVERSION= 1.0 CATEGORIES= databases MASTER_SITES= http://firebird.sourceforge.net/download/ \ + http://www.aims.com.au/chris/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird -DISTFILES= firebird-boot-kit.tar.gz \ +DISTFILES= bootkit-1.0.0.796.tar.gz \ + bootkit-freebsd-1.0.0.796.tar.gz \ interbase0.9-4-v5examples.tar.gz \ - interbase0.9-4src.tar.gz + Firebird-1.0.0.796.src.tar.gz MAINTAINER= chris@aims.com.au -WRKSRC= ${WRKDIR}/interbase +WRKSRC= ${WRKDIR}/firebird-1.0.0.796 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/firebird/lib MSG_FILE= ${PKGDIR}/pkg-message @@ -31,9 +32,12 @@ ONLY_FOR_ARCHS= i386 do-extract: @${MKDIR} ${WRKDIR} @( \ - cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz; \ - cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz; \ - ${CP} msgs/msg.gbak misc/msg.gbak \ + cd ${WRKDIR}; ${TAR} -zxf \ + ${DISTDIR}/Firebird-1.0.0.796.src.tar.gz; \ + cd firebird-1.0.0.796; \ + ${TAR} -zxf ${DISTDIR}/bootkit-1.0.0.796.tar.gz; \ + ${TAR} -zxf ${DISTDIR}/bootkit-freebsd-1.0.0.796.tar.gz; \ + ${CP} -f msgs/msg.gbak misc/msg.gbak \ ) post-patch: @@ -47,11 +51,17 @@ post-patch: do-configure: @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} buildBootDatabases; \ - ${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot; \ + NOPROMPT_SETUP=yes; export NOPROMPT_SETUP; \ + FIREBIRD_64_BIT_IO=yes; export FIREBIRD_64_BIT_IO; \ + ${CAT} builds_win32/original/build_no.ksh | ${TR} -d '\r' \ + > builds_win32/original/build_no.ksh.fix; \ + ${MV} -f builds_win32/original/build_no.ksh.fix \ + builds_win32/original/build_no.ksh; \ + ${SH} Configure.sh PROD FREEBSD; \ ) do-build: @@ -60,15 +70,21 @@ do-build: '[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh @( \ - cd ${WRKDIR}/interbase; \ - INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE; \ + ${LN} -sf ${WRKDIR}/refDatabases/jrd/isc.gdb \ + ${WRKDIR}/firebird-1.0.0.796/interbase/isc4.gdb; \ + ${LN} -sf ${WRKDIR}/refDatabases/msgs/msg.gdb \ + ${WRKDIR}/firebird-1.0.0.796/msg.gdb; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + INTERBASE=${WRKDIR}/firebird-1.0.0.796/interbase; export INTERBASE; \ REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH; \ ${SH} boot.freebsd; \ ) do-install: @( \ - cd ${WRKDIR}/interbase; \ + cd ${WRKDIR}/firebird-1.0.0.796; \ + ${RM} ${WRKDIR}/firebird-1.0.0.796/interbase/isc4_tmp.gdb; \ + ${CP} /dev/null interbase/interbase.log; \ ${CP} -Rp interbase ${PREFIX}/firebird; \ ${RM} ${PREFIX}/firebird/install; \ ${RM} ${PREFIX}/firebird/lib/libgds.so.1.0; \ diff --git a/databases/firebird20-server/distinfo b/databases/firebird20-server/distinfo index 67c42987376e..dfdff30e23a3 100644 --- a/databases/firebird20-server/distinfo +++ b/databases/firebird20-server/distinfo @@ -1,3 +1,4 @@ -MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64 +MD5 (bootkit-1.0.0.796.tar.gz) = edcabe09957ed10b12e2f44eac9ae155 +MD5 (bootkit-freebsd-1.0.0.796.tar.gz) = 95bd14ec76bcf2b4ed41e3253ed58847 MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a -MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652 +MD5 (Firebird-1.0.0.796.src.tar.gz) = 53bfebb4a269eb0f3c508587a843ddf8 diff --git a/databases/firebird20-server/files/RELNOTES b/databases/firebird20-server/files/RELNOTES index d2fd1d4fc88d..5434347e24d2 100644 --- a/databases/firebird20-server/files/RELNOTES +++ b/databases/firebird20-server/files/RELNOTES @@ -1,6 +1,6 @@ -Firebird 0.9_4 FreeBSD Release Notes 13-Jan-2001 ------------------------------------- -FB-T0.9.4.34 Firebird Test1 +Firebird 1.0.0 FreeBSD Release Notes 13-Mar-2002 +-------------------------------------- +FB-T6.2.796 Firebird Final Release Welcome to the FreeBSD Firebird port! Users should note that there was a package called `firebird-1.0.tgz' released in mid-August @@ -75,5 +75,5 @@ and InterBase can be found at the following: http://www.interbase2000.org/ http://www.firebirdsql.org/ -Geoff Speicher -<geoff@sea-incorporated.com> +Chris Knight +<chris@aims.com.au> diff --git a/databases/firebird20-server/files/patch-aa b/databases/firebird20-server/files/patch-aa index f2db9a68750d..e69de29bb2d1 100644 --- a/databases/firebird20-server/files/patch-aa +++ b/databases/firebird20-server/files/patch-aa @@ -1,11 +0,0 @@ ---- buildBootDatabases.orig Tue Oct 10 23:00:39 2000 -+++ buildBootDatabases Tue Oct 10 23:00:46 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - #-------------------------------------------------------------------- diff --git a/databases/firebird20-server/files/patch-ab b/databases/firebird20-server/files/patch-ab index f054a4b23007..e69de29bb2d1 100644 --- a/databases/firebird20-server/files/patch-ab +++ b/databases/firebird20-server/files/patch-ab @@ -1,11 +0,0 @@ ---- setup_dirs.boot.orig Tue Oct 10 23:00:07 2000 -+++ setup_dirs.boot Tue Oct 10 23:00:22 2000 -@@ -49,7 +49,7 @@ - DefaultAns=$2 - echo -n "${1}" - Answer="$DefaultAns" -- read Answer -+# read Answer - } - - diff --git a/databases/firebird20-server/files/patch-ac b/databases/firebird20-server/files/patch-ac index bf5de43b75fb..e69de29bb2d1 100644 --- a/databases/firebird20-server/files/patch-ac +++ b/databases/firebird20-server/files/patch-ac @@ -1,58 +0,0 @@ ---- builds/original/prefix.freebsd 2000/10/08 15:36:25 1.2 -+++ builds/original/prefix.freebsd 2001/01/11 19:17:58 -@@ -28,7 +28,7 @@ - - - PROD_DEBUG_OBJECTS= nodebug.o --PROD_SHRLIB_DIR= -+PROD_SHRLIB_DIR= -Lsource/jrd - PROD_VERSION_FLAG= -DPROD_BUILD - PROD_CFLAGS= -O -m486 -fpic -DFLINTSTONE - -@@ -48,7 +48,7 @@ - UDF_LINK_CMD= gcc - UDF_CFLAGS= -fPIC -mieee-fp - UDF_LFLAGS= -shared --UDF_SHRLIBS= -L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt -+UDF_SHRLIBS= $(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt - - #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules - # to workaround the Solaris threading problems with signals -@@ -69,16 +69,14 @@ - FUNCTIONS= functions.bin - FUNCSHR= source/interbase/lib/gdsf.so - GDS_LINK= $(GDSSHR_LINK) --#GDS_PYXIS= - GDS_PYXIS= gds_pyxis.a - GDSLIB_BACKEND= source/interbase/lib/gds_b.a - GDSLIB_LINK= -Lsource/jrd -lgds_b -lc -ldescrypt - - GDSSHR= source/interbase/lib/gds.so - LINUX_GDSSHR= $(GDSSHR) --GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt --PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis --#PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -+GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt -+PIPE_GDSSHR_LINK= $(SHRLIB_DIR) -lgds -lgds_pyxis - HLPDIR= source/qli/ - HOSTNAME= `hostname | cut -d'.' -f1` - INCLUDES= include_so include_so_ada -@@ -106,11 +104,6 @@ - MUISQL_LINK_OPTS= $(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm - PIC_FLAGS= $(CFLAGS) -fPIC - PIPE= gds.a gds_pipe --#PYXIS= --#PYXIS_MISC_OBJS= --#PYXIS_P_MISC_OBJS= --#PYXIS_OBJECTS= --#PYXIS_MISC_OBJECTS= - PYXIS= pyxis - PYXIS_MISC_OBJS= $(PYXIS_MISC) - PYXIS_P_MISC_OBJS= $(PYXIS_P_MISC) -@@ -167,5 +160,8 @@ - SHRLIB_EXT= .so - - V3PRINTER= source/lock/printv3.o -+ -+# Forces library build for FreeBSD -+PYXIS_LIBRARY= libpyxis.a diff --git a/databases/firebird20-server/files/patch-ad b/databases/firebird20-server/files/patch-ad index 7ce937566bc3..4bcb2c1ce13c 100644 --- a/databases/firebird20-server/files/patch-ad +++ b/databases/firebird20-server/files/patch-ad @@ -1,13 +1,12 @@ ---- jrd/enc.c.orig Fri Aug 4 06:50:03 2000 -+++ jrd/enc.c Sun Nov 18 19:17:19 2001 -@@ -31,6 +31,10 @@ - * - **************************************/ - -+#ifdef FREEBSD -+crypt_set_format("des"); -+#endif -+ - return CRYPT_FUNC( string, salt); +--- setup_dirs.orig Tue Aug 7 05:00:12 2001 ++++ setup_dirs Fri Dec 28 16:12:49 2001 +@@ -60,7 +60,8 @@ + DefaultAns=$2 + echo -n "${1}" + Answer="$DefaultAns" +- read Answer ++# read Answer ++ echo "" } - #endif + + diff --git a/databases/firebird20-server/pkg-descr b/databases/firebird20-server/pkg-descr index b080060395eb..c0ac8b0093af 100644 --- a/databases/firebird20-server/pkg-descr +++ b/databases/firebird20-server/pkg-descr @@ -10,14 +10,13 @@ Note that as of Firebird 0.9_4, the locksmith back door has been closed. For more information on Firebird and InterBase, see: + +http://sourceforge.net/projects/firebird/ http://www.ibphoenix.com/ http://www.interbase2000.org/ http://www.interbase.com/ http://www.firebirdsql.org/ -and of course the firebird page itself: -WWW: http://sourceforge.net/projects/firebird/ - For more information on the locksmith back door, see: https://www.kb.cert.org/vuls/id/247371 diff --git a/databases/firebird20-server/pkg-install b/databases/firebird20-server/pkg-install index c6b00320cd7e..af43f63a3943 100644 --- a/databases/firebird20-server/pkg-install +++ b/databases/firebird20-server/pkg-install @@ -29,7 +29,7 @@ if 0; if( \$> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( \$null, \$null, \$fbUID ) = getpwnam( "firebird" ); @@ -78,7 +78,7 @@ chmod -R o=r $PKG_PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PKG_PREFIX/firebird -print` do FileName=$i @@ -99,7 +99,7 @@ ln -sf ib_util.so libib_util.so cd $PKG_PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -113,7 +113,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PKG_PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName diff --git a/databases/firebird20-server/scripts/createuser b/databases/firebird20-server/scripts/createuser index b61d47fd84bd..eba7ce1b887d 100644 --- a/databases/firebird20-server/scripts/createuser +++ b/databases/firebird20-server/scripts/createuser @@ -8,7 +8,7 @@ if 0; if( $> ) { print "\nYou must be root to run this step!\n\n"; exit 1; -} +} if( getpwnam( "firebird" ) ) { ( $null, $null, $fbUID ) = getpwnam( "firebird" ); diff --git a/databases/firebird20-server/scripts/post-install b/databases/firebird20-server/scripts/post-install index c2515fde278c..68b4ccadb907 100644 --- a/databases/firebird20-server/scripts/post-install +++ b/databases/firebird20-server/scripts/post-install @@ -7,7 +7,7 @@ chmod -R o=r $PREFIX/firebird # Now fix up the mess. -# fix up directories +# fix up directories for i in `find $PREFIX/firebird -print` do FileName=$i @@ -28,7 +28,7 @@ ln -sf ib_util.so libib_util.so cd $PREFIX/firebird/bin # all users can run everything. -chmod o=rx * +chmod o=rx * # SUID is needed for running server programs. @@ -42,7 +42,7 @@ for i in gds_lock_mgr gds_drop gds_inet_server cd $PREFIX/firebird -for i in isc_init1 isc_lock1 isc_event1 +for i in isc_init1 isc_lock1 isc_event1 do FileName=$i.`hostname` touch $FileName |