- Do not change PREFIX and install port in PREFIX/firebird

PR:		ports/80414
Submitted by:	maintainer

3 files changed, 131 insertions, 121 deletions

diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index dab62bc1ef69..f6ca445b5836 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -22,19 +22,13 @@ USE_GMAKE=		yes
 WANT_LIBTOOL_VER=	15
 WANT_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	autogen.sh
-CONFIGURE_ARGS=		--with-lock-manager --with-editline
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GCC=		3.4
 
-PREFIX?=	${LOCALBASE}/${PORTNAME}
-NO_MTREE=	yes
-
 CONFLICTS=	firebird-1.*
 
 WRKSRC=		${WRKDIR}/firebird2
 INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib
+LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -49,7 +43,8 @@ BROKEN=	"Does not build on FreeBSD-4.x"
 pre-everything::
 	@${ECHO_MSG} "NOTE: If the work directory is on an NFS mount, you will"
 	@${ECHO_MSG} "require NFS client locking support for the build to"
-	@${ECHO_MSG} "succeed."
+	@${ECHO_MSG} "succeed. Currently this is only available on FreeBSD 5.0"
+	@${ECHO_MSG} "or greater."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
 	@${ECHO_MSG} "changed since version 1.0.x."
@@ -59,6 +54,17 @@ pre-everything::
 	@sleep 10
 .endif
 
+do-configure:
+	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE}	\
+	${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird	\
+	--with-lock-manager --with-editline)
+
+do-build:
+	@(								\
+	cd ${WRKSRC};							\
+	${ENV} CC=${CC} CXX=${CXX} ${GMAKE} all;			\
+	)
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/databases/firebird-devel/pkg-install b/databases/firebird-devel/pkg-install
index 46b2eec34708..849d2645d0b8 100644
--- a/databases/firebird-devel/pkg-install
+++ b/databases/firebird-devel/pkg-install
@@ -41,7 +41,7 @@ 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 -c "Firebird Database Administrator"
+		-d $PKG_PREFIX/firebird -c "Firebird Database Administrator"
 	fi
 else
 	echo -n "unable to create user firebird - please create it manually,"
@@ -51,13 +51,13 @@ fi
 ;;
 
 POST-INSTALL)
-chown -R firebird:firebird $PKG_PREFIX
-chmod -R o= $PKG_PREFIX
+chown -R firebird:firebird $PKG_PREFIX/firebird
+chmod -R o= $PKG_PREFIX/firebird
 
 # Now fix up the mess.
 
 # fix up directories
-for i in `find $PKG_PREFIX -print`
+for i in `find $PKG_PREFIX/firebird -print`
 do
 	FileName=$i
 	if [ -d $FileName ]; then
@@ -66,28 +66,28 @@ do
 done
 
 # make lib ldconfig-compatible
-chown -R root:wheel $PKG_PREFIX/lib
+chown -R root:wheel $PKG_PREFIX/firebird/lib
 
 # make the following read-only
-chmod -R a=r $PKG_PREFIX/WhatsNew
-for i in `find $PKG_PREFIX/doc -type f -print`
+chmod -R a=r $PKG_PREFIX/firebird/WhatsNew
+for i in `find $PKG_PREFIX/firebird/doc -type f -print`
 do
 	chmod a=r $i
 done
