diff options
-rw-r--r-- | databases/firebird-client/Makefile | 1 | ||||
-rw-r--r-- | databases/firebird-server/Makefile | 27 | ||||
-rw-r--r-- | databases/firebird-server/pkg-plist | 16 | ||||
-rw-r--r-- | databases/firebird2-server/Makefile | 27 | ||||
-rw-r--r-- | databases/firebird2-server/pkg-plist | 16 | ||||
-rw-r--r-- | databases/firebird20-server/Makefile | 27 | ||||
-rw-r--r-- | databases/firebird20-server/pkg-plist | 16 |
7 files changed, 67 insertions, 63 deletions
diff --git a/databases/firebird-client/Makefile b/databases/firebird-client/Makefile index 8e3dbe7..f8a8431 100644 --- a/databases/firebird-client/Makefile +++ b/databases/firebird-client/Makefile @@ -7,6 +7,7 @@ PORTNAME= firebird PKGNAMESUFFIX= -client +PORTREVISION= 3 COMMENT= The open-source InterBase(tm) 6.0 spin-off (client) diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile index 2d05ed2..52683c1 100644 --- a/databases/firebird-server/Makefile +++ b/databases/firebird-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 1.5.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -24,15 +24,15 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 USE_AUTOCONF_VER= 259 -USE_GCC= 3.4 +USE_GCC= 3.4+ LOCALSTATEDIR= /var/db/firebird CONFDIR= ${PREFIX}/etc/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ - LOCALSTATEDIR=${LOCALSTATEDIR} CONFDIR="etc/firebird" + LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird" # Don't use ld for linking, use gcc -LD= gcc +LD= ${CC} # Don't strip binary files STRIP= @@ -41,6 +41,8 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/${DISTNAME} +INSTALL_FB= ${INSTALL} ${COPY} -g firebird + .if !defined(CLIENT_ONLY) # Server part stuff LIB_DEPENDS+= fbembed.1:${PORTSDIR}/databases/firebird-client @@ -142,23 +144,22 @@ do-install: ${MKDIR} ${LOCALSTATEDIR}/UDF ${LOCALSTATEDIR}/help ${LOCALSTATEDIR}/intl - ${INSTALL_DATA} -m 0440 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} \ - ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF + ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + + ${INSTALL_FB} -m 0550 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LOCALSTATEDIR}/UDF + ${INSTALL_FB} -m 0440 ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF .if !exists(${LOCALSTATEDIR}/security.fdb) - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb .endif - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb.sample - ${INSTALL_DATA} -m 0440 -g firebird ${WRKSRC}/gen/firebird/help/help.fdb \ + ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \ ${LOCALSTATEDIR}/help - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl - - # runtime files - lock, firebird.log, security.fdb - ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + ${INSTALL_FB} -m 0550 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl ${INSTALL_DATA} ${FILESDIR}/RELNOTES ${LOCALSTATEDIR} .else diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist index 2035694..0a94428 100644 --- a/databases/firebird-server/pkg-plist +++ b/databases/firebird-server/pkg-plist @@ -8,14 +8,14 @@ bin/gstat sbin/fb_inet_server sbin/fb_lock_mgr sbin/gds_drop +@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true %%CONFDIR%%/aliases.conf.sample @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf -@unexec if cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample; then rm -f %D/%%CONFDIR%%/aliases.conf; fi @unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true @cwd / +@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true %%LOCALSTATEDIR%%/security.fdb.sample -@exec [ -f %%LOCALSTATEDIR%%/security.fdb ] || cp %%LOCALSTATEDIR%%/security.fdb.sample %%LOCALSTATEDIR%%/security.fdb -@unexec if cmp -s %%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/security.fdb.sample; then rm -f %%LOCALSTATEDIR%%/security.fdb; fi +@exec [ -f %D/%%LOCALSTATEDIR%%/security.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/RELNOTES %%LOCALSTATEDIR%%/UDF/fbudf.so %%LOCALSTATEDIR%%/UDF/fbudf.sql @@ -23,11 +23,11 @@ sbin/gds_drop %%LOCALSTATEDIR%%/UDF/ib_udf.sql %%LOCALSTATEDIR%%/help/help.fdb %%LOCALSTATEDIR%%/intl/fbintl -@unexec [ -s %%LOCALSTATEDIR%%/firebird.log ] || rm -f %%LOCALSTATEDIR%%/firebird.log -@unexec rm -f %%LOCALSTATEDIR%%/isc_event1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_init1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_lock1.`hostname` +@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname` @dirrm %%LOCALSTATEDIR%%/UDF @dirrm %%LOCALSTATEDIR%%/help @dirrm %%LOCALSTATEDIR%%/intl -@unexec rmdir %%LOCALSTATEDIR%% 2>/dev/null || true +@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile index 2d05ed2..52683c1 100644 --- a/databases/firebird2-server/Makefile +++ b/databases/firebird2-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 1.5.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -24,15 +24,15 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 USE_AUTOCONF_VER= 259 -USE_GCC= 3.4 +USE_GCC= 3.4+ LOCALSTATEDIR= /var/db/firebird CONFDIR= ${PREFIX}/etc/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ - LOCALSTATEDIR=${LOCALSTATEDIR} CONFDIR="etc/firebird" + LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird" # Don't use ld for linking, use gcc -LD= gcc +LD= ${CC} # Don't strip binary files STRIP= @@ -41,6 +41,8 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/${DISTNAME} +INSTALL_FB= ${INSTALL} ${COPY} -g firebird + .if !defined(CLIENT_ONLY) # Server part stuff LIB_DEPENDS+= fbembed.1:${PORTSDIR}/databases/firebird-client @@ -142,23 +144,22 @@ do-install: ${MKDIR} ${LOCALSTATEDIR}/UDF ${LOCALSTATEDIR}/help ${LOCALSTATEDIR}/intl - ${INSTALL_DATA} -m 0440 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} \ - ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF + ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + + ${INSTALL_FB} -m 0550 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LOCALSTATEDIR}/UDF + ${INSTALL_FB} -m 0440 ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF .if !exists(${LOCALSTATEDIR}/security.fdb) - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb .endif - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb.sample - ${INSTALL_DATA} -m 0440 -g firebird ${WRKSRC}/gen/firebird/help/help.fdb \ + ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \ ${LOCALSTATEDIR}/help - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl - - # runtime files - lock, firebird.log, security.fdb - ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + ${INSTALL_FB} -m 0550 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl ${INSTALL_DATA} ${FILESDIR}/RELNOTES ${LOCALSTATEDIR} .else diff --git a/databases/firebird2-server/pkg-plist b/databases/firebird2-server/pkg-plist index 2035694..0a94428 100644 --- a/databases/firebird2-server/pkg-plist +++ b/databases/firebird2-server/pkg-plist @@ -8,14 +8,14 @@ bin/gstat sbin/fb_inet_server sbin/fb_lock_mgr sbin/gds_drop +@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true %%CONFDIR%%/aliases.conf.sample @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf -@unexec if cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample; then rm -f %D/%%CONFDIR%%/aliases.conf; fi @unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true @cwd / +@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true %%LOCALSTATEDIR%%/security.fdb.sample -@exec [ -f %%LOCALSTATEDIR%%/security.fdb ] || cp %%LOCALSTATEDIR%%/security.fdb.sample %%LOCALSTATEDIR%%/security.fdb -@unexec if cmp -s %%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/security.fdb.sample; then rm -f %%LOCALSTATEDIR%%/security.fdb; fi +@exec [ -f %D/%%LOCALSTATEDIR%%/security.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/RELNOTES %%LOCALSTATEDIR%%/UDF/fbudf.so %%LOCALSTATEDIR%%/UDF/fbudf.sql @@ -23,11 +23,11 @@ sbin/gds_drop %%LOCALSTATEDIR%%/UDF/ib_udf.sql %%LOCALSTATEDIR%%/help/help.fdb %%LOCALSTATEDIR%%/intl/fbintl -@unexec [ -s %%LOCALSTATEDIR%%/firebird.log ] || rm -f %%LOCALSTATEDIR%%/firebird.log -@unexec rm -f %%LOCALSTATEDIR%%/isc_event1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_init1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_lock1.`hostname` +@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname` @dirrm %%LOCALSTATEDIR%%/UDF @dirrm %%LOCALSTATEDIR%%/help @dirrm %%LOCALSTATEDIR%%/intl -@unexec rmdir %%LOCALSTATEDIR%% 2>/dev/null || true +@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index 2d05ed2..52683c1 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= firebird PORTVERSION= 1.5.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=firebird @@ -24,15 +24,15 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 USE_AUTOCONF_VER= 259 -USE_GCC= 3.4 +USE_GCC= 3.4+ LOCALSTATEDIR= /var/db/firebird CONFDIR= ${PREFIX}/etc/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ - LOCALSTATEDIR=${LOCALSTATEDIR} CONFDIR="etc/firebird" + LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird" # Don't use ld for linking, use gcc -LD= gcc +LD= ${CC} # Don't strip binary files STRIP= @@ -41,6 +41,8 @@ ONLY_FOR_ARCHS= i386 WRKSRC= ${WRKDIR}/${DISTNAME} +INSTALL_FB= ${INSTALL} ${COPY} -g firebird + .if !defined(CLIENT_ONLY) # Server part stuff LIB_DEPENDS+= fbembed.1:${PORTSDIR}/databases/firebird-client @@ -142,23 +144,22 @@ do-install: ${MKDIR} ${LOCALSTATEDIR}/UDF ${LOCALSTATEDIR}/help ${LOCALSTATEDIR}/intl - ${INSTALL_DATA} -m 0440 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} \ - ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF + ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + + ${INSTALL_FB} -m 0550 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LOCALSTATEDIR}/UDF + ${INSTALL_FB} -m 0440 ${UDF_SQL:S!^!${WRKSRC}/!} ${LOCALSTATEDIR}/UDF .if !exists(${LOCALSTATEDIR}/security.fdb) - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb .endif - ${INSTALL_DATA} -m 0660 -o firebird -g firebird ${WRKSRC}/gen/firebird/security.fdb \ + ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security.fdb \ ${LOCALSTATEDIR}/security.fdb.sample - ${INSTALL_DATA} -m 0440 -g firebird ${WRKSRC}/gen/firebird/help/help.fdb \ + ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb \ ${LOCALSTATEDIR}/help - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl - - # runtime files - lock, firebird.log, security.fdb - ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + ${INSTALL_FB} -m 0550 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LOCALSTATEDIR}/intl/fbintl ${INSTALL_DATA} ${FILESDIR}/RELNOTES ${LOCALSTATEDIR} .else diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist index 2035694..0a94428 100644 --- a/databases/firebird20-server/pkg-plist +++ b/databases/firebird20-server/pkg-plist @@ -8,14 +8,14 @@ bin/gstat sbin/fb_inet_server sbin/fb_lock_mgr sbin/gds_drop +@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true %%CONFDIR%%/aliases.conf.sample @exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf -@unexec if cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample; then rm -f %D/%%CONFDIR%%/aliases.conf; fi @unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true @cwd / +@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true %%LOCALSTATEDIR%%/security.fdb.sample -@exec [ -f %%LOCALSTATEDIR%%/security.fdb ] || cp %%LOCALSTATEDIR%%/security.fdb.sample %%LOCALSTATEDIR%%/security.fdb -@unexec if cmp -s %%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/security.fdb.sample; then rm -f %%LOCALSTATEDIR%%/security.fdb; fi +@exec [ -f %D/%%LOCALSTATEDIR%%/security.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security.fdb %%LOCALSTATEDIR%%/RELNOTES %%LOCALSTATEDIR%%/UDF/fbudf.so %%LOCALSTATEDIR%%/UDF/fbudf.sql @@ -23,11 +23,11 @@ sbin/gds_drop %%LOCALSTATEDIR%%/UDF/ib_udf.sql %%LOCALSTATEDIR%%/help/help.fdb %%LOCALSTATEDIR%%/intl/fbintl -@unexec [ -s %%LOCALSTATEDIR%%/firebird.log ] || rm -f %%LOCALSTATEDIR%%/firebird.log -@unexec rm -f %%LOCALSTATEDIR%%/isc_event1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_init1.`hostname` -@unexec rm -f %%LOCALSTATEDIR%%/isc_lock1.`hostname` +@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname` +@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname` @dirrm %%LOCALSTATEDIR%%/UDF @dirrm %%LOCALSTATEDIR%%/help @dirrm %%LOCALSTATEDIR%%/intl -@unexec rmdir %%LOCALSTATEDIR%% 2>/dev/null || true +@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true |