mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
- remove apr/apr-util vestiges
- fullbuild not needed anymore - buildconf not needed anymore - scripts_env not needed anymore With Hat: apache@
This commit is contained in:
Philip M. Gollucci
parent
9d17de2112
commit
61a0dda84e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254536
10 changed files with 2 additions and 284 deletions
|
|
@ -19,7 +19,7 @@ MAINTAINER?= apache@FreeBSD.org
|
|||
COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM.
|
||||
|
||||
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
|
||||
apr-1:${PORTSDIR}/devel/apr \
|
||||
apr-1:${PORTSDIR}/devel/apr1 \
|
||||
pcre.0:${PORTSDIR}/devel/pcre
|
||||
|
||||
MAKE_JOBS_SAFE= yes
|
||||
|
|
@ -34,18 +34,13 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
|
|||
ru-apache+mod_ssl-1.* ru-apache-1.* \
|
||||
apache-2.0.* apache-*-2.0.*
|
||||
|
||||
SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
|
||||
LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
|
||||
LIBTOOL_M4=${LIBTOOL_M4} \
|
||||
AUTOHEADER=${AUTOHEADER}
|
||||
|
||||
USE_APACHE= common22
|
||||
USE_BZIP2= yes
|
||||
USE_ICONV= yes
|
||||
USE_AUTOTOOLS= autoconf:262 libtool:22
|
||||
USE_PERL5= yes
|
||||
USE_RC_SUBR= apache22 htcacheclean
|
||||
LIBTOOLFILES= configure
|
||||
LIBTOOLFILES= configure
|
||||
|
||||
MPM_ITK_VERSION?= 20090414-00
|
||||
|
||||
|
|
@ -136,12 +131,6 @@ LDFLAGS+= -L${OPENSSLLIB}
|
|||
|
||||
.endif
|
||||
|
||||
# When using apr_mysql_db we _must_ rebuild makefiles
|
||||
.if defined(WITH_FULLBUILD)
|
||||
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
|
||||
SCRIPTS_ENV+= FULLBUILD=on
|
||||
.endif
|
||||
|
||||
.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
|
||||
USE_OPENLDAP= yes
|
||||
CONFIGURE_ARGS+= --enable-ldap=shared --with-ldap --enable-authnz-ldap \
|
||||
|
|
@ -200,9 +189,6 @@ post-patch:
|
|||
@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," ${WRKSRC}/srclib/apr/build/apr_hints.m4
|
||||
@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
|
||||
|
||||
pre-configure:
|
||||
@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
|
||||
|
||||
post-configure:
|
||||
@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
|
||||
${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS}," ${WRKSRC}/docs/conf/extra/httpd-userdir.conf
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
--- ./srclib/apr-util/Makefile.in.orig 2008-11-21 01:32:58.000000000 -0500
|
||||
+++ ./srclib/apr-util/Makefile.in 2010-05-06 19:37:54.256730127 -0400
|
||||
@@ -74,12 +74,11 @@
|
||||
sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
|
||||
|
||||
install: $(TARGETS) install-modules
|
||||
- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
|
||||
+ $(APR_MKDIR) $(DESTDIR)$(includedir) \
|
||||
$(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
|
||||
for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
|
||||
$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
|
||||
done
|
||||
- $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
|
||||
list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
|
||||
( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
|
||||
done
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
--- ./srclib/apr-util/build/dbm.m4.orig 2008-11-21 01:32:58.000000000 -0500
|
||||
+++ ./srclib/apr-util/build/dbm.m4 2010-05-06 19:37:54.238730296 -0400
|
||||
@@ -315,8 +315,8 @@
|
||||
fi
|
||||
APU_CHECK_BERKELEY_DB(1, -1, -1,
|
||||
"$places",
|
||||
- "db_185.h",
|
||||
- "db"
|
||||
+ "db.h",
|
||||
+ "c"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=185
|
||||
@@ -358,7 +358,7 @@
|
||||
APU_CHECK_BERKELEY_DB(3, -1, -1,
|
||||
"$places",
|
||||
"db3/db.h db.h",
|
||||
- "db3 db"
|
||||
+ "db3"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=3
|
||||
@@ -378,8 +378,8 @@
|
||||
fi
|
||||
APU_CHECK_BERKELEY_DB("4", "0", "-1",
|
||||
"$places",
|
||||
- "db4/db.h db.h",
|
||||
- "db-4.0 db4 db"
|
||||
+ "db4/db.h",
|
||||
+ "db4"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=4
|
||||
@@ -399,8 +399,8 @@
|
||||
fi
|
||||
APU_CHECK_BERKELEY_DB("4", "1", "-1",
|
||||
"$places",
|
||||
- "db41/db.h db4/db.h db.h",
|
||||
- "db-4.1 db41 db4 db"
|
||||
+ "db41/db.h",
|
||||
+ "db41"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=4
|
||||
@@ -420,8 +420,8 @@
|
||||
fi
|
||||
APU_CHECK_BERKELEY_DB("4", "2", "-1",
|
||||
"$places",
|
||||
- "db42/db.h db4/db.h db.h",
|
||||
- "db-4.2 db42 db4 db"
|
||||
+ "db42/db.h",
|
||||
+ "db-4.2"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=4
|
||||
@@ -439,8 +439,8 @@
|
||||
fi
|
||||
APU_CHECK_BERKELEY_DB("4", "3", "-1",
|
||||
"$places",
|
||||
- "db43/db.h db4/db.h db.h",
|
||||
- "db-4.3 db4-4.3 db43 db4 db"
|
||||
+ "db43/db.h",
|
||||
+ "db-4.3"
|
||||
)
|
||||
if test "$apu_have_db" = "1"; then
|
||||
apu_db_version=4
|
||||
@@ -522,6 +522,25 @@
|
||||
apu_db_version=4
|
||||
fi
|
||||
])
|
||||
+dnl
|
||||
+dnl APU_CHECK_DB48: is DB4.8 present?
|
||||
+dnl
|
||||
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
|
||||
+dnl
|
||||
+AC_DEFUN([APU_CHECK_DB48], [
|
||||
+ places=$1
|
||||
+ if test -z "$places"; then
|
||||
+ places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
|
||||
+ fi
|
||||
+ APU_CHECK_BERKELEY_DB("4", "8", "-1",
|
||||
+ "$places",
|
||||
+ "db48/db.h db4/db.h db.h",
|
||||
+ "db-4.8 db4-4.8 db48 db4 db"
|
||||
+ )
|
||||
+ if test "$apu_have_db" = "1"; then
|
||||
+ apu_db_version=4
|
||||
+ fi
|
||||
+])
|
||||
|
||||
AC_DEFUN([APU_CHECK_DB], [
|
||||
requested=$1
|
||||
@@ -606,6 +625,12 @@
|
||||
AC_MSG_ERROR(Berkeley db4 not found)
|
||||
fi
|
||||
;;
|
||||
+ db48)
|
||||
+ APU_CHECK_DB48("$check_places")
|
||||
+ if test "$apu_db_version" != "4"; then
|
||||
+ AC_MSG_ERROR(Berkeley db4 not found)
|
||||
+ fi
|
||||
+ ;;
|
||||
default)
|
||||
APU_CHECK_DB_ALL("$check_places")
|
||||
;;
|
||||
@@ -882,6 +907,10 @@
|
||||
apu_use_db=1
|
||||
apu_default_dbm=db4
|
||||
;;
|
||||
+ db48)
|
||||
+ apu_use_db=1
|
||||
+ apu_default_dbm=db4
|
||||
+ ;;
|
||||
default)
|
||||
dnl ### use more sophisticated DBMs for the default?
|
||||
apu_default_dbm="sdbm (default)"
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- ./srclib/apr-util/buildconf.orig 2007-01-15 14:00:58.000000000 -0500
|
||||
+++ ./srclib/apr-util/buildconf 2010-05-06 19:37:54.235730463 -0400
|
||||
@@ -81,8 +81,10 @@
|
||||
#
|
||||
# Generate build-outputs.mk for the build system
|
||||
#
|
||||
+if [ "x${FULLBUILD}" = "xon" ] ; then
|
||||
echo "Generating 'make' outputs ..."
|
||||
$apr_src_dir/build/gen-build.py make
|
||||
+fi
|
||||
|
||||
#
|
||||
# If Expat has been bundled, then go and configure the thing
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ./srclib/apr-util/config.layout.orig 2005-02-09 07:18:43.000000000 -0500
|
||||
+++ ./srclib/apr-util/config.layout 2010-05-06 19:37:54.241730407 -0400
|
||||
@@ -229,4 +229,8 @@
|
||||
infodir: ${exec_prefix}/share/info
|
||||
libsuffix: -${APRUTIL_MAJOR_VERSION}
|
||||
installbuilddir: ${prefix}/usr/share/apache2/build
|
||||
+
|
||||
+<Layout FreeBSD>
|
||||
+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION}
|
||||
+ libsuffix:
|
||||
</Layout>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
--- ./srclib/apr/Makefile.in.orig 2008-05-02 13:04:46.000000000 -0400
|
||||
+++ ./srclib/apr/Makefile.in 2010-05-06 19:37:54.243730109 -0400
|
||||
@@ -70,14 +70,13 @@
|
||||
|
||||
install: $(TARGETS)
|
||||
$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
|
||||
- $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
|
||||
+ $(DESTDIR)$(includedir)
|
||||
$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
|
||||
for f in $(top_srcdir)/include/apr_*.h; do \
|
||||
$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
|
||||
done
|
||||
$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
|
||||
$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
|
||||
- $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
|
||||
for f in libtool shlibtool; do \
|
||||
if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
|
||||
done
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- ./srclib/apr/build/apr_hints.m4.orig 2009-11-17 09:28:12.000000000 -0500
|
||||
+++ ./srclib/apr/build/apr_hints.m4 2010-05-06 19:37:54.280731298 -0400
|
||||
@@ -159,11 +159,7 @@
|
||||
;;
|
||||
*-freebsd*)
|
||||
APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
|
||||
- if test -x /sbin/sysctl; then
|
||||
- os_version=`/sbin/sysctl -n kern.osreldate`
|
||||
- else
|
||||
- os_version=000000
|
||||
- fi
|
||||
+ os_version="900010"
|
||||
# 502102 is when libc_r switched to libpthread (aka libkse).
|
||||
if test $os_version -ge "502102"; then
|
||||
apr_cv_pthreads_cflags="none"
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
--- ./srclib/apr/build/buildcheck.sh.orig 2009-11-12 19:27:16.000000000 -0500
|
||||
+++ ./srclib/apr/build/buildcheck.sh 2010-05-06 19:37:54.248730202 -0400
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
echo "buildconf: checking installation..."
|
||||
|
||||
+if [ "x${FULLBUILD}" = "xon" ] ; then
|
||||
# any python
|
||||
python=`build/PrintPath python`
|
||||
if test -z "$python"; then
|
||||
@@ -13,6 +14,7 @@
|
||||
py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
|
||||
echo "buildconf: python version $py_version (ok)"
|
||||
fi
|
||||
+fi
|
||||
|
||||
# autoconf 2.59 or newer
|
||||
ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
|
||||
@@ -38,7 +40,7 @@
|
||||
# output is multiline from 1.5 onwards
|
||||
|
||||
# Require libtool 1.4 or newer
|
||||
-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
|
||||
+libtool=${LIBTOOL}
|
||||
lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
|
||||
if test -z "$lt_pversion"; then
|
||||
echo "buildconf: libtool not found."
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
--- ./srclib/apr/buildconf.orig 2009-11-12 17:19:49.000000000 -0500
|
||||
+++ ./srclib/apr/buildconf 2010-05-06 19:37:54.253730294 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#
|
||||
build/buildcheck.sh $verbose || exit 1
|
||||
|
||||
-libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
|
||||
+libtoolize="${LIBTOOLIZE}"
|
||||
if [ "x$libtoolize" = "x" ]; then
|
||||
echo "libtoolize not found in path"
|
||||
exit 1
|
||||
@@ -65,7 +65,7 @@
|
||||
# Expecting the code above to be very portable, but just in case...
|
||||
if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
|
||||
ltpath=`dirname $libtoolize`
|
||||
- ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
|
||||
+ ltfile=${LIBTOOL_M4}
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -76,6 +76,7 @@
|
||||
|
||||
echo "buildconf: Using libtool.m4 at ${ltfile}."
|
||||
|
||||
+chmod 664 build/libtool.m4
|
||||
cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
|
||||
|
||||
# libtool.m4 from 1.6 requires ltsugar.m4
|
||||
@@ -100,8 +101,10 @@
|
||||
# Remove autoconf 2.5x's cache directory
|
||||
rm -rf autom4te*.cache
|
||||
|
||||
-echo "Generating 'make' outputs ..."
|
||||
-build/gen-build.py $verbose make
|
||||
+if [ "x${FULLBUILD}" = "xon" ] ; then
|
||||
+ echo "Generating 'make' outputs ..."
|
||||
+ build/gen-build.py $verbose make
|
||||
+fi
|
||||
|
||||
# Create RPM Spec file
|
||||
if [ -f `which cut` ]; then
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ./srclib/apr/config.layout.orig 2004-11-24 17:51:51.000000000 -0500
|
||||
+++ ./srclib/apr/config.layout 2010-05-06 19:37:54.251730593 -0400
|
||||
@@ -229,3 +229,8 @@
|
||||
infodir: ${exec_prefix}/share/info
|
||||
libsuffix: -${APR_MAJOR_VERSION}
|
||||
</Layout>
|
||||
+
|
||||
+<Layout FreeBSD>
|
||||
+ includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION}
|
||||
+ libsuffix:
|
||||
+</Layout>
|
||||
Loading…
Add table
Reference in a new issue