mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
Fix the previous commit. Note to myself: do not forget cvs rm -f
the empty files and cvs add the new ones.
This commit is contained in:
Maxim Konovalov
parent
d38496cddf
commit
8559dd85b6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=54701
43
www/oops/files/patch-configure
Normal file
43
www/oops/files/patch-configure
Normal file
@ -0,0 +1,43 @@
|
||||
--- configure.orig Fri Feb 1 15:40:28 2002
|
||||
+++ configure Mon Feb 4 13:02:11 2002
|
||||
@@ -3021,9 +3021,9 @@
|
||||
LIBDB_PATH="$pwd"
|
||||
elif test -r "/usr/local/lib/libdb.a"; then
|
||||
LIBDB_PATH="/usr/local"
|
||||
-elif test -r "/usr/lib/libdb2.a"; then
|
||||
- LIBDB_PATH="/usr"
|
||||
- LIBDB_NAME=-ldb2
|
||||
+elif test -r "/usr/local/lib/libdb4.a"; then
|
||||
+ LIBDB_PATH="/usr/local"
|
||||
+ LIBDB_NAME=-ldb4
|
||||
elif test -r "/usr/lib/libdb.a"; then
|
||||
LIBDB_PATH="/usr"
|
||||
elif test -r "/usr/local/lib/libdb2.a"; then
|
||||
@@ -3062,8 +3062,8 @@
|
||||
fi
|
||||
|
||||
if test "$LIBDB_PATH" = "/usr/local"; then
|
||||
- if test "$LIBDB_NAME" = "-ldb2"; then
|
||||
- LIBDB_INCL="-I/usr/local/include/db2"
|
||||
+ if test "$LIBDB_NAME" = "-ldb4"; then
|
||||
+ LIBDB_INCL="-I/usr/local/include/db4 -I/usr/local/include"
|
||||
else
|
||||
LIBDB_INCL="-I/usr/local/include"
|
||||
fi
|
||||
@@ -4227,13 +4227,13 @@
|
||||
esac
|
||||
|
||||
if test "X$MYSQL_PATH" != "X" ; then
|
||||
- LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
|
||||
+ LIBS="-L$MYSQL_PATH/lib/mysql -lmysqlclient $LIBS"
|
||||
cat >>confdefs.h <<\EOF
|
||||
#define HAVE_MYSQL 1
|
||||
EOF
|
||||
|
||||
- CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
|
||||
- MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
|
||||
+ CFLAGS="$CFLAGS -I$MYSQL_PATH/include/mysql"
|
||||
+ MYSQL_LIB="-L$MYSQL_PATH/lib/mysql -lmysqlclient"
|
||||
fi
|
||||
|
||||
if test "X$PGSQL_PATH" != "X" ; then
|
||||
16
www/oops/files/patch-configure.in
Normal file
16
www/oops/files/patch-configure.in
Normal file
@ -0,0 +1,16 @@
|
||||
--- configure.in.orig Tue Nov 13 15:08:03 2001
|
||||
+++ configure.in Tue Nov 13 15:08:49 2001
|
||||
@@ -523,10 +523,10 @@
|
||||
esac
|
||||
|
||||
if test "X$MYSQL_PATH" != "X" ; then
|
||||
- LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
|
||||
+ LIBS="-L$MYSQL_PATH/lib/mysql -lmysqlclient $LIBS"
|
||||
AC_DEFINE(HAVE_MYSQL)
|
||||
- CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
|
||||
- MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
|
||||
+ CFLAGS="$CFLAGS -I$MYSQL_PATH/include/mysql"
|
||||
+ MYSQL_LIB="-L$MYSQL_PATH/lib/mysql -lmysqlclient"
|
||||
fi
|
||||
|
||||
if test "X$PGSQL_PATH" != "X" ; then
|
||||
63
www/oops/files/patch-src::Makefile.in
Normal file
63
www/oops/files/patch-src::Makefile.in
Normal file
@ -0,0 +1,63 @@
|
||||
--- src/Makefile.in.orig Mon Mar 19 00:32:47 2001
|
||||
+++ src/Makefile.in Mon Mar 19 00:36:54 2001
|
||||
@@ -53,51 +53,15 @@
|
||||
|
||||
install: all mkinstalldirs
|
||||
$(INSTALL) oops ${OOPS_SBINDIR}
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
|
||||
- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/err_template.html ]; then\
|
||||
- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/auth_template.html ]; then\
|
||||
- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/passwd ]; then\
|
||||
- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/redir_rules ]; then\
|
||||
- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/redir_template.html ]; then\
|
||||
- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/accel_maps ]; then\
|
||||
- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/select.sql ]; then\
|
||||
- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql ;\
|
||||
- fi
|
||||
- if [ -f ${OOPS_SYSCONFDIR}/acl_local_networks ]; then\
|
||||
- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample ;\
|
||||
- else\
|
||||
- $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks ;\
|
||||
- fi
|
||||
+ $(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample
|
||||
+ $(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample
|
||||
+ $(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample
|
||||
+ $(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample
|
||||
+ $(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample
|
||||
+ $(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample
|
||||
+ $(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample
|
||||
+ $(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
|
||||
+ $(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
|
||||
if test "X@SOFLAGS@" != "X"; then \
|
||||
for m in modules/*so ; do \
|
||||
$(INSTALL) $$m ${OOPS_LIBDIR} ; \
|
||||
10
www/oops/files/patch-src::environment.h
Normal file
10
www/oops/files/patch-src::environment.h
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/environment.h.orig Wed Dec 13 17:33:19 2000
|
||||
+++ src/environment.h Wed Dec 13 17:33:40 2000
|
||||
@@ -55,7 +55,7 @@
|
||||
#include <thread.h>
|
||||
#endif
|
||||
#include <pthread.h>
|
||||
-#if !defined(HAVE_PTHREAD_RWLOCK_INIT)
|
||||
+#if !defined(HAVE_PTHREAD_RWLOCK_INIT) && !defined(FREEBSD)
|
||||
#include "rwlock.h"
|
||||
#endif
|
||||
75
www/oops/scripts/configure.oops
Normal file
75
www/oops/scripts/configure.oops
Normal file
@ -0,0 +1,75 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
|
||||
if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
tempfile=`mktemp -t checklist`
|
||||
if [ "${BATCH}" = "yes" ]; then
|
||||
set \"GigaBase\"
|
||||
else
|
||||
/usr/bin/dialog --title "OOPS configuration options" --clear \
|
||||
--checklist "\n\
|
||||
Please select desired options:\n\
|
||||
(please select ONLY ONE DB storages)" -1 -1 16 \
|
||||
GigaBase "GigaBase storage" OFF \
|
||||
DB4 "Berkeley DB v4 storage" OFF \
|
||||
MySQL "MySQL auth support" OFF \
|
||||
PgSQL "PostgreSQL auth support" OFF \
|
||||
PCRE "PCRE support" OFF \
|
||||
2> $tempfile
|
||||
|
||||
retval=$?
|
||||
|
||||
if [ -s $tempfile ]; then
|
||||
set `cat $tempfile`
|
||||
fi
|
||||
rm -f $tempfile
|
||||
|
||||
case $retval in
|
||||
0) if [ -z "$*" ]; then
|
||||
echo "Nothing selected"
|
||||
fi
|
||||
;;
|
||||
1) echo "Cancel pressed."
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
${MKDIR} ${WRKDIRPREFIX}${CURDIR}
|
||||
exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
|
||||
|
||||
echo "PREFIX= ${PREFIX}"
|
||||
|
||||
while [ "$1" ]; do
|
||||
case $1 in
|
||||
\"GigaBase\")
|
||||
echo "LIB_DEPENDS+= gigabase_r.2:\${PORTSDIR}/databases/gigabase"
|
||||
echo "CONFIGURE_ARGS+= --without-DB"
|
||||
;;
|
||||
\"DB4\")
|
||||
echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
|
||||
echo "CONFIGURE_ARGS+= --without-GB"
|
||||
;;
|
||||
\"MySQL\")
|
||||
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
|
||||
echo "CONFIGURE_ARGS+= --with-MYSQL=\${PREFIX}"
|
||||
;;
|
||||
\"PgSQL\")
|
||||
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7"
|
||||
echo "CONFIGURE_ARGS+= --with-PGSQL=\${PREFIX}/pgsql"
|
||||
;;
|
||||
\"PCRE\")
|
||||
echo "LIB_DEPENDS+= pcre.0:\${PORTSDIR}/devel/pcre"
|
||||
echo "CONFIGURE_ARGS+= --with-regexp=pcre"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid option(s): $*" > /dev/stderr
|
||||
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
Loading…
Reference in New Issue
Block a user