Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 May 2000 20:42:31 -0400 (EDT)
From:      jim@thehousleys.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/18730: New Port: www/mod_auth_mysql - part of Scot Hetzel Apache all-in-one
Message-ID:  <200005220042.UAA91085@baby.int.thehousleys.net>

next in thread | raw e-mail | index | archive | help

>Number:         18730
>Category:       ports
>Synopsis:       New Port: www/mod_auth_mysql - part of Scot Hetzel Apache all-in-one
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 21 17:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     James Housley
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
The Housleys dot Net
>Environment:

	

>Description:

	Part of Scot Hetzel's Apache all-in-one port.  This was actually
	done by Scot base on some minimal work I had done to bring in
	the mod_auth_mysql module into FreeBSD.  Thanks again Scot.

>How-To-Repeat:

	

>Fix:


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	mod_auth_mysql
#	mod_auth_mysql/files
#	mod_auth_mysql/files/md5
#	mod_auth_mysql/pkg
#	mod_auth_mysql/pkg/PLIST
#	mod_auth_mysql/pkg/COMMENT
#	mod_auth_mysql/pkg/DESCR
#	mod_auth_mysql/Makefile
#	mod_auth_mysql/patches
#	mod_auth_mysql/patches/patch-aa
#	mod_auth_mysql/patches/patch-ab
#	mod_auth_mysql/patches/patch-ac
#
echo c - mod_auth_mysql
mkdir -p mod_auth_mysql > /dev/null 2>&1
echo c - mod_auth_mysql/files
mkdir -p mod_auth_mysql/files > /dev/null 2>&1
echo x - mod_auth_mysql/files/md5
sed 's/^X//' >mod_auth_mysql/files/md5 << 'END-of-mod_auth_mysql/files/md5'
XMD5 (mod_auth_mysql-2.20.tar.gz) = 3e88c23aabf2089fc753b2631a938f53
END-of-mod_auth_mysql/files/md5
echo c - mod_auth_mysql/pkg
mkdir -p mod_auth_mysql/pkg > /dev/null 2>&1
echo x - mod_auth_mysql/pkg/PLIST
sed 's/^X//' >mod_auth_mysql/pkg/PLIST << 'END-of-mod_auth_mysql/pkg/PLIST'
Xlibexec/apache/libauth_mysql.so
X@exec %D/sbin/apxs -e -a -n auth_mysql %f
X@unexec %D/sbin/apxs -e -A -n auth_mysql %f
Xshare/doc/%%AUTH_MYSQL_DOCS%%/README
Xshare/doc/%%AUTH_MYSQL_DOCS%%/USAGE
X@exec (cd %D/share/doc && ln -sf %%AUTH_MYSQL_DOCS%% mod_auth_mysql)
X@unexec rm -rf %D/share/doc/mod_auth_mysql
X@dirrm share/doc/%%AUTH_MYSQL_DOCS%%
END-of-mod_auth_mysql/pkg/PLIST
echo x - mod_auth_mysql/pkg/COMMENT
sed 's/^X//' >mod_auth_mysql/pkg/COMMENT << 'END-of-mod_auth_mysql/pkg/COMMENT'
XAllows users to use MySQL databases for user authentication
END-of-mod_auth_mysql/pkg/COMMENT
echo x - mod_auth_mysql/pkg/DESCR
sed 's/^X//' >mod_auth_mysql/pkg/DESCR << 'END-of-mod_auth_mysql/pkg/DESCR'
XThis add-on module allows the apache web server to use a MySQL database for user and/or group authentication.  For large user lists this can offer a significate speed up over apache's standard flat file format.
X
XWWW: http://bourbon.netvision.net.il/mod_auth_mysql/
X
X- Jim
Xjim@thehousleys.net
END-of-mod_auth_mysql/pkg/DESCR
echo x - mod_auth_mysql/Makefile
sed 's/^X//' >mod_auth_mysql/Makefile << 'END-of-mod_auth_mysql/Makefile'
X# New ports collection makefile for:    apache mod_auth_mysql
X# Date created:		2000/05/19
X# Whom:			jim@thehouselys.net
X#
X# $FreeBSD$
X
XPORTNAME=	mod_auth_mysql
XPORTVERSION=	2.20
XCATEGORIES=	www
XMASTER_SITES=	http://bourbon.netvision.net.il/mysql/mod_auth_mysql/ \
X		http://web.mysql.com/Contrib/
X
XMAINTAINER=	ports@freebsd.org
X
XBUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
XLIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
XRUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT}
X
X.include <bsd.port.pre.mk>
X
XAPXS=		${LOCALBASE}/sbin/apxs
X
X.if exists(${APXS})
XAP_PORT!=	${APXS} -q AP_PORT
XAP_TARGET!=	${APXS} -q TARGET
XAP_SYSCONF!=	${APXS} -q SYSCONFDIR
XAP_INCLUDE!=	${APXS} -q INCLUDEDIR
XAP_LIBEXEC!=	${APXS} -q LIBEXECDIR
X.else
XAP_PORT?=       apache13
XAP_TARGET?=     httpd
XAP_SYSCONF?=    ${PREFIX}/etc/apache
XAP_INCLUDE?=    ${PREFIX}/include/apache
XAP_LIBEXEC?=    ${PREFIX}/libexec/apache
X.endif
X
XAUTH_MYSQL_DOCS=	apache/manual/mod/mod_auth_mysql
X
XPLIST_SUB=	AUTH_MYSQL_DOCS="${AUTH_MYSQL_DOCS}"
X
XPKGMESSAGE=	${WRKSRC}/.install_notes
X
XHAS_CONFIGURE=	yes
XCONFIGURE_ARGS=	--with-mysql=${PREFIX} \
X		--with-apxs=${APXS}
X
Xpost-install:
X.if !defined(NOPORTDOCS)
X	@${MKDIR} ${PREFIX}/share/doc/${AUTH_MYSQL_DOCS}
X	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${AUTH_MYSQL_DOCS}
X	@${INSTALL_DATA} ${WRKSRC}/USAGE ${PREFIX}/share/doc/${AUTH_MYSQL_DOCS}
X	@@(cd ${PREFIX}/share/doc && ${LN} -sf ${AUTH_MYSQL_DOCS} mod_auth_mysql)
X.endif
X
X.include <bsd.port.post.mk>
END-of-mod_auth_mysql/Makefile
echo c - mod_auth_mysql/patches
mkdir -p mod_auth_mysql/patches > /dev/null 2>&1
echo x - mod_auth_mysql/patches/patch-aa
sed 's/^X//' >mod_auth_mysql/patches/patch-aa << 'END-of-mod_auth_mysql/patches/patch-aa'
X--- configure.in.orig	Sat Oct  3 06:54:17 1998
X+++ configure.in	Fri May 19 23:58:48 2000
X@@ -48,6 +48,7 @@
X     APXS_ON=1
X     APXS="$withval"
X     APXS_LDFLAGS="@MYSQL_LFLAGS@ @MYSQL_LIBS@"
X+    APXS_INCLUDE="@MYSQL_INCLUDE@"
X     APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
X     INSTALL_IT="\$(APXS) -i -a -n auth_mysql libauth_mysql.so"
X     CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
X@@ -56,6 +57,7 @@
X     STRONGHOLD=
X     AC_SUBST(APXS)
X     AC_SUBST(APXS_LDFLAGS)
X+    AC_SUBST(APXS_INCLUDE)
X     AC_SUBST(INSTALL_IT)
X 	AC_DEFINE(HAVE_AP_COMPAT_H)
X     AC_MSG_RESULT(yes)
X@@ -237,7 +239,11 @@
X AC_SUBST(LDFLAGS_SHLIB)
X AC_SUBST(LDFLAGS_SHLIB_EXPORT)
X 
X-if test "$APACHE_VERSION" = "1.2"; then
X+if test $APXS_ON -eq 1 ; then
X+cat > .install_notes <<EOF
X++------------------------------------------------------------------+
X+EOF
X+elif test "$APACHE_VERSION" = "1.2"; then
X cat > .install_notes <<EOF
X 
X +------------------------------------------------------------------+
X@@ -268,10 +274,9 @@
X fi
X 
X cat >> .install_notes <<EOF
X-| If you are upgrading from an earlier version of mod_auth_mysql,  |
X-| you would have to update your .htaccess files to reflect the     |
X-| changes in the directive names.  You can do that automatically   |
X-| by running the bundled update_htaccess_files.sh script.          |
X+| If you are upgrading from a version of mod_auth_mysql < 2.20,    |
X+| you will need to update your .htaccess files to reflect the      |
X+| changes in the directive names.                                  |
X +------------------------------------------------------------------+
X | Please register this module at                                   |
X | http://bourbon.netvision.net.il/mod_auth_mysql/                  |
X@@ -285,9 +290,6 @@
X AC_SUBST(INSTALL_NOTES)
X 
X AC_OUTPUT(Makefile libauth_mysql.module, [], [])
X-
X-echo ""
X-echo "Please run 'make'"
X 
X # Local Variables:
X # tab-width: 4
END-of-mod_auth_mysql/patches/patch-aa
echo x - mod_auth_mysql/patches/patch-ab
sed 's/^X//' >mod_auth_mysql/patches/patch-ab << 'END-of-mod_auth_mysql/patches/patch-ab'
X--- configure.orig	Sat Oct  3 06:54:20 1998
X+++ configure	Fri May 19 23:59:29 2000
X@@ -1,7 +1,7 @@
X #! /bin/sh
X 
X # Guess values for system-dependent variables and create Makefiles.
X-# Generated automatically using autoconf version 2.12 
X+# Generated automatically using autoconf version 2.13 
X # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
X #
X # This configure script is free software; the Free Software Foundation
X@@ -62,6 +62,7 @@
X # Initialize some other variables.
X subdirs=
X MFLAGS= MAKEFLAGS=
X+SHELL=${CONFIG_SHELL-/bin/sh}
X # Maximum number of lines to put in a shell here document.
X ac_max_here_lines=12
X 
X@@ -345,7 +346,7 @@
X     verbose=yes ;;
X 
X   -version | --version | --versio | --versi | --vers)
X-    echo "configure generated by autoconf version 2.12"
X+    echo "configure generated by autoconf version 2.13"
X     exit 0 ;;
X 
X   -with-* | --with-*)
X@@ -515,9 +516,11 @@
X # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
X ac_cpp='$CPP $CPPFLAGS'
X ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
X-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X cross_compiling=$ac_cv_prog_cc_cross
X 
X+ac_exeext=
X+ac_objext=o
X if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
X   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
X   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
X@@ -539,15 +542,16 @@
X # Extract the first word of "gcc", so it can be a program name with args.
X set dummy gcc; ac_word=$2
X echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X-echo "configure:543: checking for $ac_word" >&5
X+echo "configure:546: checking for $ac_word" >&5
X if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X   if test -n "$CC"; then
X   ac_cv_prog_CC="$CC" # Let the user override the test.
X else
X-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
X-  for ac_dir in $PATH; do
X+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
X+  ac_dummy="$PATH"
X+  for ac_dir in $ac_dummy; do
X     test -z "$ac_dir" && ac_dir=.
X     if test -f $ac_dir/$ac_word; then
X       ac_cv_prog_CC="gcc"
X@@ -568,16 +572,17 @@
X   # Extract the first word of "cc", so it can be a program name with args.
X set dummy cc; ac_word=$2
X echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X-echo "configure:572: checking for $ac_word" >&5
X+echo "configure:576: checking for $ac_word" >&5
X if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X   if test -n "$CC"; then
X   ac_cv_prog_CC="$CC" # Let the user override the test.
X else
X-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
X+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
X   ac_prog_rejected=no
X-  for ac_dir in $PATH; do
X+  ac_dummy="$PATH"
X+  for ac_dir in $ac_dummy; do
X     test -z "$ac_dir" && ac_dir=.
X     if test -f $ac_dir/$ac_word; then
X       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
X@@ -612,25 +617,61 @@
X   echo "$ac_t""no" 1>&6
X fi
X 
X+  if test -z "$CC"; then
X+    case "`uname -s`" in
X+    *win32* | *WIN32*)
X+      # Extract the first word of "cl", so it can be a program name with args.
X+set dummy cl; ac_word=$2
X+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X+echo "configure:627: checking for $ac_word" >&5
X+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
X+  echo $ac_n "(cached) $ac_c" 1>&6
X+else
X+  if test -n "$CC"; then
X+  ac_cv_prog_CC="$CC" # Let the user override the test.
X+else
X+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
X+  ac_dummy="$PATH"
X+  for ac_dir in $ac_dummy; do
X+    test -z "$ac_dir" && ac_dir=.
X+    if test -f $ac_dir/$ac_word; then
X+      ac_cv_prog_CC="cl"
X+      break
X+    fi
X+  done
X+  IFS="$ac_save_ifs"
X+fi
X+fi
X+CC="$ac_cv_prog_CC"
X+if test -n "$CC"; then
X+  echo "$ac_t""$CC" 1>&6
X+else
X+  echo "$ac_t""no" 1>&6
X+fi
X+ ;;
X+    esac
X+  fi
X   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
X fi
X 
X echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
X-echo "configure:620: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
X+echo "configure:659: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
X 
X ac_ext=c
X # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
X ac_cpp='$CPP $CPPFLAGS'
X ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
X-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X cross_compiling=$ac_cv_prog_cc_cross
X 
X-cat > conftest.$ac_ext <<EOF
X-#line 630 "configure"
X+cat > conftest.$ac_ext << EOF
X+
X+#line 670 "configure"
X #include "confdefs.h"
X+
X main(){return(0);}
X EOF
X-if { (eval echo configure:634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
X+if { (eval echo configure:675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
X   ac_cv_prog_cc_works=yes
X   # If we can't run a trivial program, we are probably using a cross compiler.
X   if (./conftest; exit) 2>/dev/null; then
X@@ -644,18 +685,24 @@
X   ac_cv_prog_cc_works=no
X fi
X rm -fr conftest*
X+ac_ext=c
X+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
X+ac_cpp='$CPP $CPPFLAGS'
X+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
X+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X+cross_compiling=$ac_cv_prog_cc_cross
X 
X echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
X if test $ac_cv_prog_cc_works = no; then
X   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
X fi
X echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
X-echo "configure:654: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
X+echo "configure:701: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
X echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
X cross_compiling=$ac_cv_prog_cc_cross
X 
X echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
X-echo "configure:659: checking whether we are using GNU C" >&5
X+echo "configure:706: checking whether we are using GNU C" >&5
X if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X@@ -664,7 +711,7 @@
X   yes;
X #endif
X EOF
X-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
X+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
X   ac_cv_prog_gcc=yes
X else
X   ac_cv_prog_gcc=no
X@@ -675,11 +722,15 @@
X 
X if test $ac_cv_prog_gcc = yes; then
X   GCC=yes
X-  ac_test_CFLAGS="${CFLAGS+set}"
X-  ac_save_CFLAGS="$CFLAGS"
X-  CFLAGS=
X-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
X-echo "configure:683: checking whether ${CC-cc} accepts -g" >&5
X+else
X+  GCC=
X+fi
X+
X+ac_test_CFLAGS="${CFLAGS+set}"
X+ac_save_CFLAGS="$CFLAGS"
X+CFLAGS=
X+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
X+echo "configure:734: checking whether ${CC-cc} accepts -g" >&5
X if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X@@ -694,24 +745,28 @@
X fi
X 
X echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
X-  if test "$ac_test_CFLAGS" = set; then
X-    CFLAGS="$ac_save_CFLAGS"
X-  elif test $ac_cv_prog_cc_g = yes; then
X+if test "$ac_test_CFLAGS" = set; then
X+  CFLAGS="$ac_save_CFLAGS"
X+elif test $ac_cv_prog_cc_g = yes; then
X+  if test "$GCC" = yes; then
X     CFLAGS="-g -O2"
X   else
X-    CFLAGS="-O2"
X+    CFLAGS="-g"
X   fi
X else
X-  GCC=
X-  test "${CFLAGS+set}" = set || CFLAGS="-g"
X+  if test "$GCC" = yes; then
X+    CFLAGS="-O2"
X+  else
X+    CFLAGS=
X+  fi
X fi
X 
X if test "x$CC" != xcc; then
X   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
X-echo "configure:712: checking whether $CC and cc understand -c and -o together" >&5
X+echo "configure:767: checking whether $CC and cc understand -c and -o together" >&5
X else
X   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
X-echo "configure:715: checking whether cc understands -c and -o together" >&5
X+echo "configure:770: checking whether cc understands -c and -o together" >&5
X fi
X set dummy $CC; ac_cc="`echo $2 |
X 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
X@@ -723,16 +778,16 @@
X # We do the test twice because some compilers refuse to overwrite an
X # existing .o file with -o, though they will create one.
X ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
X-if { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
X-   test -f conftest.o && { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
X+if { (eval echo configure:782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
X+   test -f conftest.o && { (eval echo configure:783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
X then
X   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
X   if test "x$CC" != xcc; then
X     # Test first that cc exists at all.
X-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
X+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
X       ac_try='cc -c conftest.c -o conftest.o 1>&5'
X-      if { (eval echo configure:735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
X-	 test -f conftest.o && { (eval echo configure:736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
X+      if { (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
X+	 test -f conftest.o && { (eval echo configure:791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
X       then
X         # cc works too.
X         :
X@@ -761,15 +816,16 @@
X # Extract the first word of "ranlib", so it can be a program name with args.
X set dummy ranlib; ac_word=$2
X echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X-echo "configure:765: checking for $ac_word" >&5
X+echo "configure:820: checking for $ac_word" >&5
X if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X   if test -n "$RANLIB"; then
X   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
X else
X-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
X-  for ac_dir in $PATH; do
X+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
X+  ac_dummy="$PATH"
X+  for ac_dir in $ac_dummy; do
X     test -z "$ac_dir" && ac_dir=.
X     if test -f $ac_dir/$ac_word; then
X       ac_cv_prog_RANLIB="ranlib"
X@@ -799,7 +855,7 @@
X fi
X 
X echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
X-echo "configure:803: checking how to run the C preprocessor" >&5
X+echo "configure:859: checking how to run the C preprocessor" >&5
X # On Suns, sometimes $CPP names a directory.
X if test -n "$CPP" && test -d "$CPP"; then
X   CPP=
X@@ -814,14 +870,14 @@
X   # On the NeXT, cc -E runs the code through the compiler's parser,
X   # not just through cpp.
X   cat > conftest.$ac_ext <<EOF
X-#line 818 "configure"
X+#line 874 "configure"
X #include "confdefs.h"
X #include <assert.h>
X Syntax Error
X EOF
X ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
X-{ (eval echo configure:824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X-ac_err=`grep -v '^ *+' conftest.out`
X+{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
X if test -z "$ac_err"; then
X   :
X else
X@@ -831,14 +887,31 @@
X   rm -rf conftest*
X   CPP="${CC-cc} -E -traditional-cpp"
X   cat > conftest.$ac_ext <<EOF
X-#line 835 "configure"
X+#line 891 "configure"
X+#include "confdefs.h"
X+#include <assert.h>
X+Syntax Error
X+EOF
X+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
X+{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
X+if test -z "$ac_err"; then
X+  :
X+else
X+  echo "$ac_err" >&5
X+  echo "configure: failed program was:" >&5
X+  cat conftest.$ac_ext >&5
X+  rm -rf conftest*
X+  CPP="${CC-cc} -nologo -E"
X+  cat > conftest.$ac_ext <<EOF
X+#line 908 "configure"
X #include "confdefs.h"
X #include <assert.h>
X Syntax Error
X EOF
X ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
X-{ (eval echo configure:841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X-ac_err=`grep -v '^ *+' conftest.out`
X+{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
X if test -z "$ac_err"; then
X   :
X else
X@@ -851,6 +924,8 @@
X rm -f conftest*
X fi
X rm -f conftest*
X+fi
X+rm -f conftest*
X   ac_cv_prog_CPP="$CPP"
X fi
X   CPP="$ac_cv_prog_CPP"
X@@ -863,18 +938,18 @@
X do
X ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
X echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
X-echo "configure:867: checking for $ac_hdr" >&5
X+echo "configure:942: checking for $ac_hdr" >&5
X if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 872 "configure"
X+#line 947 "configure"
X #include "confdefs.h"
X #include <$ac_hdr>
X EOF
X ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
X-{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X-ac_err=`grep -v '^ *+' conftest.out`
X+{ (eval echo configure:952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
X+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
X if test -z "$ac_err"; then
X   rm -rf conftest*
X   eval "ac_cv_header_$ac_safe=yes"
X@@ -902,12 +977,12 @@
X for ac_func in crypt
X do
X echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
X-echo "configure:906: checking for $ac_func" >&5
X+echo "configure:981: checking for $ac_func" >&5
X if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 911 "configure"
X+#line 986 "configure"
X #include "confdefs.h"
X /* System header to define __stub macros and hopefully few prototypes,
X     which can conflict with char $ac_func(); below.  */
X@@ -930,7 +1005,7 @@
X 
X ; return 0; }
X EOF
X-if { (eval echo configure:934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
X+if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
X   rm -rf conftest*
X   eval "ac_cv_func_$ac_func=yes"
X else
X@@ -956,7 +1031,7 @@
X 
X 
X echo $ac_n "checking for crypt in -lc""... $ac_c" 1>&6
X-echo "configure:960: checking for crypt in -lc" >&5
X+echo "configure:1035: checking for crypt in -lc" >&5
X ac_lib_var=`echo c'_'crypt | sed 'y%./+-%__p_%'`
X if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X@@ -964,7 +1039,7 @@
X   ac_save_LIBS="$LIBS"
X LIBS="-lc  $LIBS"
X cat > conftest.$ac_ext <<EOF
X-#line 968 "configure"
X+#line 1043 "configure"
X #include "confdefs.h"
X /* Override any gcc2 internal prototype to avoid an error.  */
X /* We use char because int might match the return type of a gcc2
X@@ -975,7 +1050,7 @@
X crypt()
X ; return 0; }
X EOF
X-if { (eval echo configure:979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
X+if { (eval echo configure:1054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
X   rm -rf conftest*
X   eval "ac_cv_lib_$ac_lib_var=yes"
X else
X@@ -995,7 +1070,7 @@
X   echo "$ac_t""no" 1>&6
X 
X  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
X-echo "configure:999: checking for crypt in -lcrypt" >&5
X+echo "configure:1074: checking for crypt in -lcrypt" >&5
X ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
X if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
X   echo $ac_n "(cached) $ac_c" 1>&6
X@@ -1003,7 +1078,7 @@
X   ac_save_LIBS="$LIBS"
X LIBS="-lcrypt  $LIBS"
X cat > conftest.$ac_ext <<EOF
X-#line 1007 "configure"
X+#line 1082 "configure"
X #include "confdefs.h"
X /* Override any gcc2 internal prototype to avoid an error.  */
X /* We use char because int might match the return type of a gcc2
X@@ -1014,7 +1089,7 @@
X crypt()
X ; return 0; }
X EOF
X-if { (eval echo configure:1018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
X+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
X   rm -rf conftest*
X   eval "ac_cv_lib_$ac_lib_var=yes"
X else
X@@ -1045,7 +1120,7 @@
X 
X 
X   echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
X-echo "configure:1049: checking for standard DES crypt" >&5
X+echo "configure:1124: checking for standard DES crypt" >&5
X   if test "$cross_compiling" = yes; then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1056,7 +1131,7 @@
X   
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 1060 "configure"
X+#line 1135 "configure"
X #include "confdefs.h"
X 
X main() {
X@@ -1067,7 +1142,7 @@
X #endif
X }
X EOF
X-if { (eval echo configure:1071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
X+if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
X then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1093,7 +1168,7 @@
X 
X 
X   echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
X-echo "configure:1097: checking for extended DES crypt" >&5
X+echo "configure:1172: checking for extended DES crypt" >&5
X   if test "$cross_compiling" = yes; then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1104,7 +1179,7 @@
X   
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 1108 "configure"
X+#line 1183 "configure"
X #include "confdefs.h"
X 
X main() {
X@@ -1115,7 +1190,7 @@
X #endif
X }
X EOF
X-if { (eval echo configure:1119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
X+if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
X then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1141,7 +1216,7 @@
X 
X 
X   echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
X-echo "configure:1145: checking for MD5 crypt" >&5
X+echo "configure:1220: checking for MD5 crypt" >&5
X   if test "$cross_compiling" = yes; then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1152,7 +1227,7 @@
X   
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 1156 "configure"
X+#line 1231 "configure"
X #include "confdefs.h"
X 
X main() {
X@@ -1172,7 +1247,7 @@
X #endif
X }
X EOF
X-if { (eval echo configure:1176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
X+if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
X then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1198,7 +1273,7 @@
X 
X 
X   echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
X-echo "configure:1202: checking for Blowfish crypt" >&5
X+echo "configure:1277: checking for Blowfish crypt" >&5
X   if test "$cross_compiling" = yes; then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1209,7 +1284,7 @@
X   
X else
X   cat > conftest.$ac_ext <<EOF
X-#line 1213 "configure"
X+#line 1288 "configure"
X #include "confdefs.h"
X 
X main() {
X@@ -1226,7 +1301,7 @@
X #endif
X }
X EOF
X-if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
X+if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
X then
X   
X     cat >> confdefs.h <<\EOF
X@@ -1253,7 +1328,7 @@
X 
X 
X echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6
X-echo "configure:1257: checking for Apache module support via DSO through APXS" >&5
X+echo "configure:1332: checking for Apache module support via DSO through APXS" >&5
X # Check whether --with-apxs or --without-apxs was given.
X if test "${with_apxs+set}" = set; then
X   withval="$with_apxs"
X@@ -1264,6 +1339,7 @@
X     APXS_ON=1
X     APXS="$withval"
X     APXS_LDFLAGS="@MYSQL_LFLAGS@ @MYSQL_LIBS@"
X+    APXS_INCLUDE="@MYSQL_INCLUDE@"
X     APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
X     INSTALL_IT="\$(APXS) -i -a -n auth_mysql libauth_mysql.so"
X     CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
X@@ -1273,6 +1349,7 @@
X     
X     
X     
X+    
X 	cat >> confdefs.h <<\EOF
X #define HAVE_AP_COMPAT_H 1
X EOF
X@@ -1287,7 +1364,7 @@
X 
X 
X echo $ac_n "checking for Apache module support via DSO through APACI""... $ac_c" 1>&6
X-echo "configure:1291: checking for Apache module support via DSO through APACI" >&5
X+echo "configure:1368: checking for Apache module support via DSO through APACI" >&5
X # Check whether --with-shared-apache or --without-shared-apache was given.
X if test "${with_shared_apache+set}" = set; then
X   withval="$with_shared_apache"
X@@ -1342,7 +1419,7 @@
X if test "$APACI_DSO_ON" != "1"; then
X if test "$APXS_ON" != "1"; then
X echo $ac_n "checking for Apache directory""... $ac_c" 1>&6
X-echo "configure:1346: checking for Apache directory" >&5
X+echo "configure:1423: checking for Apache directory" >&5
X # Check whether --with-apache or --without-apache was given.
X if test "${with_apache+set}" = set; then
X   withval="$with_apache"
X@@ -1449,7 +1526,7 @@
X fi
X 
X echo $ac_n "checking for MySQL directory""... $ac_c" 1>&6
X-echo "configure:1453: checking for MySQL directory" >&5
X+echo "configure:1530: checking for MySQL directory" >&5
X # Check whether --with-mysql or --without-mysql was given.
X if test "${with_mysql+set}" = set; then
X   withval="$with_mysql"
X@@ -1492,7 +1569,11 @@
X 
X 
X 
X-if test "$APACHE_VERSION" = "1.2"; then
X+if test $APXS_ON -eq 1 ; then
X+cat > .install_notes <<EOF
X++------------------------------------------------------------------+
X+EOF
X+elif test "$APACHE_VERSION" = "1.2"; then
X cat > .install_notes <<EOF
X 
X +------------------------------------------------------------------+
X@@ -1523,10 +1604,9 @@
X fi
X 
X cat >> .install_notes <<EOF
X-| If you are upgrading from an earlier version of mod_auth_mysql,  |
X-| you would have to update your .htaccess files to reflect the     |
X-| changes in the directive names.  You can do that automatically   |
X-| by running the bundled update_htaccess_files.sh script.          |
X+| If you are upgrading from a version of mod_auth_mysql < 2.20,    |
X+| you will need to update your .htaccess files to reflect the      |
X+| changes in the directive names.                                  |
X +------------------------------------------------------------------+
X | Please register this module at                                   |
X | http://bourbon.netvision.net.il/mod_auth_mysql/                  |
X@@ -1562,7 +1642,7 @@
X # Ultrix sh set writes to stderr and can't be redirected directly,
X # and sets the high bit in the cache file unless we assign to the vars.
X (set) 2>&1 |
X-  case `(ac_space=' '; set) 2>&1` in
X+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
X   *ac_space=\ *)
X     # `set' does not quote correctly, so add quotes (double-quote substitution
X     # turns \\\\ into \\, and sed turns \\ into \).
X@@ -1629,7 +1709,7 @@
X     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
X     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
X   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
X-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
X+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
X     exit 0 ;;
X   -help | --help | --hel | --he | --h)
X     echo "\$ac_cs_usage"; exit 0 ;;
X@@ -1648,9 +1728,11 @@
X  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
X $ac_vpsub
X $extrasub
X+s%@SHELL@%$SHELL%g
X s%@CFLAGS@%$CFLAGS%g
X s%@CPPFLAGS@%$CPPFLAGS%g
X s%@CXXFLAGS@%$CXXFLAGS%g
X+s%@FFLAGS@%$FFLAGS%g
X s%@DEFS@%$DEFS%g
X s%@LDFLAGS@%$LDFLAGS%g
X s%@LIBS@%$LIBS%g
X@@ -1674,6 +1756,7 @@
X s%@CPP@%$CPP%g
X s%@APXS@%$APXS%g
X s%@APXS_LDFLAGS@%$APXS_LDFLAGS%g
X+s%@APXS_INCLUDE@%$APXS_INCLUDE%g
X s%@INSTALL_IT@%$INSTALL_IT%g
X s%@APACHE_INCLUDE@%$APACHE_INCLUDE%g
X s%@APACHE_TARGET@%$APACHE_TARGET%g
X@@ -1899,9 +1982,6 @@
X rm -fr confdefs* $ac_clean_files
X test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
X 
X-
X-echo ""
X-echo "Please run 'make'"
X 
X # Local Variables:
X # tab-width: 4
END-of-mod_auth_mysql/patches/patch-ab
echo x - mod_auth_mysql/patches/patch-ac
sed 's/^X//' >mod_auth_mysql/patches/patch-ac << 'END-of-mod_auth_mysql/patches/patch-ac'
X--- Makefile.in.orig	Sat Oct  3 06:24:28 1998
X+++ Makefile.in	Fri May 19 23:52:29 2000
X@@ -14,9 +14,27 @@
X REGCFLAGS = $(CFLAGS)
X APXS = @APXS@
X APXS_LDFLAGS = @APXS_LDFLAGS@
X+APXS_INCLUDE = @APXS_INCLUDE@
X WARNING_LEVEL = @WARNING_LEVEL@
X 
X+#   the default target
X+all: build
X+
X+# build the shared object file for Apache
X+build: mod_auth_mysql.so
X+
X+#   compile the shared object file
X+mod_auth_mysql.so: auth_mysql_config.h mod_auth_mysql.c
X+	$(APXS) -c -o libauth_mysql.so ${APXS_LDFLAGS} ${APXS_INCLUDE} mod_auth_mysql.c
X+
X+auth_mysql_config.h:
X+	cp config.h auth_mysql_config.h
X+
X+#   install the shared object file into Apache
X install:
X 	$(INSTALL_IT)
X 	@cat .install_notes
X 
X+#   cleanup
X+clean:
X+	-rm -f mod_auth_mysql.o mod_auth_mysql.so
END-of-mod_auth_mysql/patches/patch-ac
exit


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200005220042.UAA91085>