-#chmod -R a=r $PKG_PREFIX/examples/*
-chmod -R a=r $PKG_PREFIX/include/*
-chmod -R a=r $PKG_PREFIX/intl/*
-#chmod -R a=r $PKG_PREFIX/misc/*
+#chmod -R a=r $PKG_PREFIX/firebird/examples/*
+chmod -R a=r $PKG_PREFIX/firebird/include/*
+chmod -R a=r $PKG_PREFIX/firebird/intl/*
+#chmod -R a=r $PKG_PREFIX/firebird/misc/*
 
-chmod -R ug=rx,o= $PKG_PREFIX/UDF/*
-chmod -R ug=rx,o= $PKG_PREFIX/intl/fbintl
-chmod -R a=rx $PKG_PREFIX/lib/*
+chmod -R ug=rx,o= $PKG_PREFIX/firebird/UDF/*
+chmod -R ug=rx,o= $PKG_PREFIX/firebird/intl/fbintl
+chmod -R a=rx $PKG_PREFIX/firebird/lib/*
 
-#cd $PKG_PREFIX/lib
+#cd $PKG_PREFIX/firebird/lib
 #ln -sf libfbembed.so libgds.so
 #ln -sf libfbembed.so.2 libgds.so.2
 
-cd $PKG_PREFIX/bin
+cd $PKG_PREFIX/firebird/bin
 for i in `ls`
 do
 	chmod ug=rx,o= $i
@@ -105,7 +105,7 @@ do
 done
 
 
-cd $PKG_PREFIX
+cd $PKG_PREFIX/firebird
 
 # Lock files
 
@@ -136,7 +136,7 @@ chmod 660 security2.fdb
 # shared lib startup script
 if [ -d $PKG_PREFIX/etc/rc.d ]; then
 	(
-	echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/lib ] && /sbin/ldconfig -m $PKG_PREFIX/lib"
+	echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/firebird/lib ] && /sbin/ldconfig -m $PKG_PREFIX/firebird/lib"
 	) > $PKG_PREFIX/etc/rc.d/000.firebird.sh
   chmod a=rx $PKG_PREFIX/etc/rc.d/000.firebird.sh
 fi
diff --git a/databases/firebird-devel/pkg-plist b/databases/firebird-devel/pkg-plist
index 42e6bce7094c..ba380b170a15 100644
--- a/databases/firebird-devel/pkg-plist
+++ b/databases/firebird-devel/pkg-plist
@@ -1,97 +1,101 @@
 @comment $FreeBSD$
 @unexec rm -f %%LOCALBASE%%/etc/rc.d/000.firebird.sh
-README
-UDF/fbudf.so
-UDF/fbudf.sql
-UDF/ib_udf.so
-UDF/ib_udf.sql
-WhatsNew
-aliases.conf
-aliases.conf.sample
-bin/fb_inet_server
-bin/fb_lock_mgr
-bin/fb_lock_print
-bin/gbak
-bin/gdef
-bin/gds_drop
-bin/gfix
-bin/gpre
-bin/gsec
-bin/gsplit
-bin/gstat
-bin/isql
-bin/qli
-doc/README.NTSecurity
-doc/README.Optimizer.txt
-doc/README.Win32LibraryInstallation.txt
-doc/README.build.mingw.html
-doc/README.build.msvc.html
-doc/README.coding.style
-doc/README.instsvc
-doc/README.isql_enhancements.txt
-doc/README.makefiles
-doc/README.performance_monitoring
-doc/README.sha1
-doc/README.user
-doc/README.user.embedded
-doc/README.user.troubleshooting
-doc/README.xnet
-doc/sql.extensions/README.PSQL_stack_trace.txt
-doc/sql.extensions/README.aggregate_tracking
-doc/sql.extensions/README.case
-doc/sql.extensions/README.coalesce
-doc/sql.extensions/README.context_variables
-doc/sql.extensions/README.context_variables2
-doc/sql.extensions/README.cursors
-doc/sql.extensions/README.data_type_results_of_aggregations.txt
-doc/sql.extensions/README.data_types
-doc/sql.extensions/README.ddl.txt
-doc/sql.extensions/README.default_parameters
-doc/sql.extensions/README.derived_tables.txt
-doc/sql.extensions/README.distinct
-doc/sql.extensions/README.exception_handling
-doc/sql.extensions/README.execute_block
-doc/sql.extensions/README.execute_statement
-doc/sql.extensions/README.explicit_locks
-doc/sql.extensions/README.expression_indices
-doc/sql.extensions/README.iif
-doc/sql.extensions/README.keywords
-doc/sql.extensions/README.leave_labels
-doc/sql.extensions/README.null_value
-doc/sql.extensions/README.nullif
-doc/sql.extensions/README.order_by_expressions_nulls
-doc/sql.extensions/README.plan
-doc/sql.extensions/README.rows
-doc/sql.extensions/README.savepoints
-doc/sql.extensions/README.select_expressions
-doc/sql.extensions/README.sequence_generators
-doc/sql.extensions/README.universal_triggers
-doc/sql.extensions/README.view_updates
-firebird.conf
-firebird.conf.sample
-@unexec rm -f %D/firebird.log
-firebird.msg
-help/help.fdb
-include/blr.h
-include/ib_util.h
-include/ibase.h
-include/iberror.h
-include/perf.h
-intl/fbintl
-@unexec rm -f %D/isc_event1.`hostname`
-@unexec rm -f %D/isc_init1.`hostname`
-@unexec rm -f %D/isc_lock1.`hostname`
-lib/libfbclient.so
-lib/libfbclient.so.2
-lib/libfbclient.so.2.0.0
-lib/libfbembed.so
-lib/libfbembed.so.2
-lib/libfbembed.so.2.0.0
-lib/libib_util.so
-security2.fdb.sample
-security2.fdb
-@dirrm UDF
-@dirrm doc/sql.extensions
-@dirrm doc
-@dirrm help
-@dirrm intl
+firebird/README
+firebird/UDF/fbudf.so
+firebird/UDF/fbudf.sql
+firebird/UDF/ib_udf.so
+firebird/UDF/ib_udf.sql
+firebird/WhatsNew
+firebird/aliases.conf
+firebird/aliases.conf.sample
+firebird/bin/fb_inet_server
+firebird/bin/fb_lock_mgr
+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/gsplit
+firebird/bin/gstat
+firebird/bin/isql
+firebird/bin/qli
+firebird/doc/README.NTSecurity
+firebird/doc/README.Optimizer.txt
+firebird/doc/README.Win32LibraryInstallation.txt
+firebird/doc/README.build.mingw.html
+firebird/doc/README.build.msvc.html
+firebird/doc/README.coding.style
+firebird/doc/README.instsvc
+firebird/doc/README.isql_enhancements.txt
+firebird/doc/README.makefiles
+firebird/doc/README.performance_monitoring
+firebird/doc/README.sha1
+firebird/doc/README.user
+firebird/doc/README.user.embedded
+firebird/doc/README.user.troubleshooting
+firebird/doc/README.xnet
+firebird/doc/sql.extensions/README.PSQL_stack_trace.txt
+firebird/doc/sql.extensions/README.aggregate_tracking
+firebird/doc/sql.extensions/README.case
+firebird/doc/sql.extensions/README.coalesce
+firebird/doc/sql.extensions/README.context_variables
+firebird/doc/sql.extensions/README.context_variables2
+firebird/doc/sql.extensions/README.cursors
+firebird/doc/sql.extensions/README.data_type_results_of_aggregations.txt
+firebird/doc/sql.extensions/README.data_types
+firebird/doc/sql.extensions/README.ddl.txt
+firebird/doc/sql.extensions/README.default_parameters
+firebird/doc/sql.extensions/README.derived_tables.txt
+firebird/doc/sql.extensions/README.distinct
+firebird/doc/sql.extensions/README.exception_handling
+firebird/doc/sql.extensions/README.execute_block
+firebird/doc/sql.extensions/README.execute_statement
+firebird/doc/sql.extensions/README.explicit_locks
+firebird/doc/sql.extensions/README.expression_indices
+firebird/doc/sql.extensions/README.iif
+firebird/doc/sql.extensions/README.keywords
+firebird/doc/sql.extensions/README.leave_labels
+firebird/doc/sql.extensions/README.null_value
+firebird/doc/sql.extensions/README.nullif
+firebird/doc/sql.extensions/README.order_by_expressions_nulls
+firebird/doc/sql.extensions/README.plan
+firebird/doc/sql.extensions/README.rows
+firebird/doc/sql.extensions/README.savepoints
+firebird/doc/sql.extensions/README.select_expressions
+firebird/doc/sql.extensions/README.sequence_generators
+firebird/doc/sql.extensions/README.universal_triggers
+firebird/doc/sql.extensions/README.view_updates
+firebird/firebird.conf
+firebird/firebird.conf.sample
+@unexec rm -f %D/firebird/firebird.log
+firebird/firebird.msg
+firebird/help/help.fdb
+firebird/include/blr.h
+firebird/include/ib_util.h
+firebird/include/ibase.h
+firebird/include/iberror.h
+firebird/include/perf.h
+firebird/intl/fbintl
+@unexec rm -f %D/firebird/isc_event1.`hostname`
+@unexec rm -f %D/firebird/isc_init1.`hostname`
+@unexec rm -f %D/firebird/isc_lock1.`hostname`
+firebird/lib/libfbclient.so
+firebird/lib/libfbclient.so.2
+firebird/lib/libfbclient.so.2.0.0
+firebird/lib/libfbembed.so
+firebird/lib/libfbembed.so.2
+firebird/lib/libfbembed.so.2.0.0
+firebird/lib/libib_util.so
+firebird/security2.fdb.sample
+firebird/security2.fdb
+@dirrm firebird/UDF
+@dirrm firebird/bin
+@dirrm firebird/doc/sql.extensions
+@dirrm firebird/doc
+@dirrm firebird/help
+@dirrm firebird/include
+@dirrm firebird/intl
+@dirrm firebird/lib
+@unexec rmdir %D/firebird 2>/dev/null || true