head	1.94;
access;
symbols
	pkgsrc-2013Q2:1.94.0.46
	pkgsrc-2013Q2-base:1.94
	pkgsrc-2012Q4:1.94.0.44
	pkgsrc-2012Q4-base:1.94
	pkgsrc-2011Q4:1.94.0.42
	pkgsrc-2011Q4-base:1.94
	pkgsrc-2011Q2:1.94.0.40
	pkgsrc-2011Q2-base:1.94
	TNF:1.1.1
	pkgsrc-2009Q4:1.94.0.38
	pkgsrc-2009Q4-base:1.94
	pkgsrc-2008Q4:1.94.0.36
	pkgsrc-2008Q4-base:1.94
	pkgsrc-2008Q3:1.94.0.34
	pkgsrc-2008Q3-base:1.94
	cube-native-xorg:1.94.0.32
	cube-native-xorg-base:1.94
	pkgsrc-2008Q2:1.94.0.30
	pkgsrc-2008Q2-base:1.94
	pkgsrc-2008Q1:1.94.0.28
	pkgsrc-2008Q1-base:1.94
	pkgsrc-2007Q4:1.94.0.26
	pkgsrc-2007Q4-base:1.94
	pkgsrc-2007Q3:1.94.0.24
	pkgsrc-2007Q3-base:1.94
	pkgsrc-2007Q2:1.94.0.22
	pkgsrc-2007Q2-base:1.94
	pkgsrc-2007Q1:1.94.0.20
	pkgsrc-2007Q1-base:1.94
	pkgsrc-2006Q4:1.94.0.18
	pkgsrc-2006Q4-base:1.94
	pkgsrc-2006Q3:1.94.0.16
	pkgsrc-2006Q3-base:1.94
	pkgsrc-2006Q2:1.94.0.14
	pkgsrc-2006Q2-base:1.94
	pkgsrc-2006Q1:1.94.0.12
	pkgsrc-2006Q1-base:1.94
	pkgsrc-2005Q4:1.94.0.10
	pkgsrc-2005Q4-base:1.94
	pkgsrc-2005Q3:1.94.0.8
	pkgsrc-2005Q3-base:1.94
	pkgsrc-2005Q2:1.94.0.6
	pkgsrc-2005Q2-base:1.94
	pkgsrc-2005Q1:1.94.0.4
	pkgsrc-2005Q1-base:1.94
	pkgsrc-2004Q4:1.94.0.2
	pkgsrc-2004Q4-base:1.94
	pkgsrc-2004Q3:1.90.0.2
	pkgsrc-2004Q3-base:1.90
	pkgsrc-2004Q2:1.89.0.2
	pkgsrc-2004Q2-base:1.89
	pkgsrc-2004Q1:1.88.0.2
	pkgsrc-2004Q1-base:1.88
	pkgsrc-2003Q4:1.86.0.2
	pkgsrc-2003Q4-base:1.86
	netbsd-1-6-1:1.67.0.2
	netbsd-1-6-1-base:1.67
	netbsd-1-6:1.55.0.4
	netbsd-1-6-RELEASE-base:1.55
	pkgviews:1.53.0.2
	pkgviews-base:1.53
	buildlink2:1.49.0.2
	buildlink2-base:1.55
	netbsd-1-5-PATCH003:1.49
	netbsd-1-5-PATCH001:1.30
	netbsd-1-5-RELEASE:1.18
	netbsd-1-4-PATCH003:1.18
	netbsd-1-4-PATCH002:1.13
	comdex-fall-1999:1.8
	pkgsrc_www_apache_19990724:1.1.1.1;
locks; strict;
comment	@# @;


1.94
date	2004.11.22.22.07.12;	author wiz;	state dead;
branches;
next	1.93;

1.93
date	2004.11.22.20.59.57;	author wiz;	state Exp;
branches;
next	1.92;

1.92
date	2004.10.06.23.27.19;	author heinz;	state Exp;
branches;
next	1.91;

1.91
date	2004.10.03.00.18.24;	author tv;	state Exp;
branches;
next	1.90;

1.90
date	2004.08.27.06.29.11;	author jlam;	state Exp;
branches
	1.90.2.1;
next	1.89;

1.89
date	2004.04.30.05.25.59;	author snj;	state Exp;
branches;
next	1.88;

1.88
date	2004.02.18.13.33.41;	author jlam;	state Exp;
branches;
next	1.87;

1.87
date	2004.02.09.19.57.55;	author jlam;	state Exp;
branches;
next	1.86;

1.86
date	2003.11.02.09.35.12;	author cube;	state Exp;
branches;
next	1.85;

1.85
date	2003.10.29.10.45.26;	author cube;	state Exp;
branches;
next	1.84;

1.84
date	2003.10.18.13.08.49;	author cjep;	state Exp;
branches;
next	1.83;

1.83
date	2003.10.11.13.40.20;	author grant;	state Exp;
branches;
next	1.82;

1.82
date	2003.09.19.11.57.51;	author agc;	state Exp;
branches;
next	1.81;

1.81
date	2003.09.17.19.41.19;	author grant;	state Exp;
branches;
next	1.80;

1.80
date	2003.09.13.23.37.06;	author itojun;	state Exp;
branches;
next	1.79;

1.79
date	2003.09.12.08.26.44;	author itojun;	state Exp;
branches;
next	1.78;

1.78
date	2003.07.30.01.53.15;	author grant;	state Exp;
branches;
next	1.77;

1.77
date	2003.07.17.22.55.28;	author grant;	state Exp;
branches;
next	1.76;

1.76
date	2003.06.06.19.33.12;	author drochner;	state Exp;
branches;
next	1.75;

1.75
date	2003.06.02.01.16.08;	author jschauma;	state Exp;
branches;
next	1.74;

1.74
date	2003.05.31.15.03.18;	author grant;	state Exp;
branches;
next	1.73;

1.73
date	2003.05.31.13.32.49;	author grant;	state Exp;
branches;
next	1.72;

1.72
date	2003.05.31.13.30.30;	author grant;	state Exp;
branches;
next	1.71;

1.71
date	2003.05.31.13.29.21;	author grant;	state Exp;
branches;
next	1.70;

1.70
date	2003.04.15.01.39.15;	author grant;	state Exp;
branches;
next	1.69;

1.69
date	2003.03.14.19.38.00;	author jlam;	state Exp;
branches;
next	1.68;

1.68
date	2003.02.23.15.55.58;	author jmmv;	state Exp;
branches;
next	1.67;

1.67
date	2003.01.28.22.04.27;	author jlam;	state Exp;
branches;
next	1.66;

1.66
date	2002.12.22.13.04.40;	author grant;	state Exp;
branches;
next	1.65;

1.65
date	2002.12.19.14.20.09;	author grant;	state Exp;
branches;
next	1.64;

1.64
date	2002.12.07.02.39.06;	author schmonz;	state Exp;
branches;
next	1.63;

1.63
date	2002.11.19.09.35.27;	author martti;	state Exp;
branches;
next	1.62;

1.62
date	2002.11.18.08.19.55;	author martti;	state Exp;
branches;
next	1.61;

1.61
date	2002.11.15.10.40.45;	author martti;	state Exp;
branches;
next	1.60;

1.60
date	2002.11.15.09.08.07;	author martti;	state Exp;
branches;
next	1.59;

1.59
date	2002.10.06.12.49.59;	author tron;	state Exp;
branches;
next	1.58;

1.58
date	2002.09.26.01.50.23;	author grant;	state Exp;
branches;
next	1.57;

1.57
date	2002.09.19.09.04.30;	author jlam;	state Exp;
branches;
next	1.56;

1.56
date	2002.08.25.21.51.58;	author jlam;	state Exp;
branches;
next	1.55;

1.55
date	2002.08.01.00.58.33;	author mycroft;	state Exp;
branches
	1.55.4.1;
next	1.54;

1.54
date	2002.07.30.18.40.15;	author wiz;	state Exp;
branches;
next	1.53;

1.53
date	2002.06.21.23.22.47;	author itojun;	state Exp;
branches;
next	1.52;

1.52
date	2002.06.20.22.20.09;	author itojun;	state Exp;
branches;
next	1.51;

1.51
date	2002.06.20.09.45.27;	author itojun;	state Exp;
branches;
next	1.50;

1.50
date	2002.06.20.07.24.17;	author itojun;	state Exp;
branches;
next	1.49;

1.49
date	2001.12.26.21.20.27;	author jlam;	state Exp;
branches
	1.49.2.1;
next	1.48;

1.48
date	2001.12.02.06.56.45;	author jlam;	state Exp;
branches;
next	1.47;

1.47
date	2001.11.29.01.12.51;	author hubertf;	state Exp;
branches;
next	1.46;

1.46
date	2001.11.25.18.59.48;	author jlam;	state Exp;
branches;
next	1.45;

1.45
date	2001.11.23.10.52.21;	author martti;	state Exp;
branches;
next	1.44;

1.44
date	2001.11.21.15.44.24;	author jlam;	state Exp;
branches;
next	1.43;

1.43
date	2001.11.19.16.23.13;	author jlam;	state Exp;
branches;
next	1.42;

1.42
date	2001.10.22.18.10.28;	author jlam;	state Exp;
branches;
next	1.41;

1.41
date	2001.10.20.17.46.50;	author jlam;	state Exp;
branches;
next	1.40;

1.40
date	2001.10.17.19.27.27;	author jlam;	state Exp;
branches;
next	1.39;

1.39
date	2001.10.17.07.47.52;	author martti;	state Exp;
branches;
next	1.38;

1.38
date	2001.10.16.04.47.06;	author jlam;	state Exp;
branches;
next	1.37;

1.37
date	2001.10.16.04.11.06;	author jlam;	state Exp;
branches;
next	1.36;

1.36
date	2001.10.09.13.20.17;	author martti;	state Exp;
branches;
next	1.35;

1.35
date	2001.10.08.13.23.37;	author martti;	state Exp;
branches;
next	1.34;

1.34
date	2001.09.27.23.18.51;	author jlam;	state Exp;
branches;
next	1.33;

1.33
date	2001.07.16.15.41.51;	author itojun;	state Exp;
branches;
next	1.32;

1.32
date	2001.07.13.07.09.25;	author jlam;	state Exp;
branches;
next	1.31;

1.31
date	2001.05.18.06.01.36;	author jlam;	state Exp;
branches;
next	1.30;

1.30
date	2001.05.08.17.28.09;	author jlam;	state Exp;
branches;
next	1.29;

1.29
date	2001.04.29.21.21.13;	author jlam;	state Exp;
branches;
next	1.28;

1.28
date	2001.04.14.19.50.05;	author kim;	state Exp;
branches;
next	1.27;

1.27
date	2001.04.14.19.42.54;	author kim;	state Exp;
branches;
next	1.26;

1.26
date	2001.03.01.04.03.08;	author itojun;	state Exp;
branches;
next	1.25;

1.25
date	2001.02.17.17.21.54;	author wiz;	state Exp;
branches;
next	1.24;

1.24
date	2001.02.06.12.55.42;	author itojun;	state Exp;
branches;
next	1.23;

1.23
date	2001.02.06.12.50.19;	author itojun;	state Exp;
branches;
next	1.22;

1.22
date	2001.02.06.12.43.06;	author itojun;	state Exp;
branches;
next	1.21;

1.21
date	2001.02.06.10.58.18;	author itojun;	state Exp;
branches;
next	1.20;

1.20
date	2001.01.15.11.43.59;	author itojun;	state Exp;
branches;
next	1.19;

1.19
date	2000.11.14.19.58.05;	author itojun;	state Exp;
branches;
next	1.18;

1.18
date	2000.09.20.05.14.12;	author jlam;	state Exp;
branches;
next	1.17;

1.17
date	2000.09.08.11.42.43;	author itojun;	state Exp;
branches;
next	1.16;

1.16
date	2000.08.28.09.14.52;	author jlam;	state Exp;
branches;
next	1.15;

1.15
date	2000.08.15.10.31.24;	author itojun;	state Exp;
branches;
next	1.14;

1.14
date	2000.03.27.08.55.00;	author tron;	state Exp;
branches;
next	1.13;

1.13
date	2000.02.22.17.43.23;	author veego;	state Exp;
branches;
next	1.12;

1.12
date	2000.02.21.07.14.44;	author itojun;	state Exp;
branches;
next	1.11;

1.11
date	2000.02.20.22.05.42;	author wiz;	state Exp;
branches;
next	1.10;

1.10
date	2000.02.05.14.01.12;	author wiz;	state Exp;
branches;
next	1.9;

1.9
date	2000.01.26.16.04.18;	author wiz;	state Exp;
branches;
next	1.8;

1.8
date	99.09.21.15.12.03;	author jdolecek;	state Exp;
branches;
next	1.7;

1.7
date	99.09.03.22.00.53;	author tron;	state Exp;
branches;
next	1.6;

1.6
date	99.09.01.09.00.26;	author itojun;	state Exp;
branches;
next	1.5;

1.5
date	99.09.01.07.41.01;	author itojun;	state Exp;
branches;
next	1.4;

1.4
date	99.08.18.09.24.09;	author agc;	state Exp;
branches;
next	1.3;

1.3
date	99.08.18.08.29.11;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	99.07.23.18.19.29;	author itojun;	state Exp;
branches;
next	1.1;

1.1
date	99.07.23.17.53.29;	author itojun;	state Exp;
branches
	1.1.1.1;
next	;

1.90.2.1
date	2004.11.27.16.51.06;	author salo;	state dead;
branches;
next	;

1.55.4.1
date	2002.10.23.20.52.11;	author agc;	state Exp;
branches;
next	;

1.49.2.1
date	2002.06.23.19.03.34;	author jlam;	state Exp;
branches;
next	1.49.2.2;

1.49.2.2
date	2002.06.30.06.24.31;	author jlam;	state Exp;
branches;
next	1.49.2.3;

1.49.2.3
date	2002.08.25.21.22.09;	author jlam;	state Exp;
branches;
next	;

1.1.1.1
date	99.07.23.17.53.29;	author itojun;	state Exp;
branches;
next	;


desc
@@


1.94
log
@Remove apache6 -- there have been no updates since 1.3.29 (over
a year now) but quite a number of vulnerabilities.
Ok'd by agc.
@
text
@# $NetBSD: Makefile,v 1.93 2004/11/22 20:59:57 wiz Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
#
# IPv6-enable patch conflicts with third-party modules anyway, due to
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)

DISTNAME=		apache_${APACHE_VERSION}
PKGNAME=		apache6-${APACHE_VERSION}
APACHE_VERSION=		1.3.29
PKGREVISION=		#1
CATEGORIES=		www
MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
			${MASTER_SITE_APACHE:=httpd/old/}
DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO}

PATCH_SITES+=		http://www.tendra.org/~asmodai/ipv6/
PATCHFILES+=		apache-1.3.29-v6-20031028.diff.gz

NETBSD_LOGO=		sitedrivenby.gif
SITES_${NETBSD_LOGO}=	# defined

MAINTAINER=		tech-pkg@@NetBSD.org
HOMEPAGE=		http://httpd.apache.org/
COMMENT=		Apache HTTP (Web) server with IPv6 support

CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*

EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
USE_BUILDLINK3=		YES
USE_PKGINSTALL=		YES
HAS_CONFIGURE=		YES
CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+=	--enable-module=most \
			--enable-module=auth_db \
			--enable-module=so \
			--disable-module=auth_dbm \
			--enable-rule=INET6
# proxy module is broken with the IPv6 patch
CONFIGURE_ARGS+=	--disable-module=proxy
CONFIGURE_ARGS+=	--without-confadjust
CONFIGURE_ARGS+=	--with-perl=${PERL5}
CONFIGURE_ARGS+=	--with-port=80
CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_PREFIX.libmm}"

BUILD_DEFS+=		USE_INET6

.include "../../mk/bsd.prefs.mk"

.if !defined(USE_INET6) || ${USE_INET6} != YES
PKG_FAIL_REASON=	"IPv6 only build"
.endif

.if empty(STRIPFLAG)
CONFIGURE_ARGS+=	--without-execstrip
.endif

PKG_SYSCONFSUBDIR?=	httpd

APACHE_USER?=		www
APACHE_GROUP?=		www
BUILD_DEFS+=		APACHE_USER
BUILD_DEFS+=		APACHE_GROUP

CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}

.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
APACHE_SUEXEC_DOCROOT?=	${PREFIX}/share/httpd/htdocs
APACHE_SUEXEC_PATH=	/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
APACHE_SUEXEC_CONFIGURE_ARGS+=						\
			--suexec-caller=${APACHE_USER}			\
			--suexec-safepath='${APACHE_SUEXEC_PATH}'	\
			--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
CONFIGURE_ARGS+=	--enable-suexec 				\
			${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
PLIST_SRC=		${PKGDIR}/PLIST.suexec
BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
.endif

# Note that there is NO static compile module hook here.  This is intentional.
# Under Apache 1.3, modules can be compiled to link dynamically to the server
# using the "apxs" program.  See apxs(8).

PLIST_SRC+=		${PKGDIR}/PLIST

.if defined(NOPIC)
PLIST_SUBST+=		SHLIBS="@@comment "
.else
PLIST_SUBST+=		SHLIBS=""
.endif

APACHE_CUSTOM_CFLAGS?=	# empty

.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
.endif

# Explicitly turn on large file support
APACHE_CUSTOM_CFLAGS+=	-D_LARGEFILE_SOURCE
APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64

.include "../../mk/compiler.mk"

# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
# certain symbols from the C++ implementation (__get_eh_context, etc.)
# referenced by DSOs written in C++ will resolve correctly.
#
.if ${OPSYS} == "NetBSD"
.  if ${OBJECT_FMT} == "ELF"
LINK_LIBGCC_LDFLAGS=	${LINK_ALL_LIBGCC_HACK}
MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
# if we are using gcc3, we need to link against libgcc_s, too. This
# ensures modules can resolve symbols they require from gcc.
.    if !empty(CC_VERSION:Mgcc-3*)
USE_GCC_SHLIB=		# defined
LINK_LIBGCC_LDFLAGS+=	-lgcc_s
.    endif
.  endif
.endif

# Use operating system's db1 functions (where available)
USE_DB185=		yes

.include "../../databases/db/buildlink3.mk"
BUILDLINK_DEPENDS.db2=	db>=2.7.7

.if defined(BUILDLINK_PREFIX.db_DEFAULT)
CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"

# on Solaris, we also need libdbm
.  if ${OPSYS} == "SunOS"
CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
LDFLAGS+=		${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib
.  else
CONFIGURE_ENV+=		LIBS="-ldb2"
.  endif
.endif

BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
BUILD_DEFS+=		APACHE_PERF_TUNING
BUILD_DEFS+=		APACHE_SUEXEC

PKG_GROUPS=		${APACHE_GROUP}
PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user

EGDIR=		${PREFIX}/share/examples/httpd

CONF_FILES=	${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
SUPPORT_FILES=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
SUPPORT_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
RCD_SCRIPTS=	apache

OWN_DIRS+=		${PREFIX}/lib/httpd
OWN_DIRS+=		/var/httpd
OWN_DIRS+=		/var/log/httpd

pre-patch:
	@@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f

post-patch:
	@@cd ${WRKSRC}/src/support;					\
	${SED}	-e "s|@@INSTALL@@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
		apxs.pl > apxs.pl.sed;					\
	${MV} apxs.pl.sed apxs.pl
	@@cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
	@@${SED}	-e "s|#Listen ::|Listen ::|"				\
		-e "s|#Listen 0.0.0.0|Listen 0.0.0.0|"			\
		${WRKSRC}/conf/httpd.conf-dist-				\
		> ${WRKSRC}/conf/httpd.conf-dist

pre-configure:
	@@${SED} ${FILES_SUBST_SED}					\
		${FILESDIR}/config.layout > ${WRKDIR}/config.layout

pre-install:
	@@${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f

post-install:
	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
	for file in httpd.conf magic mime.types; do			\
		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default	\
			${PREFIX}/share/examples/httpd;			\
		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
	done
	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
	${CHMOD} ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/printenv \
	  ${PREFIX}/libexec/cgi-bin/test-cgi

.include "../../devel/libmm/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"

.include "../../mk/bsd.pkg.mk"
@


1.93
log
@Fix variable name.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.92 2004/10/06 23:27:19 heinz Exp $
@


1.92
log
@Provide a value 'yes' for USE_DB185. This lets p5-DB_File find the
correct libraries to link with db3 and db4.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.91 2004/10/03 00:18:24 tv Exp $
d129 1
a129 1
BUILDLINK_DEPENDS.db=	db>=2.7.7
@


1.91
log
@Libtool fix for PR pkg/26633, and other issues.  Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
d126 1
a126 1
USE_DB185=		# defined
@


1.90
log
@Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.89 2004/04/30 05:25:59 snj Exp $
d12 1
a12 1
PKGREVISION=		#
@


1.90.2.1
log
@Pullup ticket 160 - requested by Thomas Klausner
remove apache6 package

removed from -current because of too many vulnerabilities and no newer
version available (people are expected to switch to apache2).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
@


1.89
log
@Convert to buildlink3.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.88 2004/02/18 13:33:41 jlam Exp $
d137 1
a137 1
LDFLAGS+=		-Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
@


1.88
log
@Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.87 2004/02/09 19:57:55 jlam Exp $
d31 1
a31 1
USE_BUILDLINK2=		YES
d128 1
a128 1
.include "../../databases/db/buildlink2.mk"
d193 2
a194 2
.include "../../devel/libmm/buildlink2.mk"
.include "../../textproc/expat/buildlink2.mk"
@


1.87
log
@USE_GCC[23], USE_SUNPRO, and USE_MIPSPRO are all deprecated.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.86 2003/11/02 09:35:12 cube Exp $
d106 2
@


1.86
log
@Update apache6 to 1.3.29 + ipv6 patch.

Major changes since 1.3.28:

  Security vulnerabilities

     * CAN-2003-0542 (cve.mitre.org)
       Fix buffer overflows in mod_alias and mod_rewrite which occurred if
       one configured a regular expression with more than 9 captures.

  Bugs fixed

   The following noteworthy bugs were found in Apache 1.3.28 (or earlier)
   and have been fixed in Apache 1.3.29:

     * Within ap_bclose(), ap_pclosesocket() is now called
     * consistently
       for sockets and ap_pclosef() for files.  Also, closesocket()
       is used consistenly to close socket fd's.  The previous
       confusion between socket and file fd's would cause problems
       with some applications now that we proactively close fd's to
       prevent leakage.

     * Fixed mod_usertrack to not get false positive matches on the
       user-tracking cookie's name.

     * Prevent creation of subprocess Zombies when using CGI wrappers
       such as suEXEC and cgiwrap.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.85 2003/10/29 10:45:26 cube Exp $
d116 1
a116 1
.    if defined(USE_GCC3)
@


1.85
log
@Import security fix from 1.3.29 distribution for a buffer overflow in
mod_rewrite and mod_alias, referenced CAN-2003-0542. Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.84 2003/10/18 13:08:49 cjep Exp $
d11 2
a12 2
APACHE_VERSION=		1.3.28
PKGREVISION=		2
d19 1
a19 1
PATCHFILES+=		apache-1.3.28-v6-20030912.diff.gz
@


1.84
log
@Whitespace fixes
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.83 2003/10/11 13:40:20 grant Exp $
d12 1
a12 1
PKGREVISION=		1
@


1.83
log
@bump PKGREVISIONs after bump of expat BUILDLINK_DEPENDS.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.82 2003/09/19 11:57:51 agc Exp $
d22 1
a22 1
SITES_${NETBSD_LOGO}=	
@


1.82
log
@Revert version 1.81, as the mods it contained weren't necessary.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $
d12 1
@


1.81
log
@get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or
USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.80 2003/09/13 23:37:06 itojun Exp $
a10 2
<<<<<<< Makefile
#PKGREVISION=		3
a11 3
=======
APACHE_VERSION=		1.3.28
>>>>>>> 1.79
@


1.80
log
@new v6 patch (small bug fix)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.79 2003/09/12 08:26:44 itojun Exp $
d11 2
d14 3
@


1.79
log
@upgrade to 1.3.28 + IPv6 patch.

This version of Apache is principally a security and bug fix release.
Of particular note is that 1.3.28 addresses and fixes the following
issues:  CAN-2003-0460 (cve.mitre.org) (rotatelogs bug), VU#379828
(infinite loop potential), and file descriptor leakage .
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.78 2003/07/30 01:53:15 grant Exp $
d18 1
a18 1
PATCHFILES+=		apache-1.3.28-v6-20030911.diff.gz
@


1.78
log
@fix cut and pasto introduced in rev 1.66 (USE_DB185).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.77 2003/07/17 22:55:28 grant Exp $
d11 1
a11 2
PKGREVISION=		3
APACHE_VERSION=		1.3.27
d14 2
a15 4
			${MASTER_SITE_APACHE:=httpd/old/} \
			http://www.NetBSD.org/images/logos/
DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
			sitedrivenby.gif
d17 5
a21 4
PATCH_SITES+=		${MASTER_SITE_LOCAL}
PATCHFILES+=		${IPV6_PATCH}
IPV6_PATCH=		apache-1.3.26-ipv6.diff.gz
PATCH_DIST_STRIP=	-p1
@


1.77
log
@s/netbsd.org/NetBSD.org/
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.76 2003/06/06 19:33:12 drochner Exp $
d125 2
@


1.76
log
@replace ${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG} by just
${LINK_ALL_LIBGCC_HACK}
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.75 2003/06/02 01:16:08 jschauma Exp $
d16 1
a16 1
			http://www.netbsd.org/images/logos/
d25 1
a25 1
MAINTAINER=		tech-pkg@@netbsd.org
@


1.75
log
@Use tech-pkg@@ in favor of packages@@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.74 2003/05/31 15:03:18 grant Exp $
d113 1
a113 1
LINK_LIBGCC_LDFLAGS=	${WHOLE_ARCHIVE_FLAG} -lgcc ${NO_WHOLE_ARCHIVE_FLAG}
@


1.74
log
@tidy up logic for adding libgcc and libgcc_s. no functional change.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.73 2003/05/31 13:32:49 grant Exp $
d25 1
a25 1
MAINTAINER=		packages@@netbsd.org
@


1.73
log
@for consistency, use WHOLE_ARCHIVE_FLAG instead of
-Wl,--whole-archive.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.72 2003/05/31 13:30:30 grant Exp $
d111 2
a112 1
.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
d114 1
a114 2
.endif

d117 1
a117 1
.if defined(USE_GCC3)
d120 2
a122 2

MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
@


1.72
log
@drop some unnecessary parens
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.71 2003/05/31 13:29:21 grant Exp $
d112 1
a112 1
LINK_LIBGCC_LDFLAGS=	-Wl,--whole-archive -lgcc -Wl,--no-whole-archive
@


1.71
log
@link against shared libgcc_s when built with gcc3 so Apache modules
can resolve the required symbols.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.70 2003/04/15 01:39:15 grant Exp $
d111 1
a111 1
.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
@


1.70
log
@be quiet in all targets except post-install.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.69 2003/03/14 19:38:00 jlam Exp $
d113 9
a122 1
.endif
@


1.69
log
@(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
    Makefiles simply need to use this value often, for better or for
    worse.

(2) Create a new variable FIX_RPATH that lists variables that should
    be cleansed of -R or -rpath values if ${_USE_RPATH} is "no".  By
    default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
    additional variables may be appended from package Makefiles.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.68 2003/02/23 15:55:58 jmmv Exp $
d151 1
a151 1
	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
d154 1
a154 1
	cd ${WRKSRC}/src/support;					\
d158 2
a159 2
	cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
	${SED}	-e "s|#Listen ::|Listen ::|"				\
d169 1
a169 1
	${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
@


1.68
log
@Use MASTER_SITE_APACHE.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.67 2003/01/28 22:04:27 jlam Exp $
d126 1
a126 1
LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
@


1.67
log
@Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.66 2002/12/22 13:04:40 grant Exp $
d14 2
a15 2
MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
			http://www.apache.de/dist/httpd/ \
@


1.66
log
@Revert to previous behavior and use db1 functions in libc if they are
present, rather than installing databases/db (affects NetBSD, Linux,
Darwin and possibly others).

As suggested by Kimmo Suominen.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.65 2002/12/19 14:20:09 grant Exp $
d33 1
a184 1
.include "../../mk/bsd.pkg.install.mk"
@


1.65
log
@- Tidy up conditional use of databases/db/buildlink2.mk.
- Add libmm support as per apache pkg.

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.64 2002/12/07 02:39:06 schmonz Exp $
d115 1
d118 2
a120 1
CONFIGURE_ENV+=		LIBS="-ldb2"
d122 3
a124 1
.if ${OPSYS} == "SunOS"
d126 3
a128 1
CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
@


1.64
log
@Replace IGNORE with PKG_FAIL_REASON or PKG_SKIP_REASON as appropriate.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.63 2002/11/19 09:35:27 martti Exp $
d11 1
a11 1
PKGREVISION=		2
d46 1
d115 6
a120 1
.if (${OPSYS} == "SunOS")
a121 1
CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
a122 2
BUILDLINK_DEPENDS.db=	db>=2.7.7
.include "../../databases/db/buildlink2.mk"
d175 1
@


1.63
log
@Pullup revisions 1.114 and 1.115 from www/apache/Makefile:

Use "${NONBINMODE}" instead of mode "0" so that "pkg_admin check" still
works for a normal user. Also invoke "chmod" only once because fork()
and exec() is expensive on certain platforms.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.62 2002/11/18 08:19:55 martti Exp $
d52 1
a52 1
IGNORE=			"IPv6 only build"
@


1.62
log
@Fix chmod (PR#19093 by Adrian Portelli). Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.61 2002/11/15 10:40:45 martti Exp $
d169 2
a170 2
	${CHMOD} 0 ${PREFIX}/libexec/cgi-bin/printenv
	${CHMOD} 0 ${PREFIX}/libexec/cgi-bin/test-cgi
@


1.61
log
@Updated apache6 to 1.3.27nb1

chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.60 2002/11/15 09:08:07 martti Exp $
d11 1
a11 1
PKGREVISION=		1
d169 2
a170 1
	${CHMOD} 0 libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi
@


1.60
log
@chmod 0 libexec/cgi-bin/{printenv,test-cgi} (to make nessus happy).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.59 2002/10/06 12:49:59 tron Exp $
d11 1
@


1.59
log
@Update "apache6" package to version 1.3.27. This version fixes many bugs
discovered in version 1.3.26 including these security fixes:
- SECURITY: CAN-2002-0840 (cve.mitre.org)
  Prevent a cross-site scripting vulnerability in the default
  error page.  The issue could only be exploited if the directive
  UseCanonicalName is set to Off and a server is being run at
  a domain that allows wildcard DNS.  [Matthew Murphy]
- SECURITY CAN-2002-0843 (cve.mitre.org)
  Fix some possible overflows in ab.c that could be exploited by
  a malicious server. Reported by David Wagner. [Jim Jagielski]
- SECURITY CAN-2002-0839 (cve.mitre.org)
  Add the new directive 'ShmemUIDisUser'. By default, Apache
  will no longer set the uid/gid of SysV shared memory scoreboard
  to User/Group, and it will therefore stay the uid/gid of
  the parent Apache process. This is actually the way it should
  be, however, some implementations may still require this, which
  can be enabled by 'ShmemUIDisUser On'.  Reported by iDefense.
  [Jim Jagielski]
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.58 2002/09/26 01:50:23 grant Exp $
d168 1
@


1.58
log
@Explicitly turn on large file support, as some Apache modules have
problems when it is not enabled, notably mod_perl. Fixes pkg/18070
from myself, ok'd by wiz.

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.57 2002/09/19 09:04:30 jlam Exp $
a7 1
#
d11 1
a11 2
APACHE_VERSION=		1.3.26
PKGREVISION=		3
d19 1
a19 1
PATCH_SITES+=		http://www.ipng.nl/
d24 1
a24 1
MAINTAINER=		itojun@@netbsd.org
@


1.57
log
@Take advantage of the auto-generation and installation of rc.d scripts.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $
d13 1
a13 1
PKGREVISION=		2
d101 4
@


1.56
log
@Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.49.2.3 2002/08/25 21:22:09 jlam Exp $
a156 1
	@@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
a165 1
	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
@


1.55
log
@Crank libmm dependency versions and dependent pkg revisions.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.54 2002/07/30 18:40:15 wiz Exp $
d33 1
a33 1
USE_BUILDLINK_ONLY=	YES
d113 1
a113 1
CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_DIR}/include/db2"
d116 1
a116 1
.include "../../databases/db/buildlink.mk"
d169 2
a170 1
.include "../../textproc/expat/buildlink.mk"
@


1.55.4.1
log
@Update the apache6 package on the netbsd-1-6 pkgsrc branch to version
1.3.27, thereby including the security fix.

Pull up versions:

Makefile 1.59
PLIST 1.5
distinfo 1.14

Requested by Manuel Bouyer.
Tested by Feico Dillema on www2.no.netbsd.org
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.55 2002/08/01 00:58:33 mycroft Exp $
d8 1
d12 2
a13 1
APACHE_VERSION=		1.3.27
d21 1
a21 1
PATCH_SITES+=		${MASTER_SITE_LOCAL}
d26 1
a26 1
MAINTAINER=		packages@@netbsd.org
@


1.54
log
@Update apache packages with some common changes:
Give Apache a user and group by default, not only with suexec.
The variables for this have changed from APACHE_SUEXEC_USER and
APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP.
Mention 'Apache' in COMMENT.
Use variables for the version number instead of copying it around.
Bump PKGREVISION.

For apache{,6}:
Change paths to /var/httpd instead of /var/spool/httpd.
Honour STRIPFLAG.
Add --without-confadjust as configure argument.
Enable the 'define' module.

For apache:
Enable proxy module on NOPIC platforms.

Some of these changes are based on pkg/17469 by Greg A. Woods, some on
comments by Johnny Lam.

Reviewed by Johnny Lam.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.53 2002/06/21 23:22:47 itojun Exp $
d13 1
a13 1
PKGREVISION=		1
@


1.53
log
@correct wrong use of MASTER_SITES (should be PATCH_SITES).
From: Dawid Szymanski <dawszy@@tgr.lubin.edu.pl>
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.52 2002/06/20 22:20:09 itojun Exp $
d10 4
a13 2
DISTNAME=		apache_1.3.26
PKGNAME=		apache6-1.3.26
d28 1
a28 1
COMMENT=		HTTP (Web) server with IPv6 support
d30 1
a30 1
CONFLICTS=		apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]*
d43 1
d56 4
d62 8
a70 1
APACHE_SUEXEC_USER?=	www
d74 1
a74 1
			--suexec-caller=${APACHE_SUEXEC_USER}		\
a79 1
PKG_USERS=		${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user
d89 6
d123 3
d133 3
a135 2
OWN_DIRS=		/var/log/httpd
OWN_DIRS+=		/var/spool/httpd
@


1.52
log
@don't chown share/httpd blindly.  sync w/ www/apache
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.51 2002/06/20 09:45:27 itojun Exp $
d19 1
a19 1
MASTER_SITES+=		http://www.ipng.nl/
@


1.51
log
@enable mod_so for use with php.  From: Dawid Szymanski <dawszy@@tgr.lubin.edu.pl>
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.50 2002/06/20 07:24:17 itojun Exp $
a144 1
	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
@


1.50
log
@apache with IPv6 patch, for 1.3.26.
proxy module was disabled as the IPv6 patch for the module is broken.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.49 2001/12/26 21:20:27 jlam Exp $
d35 2
a36 1
			--enable-module=auth_db	\
d39 1
@


1.49
log
@(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain
    --suexec-* configure options that are passed directly to the Apache
    configure script.  This may be used to tune the suEXEC configuration
    in more restrictive ways, e.g. --suexec-uidmin=1000.  This solution
    is more open-ended than the fix proposed in pkg/14973.  Also, we
    don't duplicate all of the options from the Apache configure script
    in pkgsrc bsd.pkg.defaults.mk.  This closes pkg/14973 by Eric
    Schnoebelen <eric@@cirr.com>

(2) For namespace consistency, deprecate APACHE_USER in favor of
    APACHE_SUEXEC_USER.  Move APACHE_USER into bsd.pkg.obsolete.mk.

(3) Create the suEXEC user when the functionality is enabled in the server
    so that CGI scripts will work properly.  This closes pkg/14903 by
    Wojciech Puchar <wojtek@@3miasto.net>
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.48 2001/12/02 06:56:45 jlam Exp $
d10 2
a11 3
DISTNAME=		apache_1.3.22
PKGNAME=		apache6-1.3.22
PKGREVISION=		1
d19 4
a22 3
MASTER_SITES+=		ftp://ftp.piuha.net/pub/misc/
DISTFILES+=		${IPV6_PATCH}
IPV6_PATCH=		apache-1.3.22-v6-20011123.diff.gz
a32 1
CONFIGURE_SCRIPT=	${WRKSRC}/configure.v6
d34 5
a38 3
CONFIGURE_ARGS+=	--enable-module=most				\
			--enable-module=auth_db				\
			--disable-module=auth_dbm
a71 8
.if !defined(NOPIC)
CONFIGURE_ARGS+=	--enable-module=so	# requires dlopen()
CONFIGURE_ARGS+=	--enable-shared=proxy
PLIST_SRC+=		${PKGDIR}/PLIST.shared
.else
CONFIGURE_ARGS+=	--disable-module=proxy
.endif

a110 1
OWN_DIRS_PERMS+=	/var/spool/httpd/proxy nobody nobody 0755
a119 7

	for file in ${IPV6_PATCH}; do					\
		${GZCAT} ${_DISTDIR}/$${file} |				\
		    ${PATCH} ${PATCH_DIST_ARGS}				\
		    || ( ${ECHO} "Patch $${file} failed" ; exit 1 ) ;	\
	done
	${CHMOD} +x ${CONFIGURE_SCRIPT}
a134 3
.if !defined(NOPIC)
	cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
.endif
@


1.49.2.1
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.53 2002/06/21 23:22:47 itojun Exp $
d10 3
a12 2
DISTNAME=		apache_1.3.26
PKGNAME=		apache6-1.3.26
d20 3
a22 4
PATCH_SITES+=		http://www.ipng.nl/
PATCHFILES+=		${IPV6_PATCH}
IPV6_PATCH=		apache-1.3.26-ipv6.diff.gz
PATCH_DIST_STRIP=	-p1
d33 1
d35 3
a37 7
CONFIGURE_ARGS+=	--enable-module=most \
			--enable-module=auth_db \
			--enable-module=so \
			--disable-module=auth_dbm \
			--enable-rule=INET6
# proxy module is broken with the IPv6 patch
CONFIGURE_ARGS+=	--disable-module=proxy
d71 8
d118 1
d128 7
d150 3
d161 1
@


1.49.2.2
log
@Convert to use the buildlink2 framework.  Trim any unnecessary changes in
the patches or remove them entirely.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.49.2.1 2002/06/23 19:03:34 jlam Exp $
d31 1
a31 1
USE_BUILDLINK2=		YES
d94 1
a94 1
CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
d97 1
a97 1
.include "../../databases/db/buildlink2.mk"
d146 1
a146 2
.include "../../textproc/expat/buildlink2.mk"

@


1.49.2.3
log
@Merge changes in the main trunk into the buildlink2 branch for those
packages that have been converted to USE_BUILDLINK2.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.49.2.2 2002/06/30 06:24:31 jlam Exp $
d10 2
a11 4
DISTNAME=		apache_${APACHE_VERSION}
PKGNAME=		apache6-${APACHE_VERSION}
APACHE_VERSION=		1.3.26
PKGREVISION=		2
d26 1
a26 1
COMMENT=		Apache HTTP (Web) server with IPv6 support
d28 1
a28 1
CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
a40 1
CONFIGURE_ARGS+=	--without-confadjust
a52 4
.if empty(STRIPFLAG)
CONFIGURE_ARGS+=	--without-execstrip
.endif

a54 8
APACHE_USER?=		www
APACHE_GROUP?=		www
BUILD_DEFS+=		APACHE_USER
BUILD_DEFS+=		APACHE_GROUP

CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}

d56 1
d60 1
a60 1
			--suexec-caller=${APACHE_USER}			\
d66 1
a75 6
.if defined(NOPIC)
PLIST_SUBST+=		SHLIBS="@@comment "
.else
PLIST_SUBST+=		SHLIBS=""
.endif

a103 3
PKG_GROUPS=		${APACHE_GROUP}
PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user

d111 2
a112 3
OWN_DIRS+=		${PREFIX}/lib/httpd
OWN_DIRS+=		/var/httpd
OWN_DIRS+=		/var/log/httpd
@


1.48
log
@bsd.pkg.install.mk calls the INSTALL script at the right times
automatically, so no need to do it ourselves.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.47 2001/11/29 01:12:51 hubertf Exp $
d53 7
a59 3
APACHE_USER?=		www
APACHE_SUEXEC_DOCROOT?=	${LOCALBASE}/share/httpd/htdocs
SUEXEC_PATH=		/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
d61 1
a61 3
			--suexec-caller=${APACHE_USER}			\
			--suexec-safepath='${SUEXEC_PATH}'		\
			--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
d63 2
a64 1
BUILD_DEFS+=		APACHE_USER APACHE_SUEXEC_DOCROOT
d142 1
a142 1
	${SED} ${FILES_SUBST_SED}					\
d147 1
a147 1
	${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
@


1.47
log
@Get rid of manually adding "nbX" to PKGNAME when a pkg was changed in
pkgsrc. Instead, a new variable PKGREVISION is invented that can get
bumped independent of DISTNAME and PKGNAME.

Example #1:
        DISTNAME=       foo-X.Y
        PKGREVISION=    Z
     => PKGNAME=        foo-X.YnbZ

Example #2:
        DISTNAME=       barthing-X.Y
        PKGNAME=        bar-X.Y
        PKGREVISION=    Z
     => PKGNAME=        bar=X.YnbZ (!)

On subsequent changes, only PKGREVISION needs to be bumped, no more risk
of getting DISTNAME changed accidentally.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $
a158 1
	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
@


1.46
log
@PKG_SYSCONFDIR is where the configuration files for a package may be found.
This value may be customized in various ways:

PKG_SYSCONFBASE is the main config directory under which all package
	configuration files are to be found.

PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
	configuration files for a particular package may be found.

PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
	particular package.

Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
default location of ${PREFIX}/etc.

This obsoletes the use of CONFDIR, which was active for only 6 days, so no
need to have a workaround to still accept old CONFDIR settings.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.45 2001/11/23 10:52:21 martti Exp $
d11 2
a12 1
PKGNAME=		apache6-1.3.22nb1
@


1.45
log
@Use the latest IPv6 patch for apache-1.3.22 (which adds just #define APACHE6 1
into httpd.h) so that apache6 can be use together with ap-perl.

This is part 1 of 2 to fix PR#14693 by Tero Kivinen
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.44 2001/11/21 15:44:24 jlam Exp $
d49 1
a49 3
APACHE_SYSCONFDIR?=	${CONFDIR}/httpd
BUILD_DEFS+=		APACHE_SYSCONFDIR
FILES_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
d107 3
a109 3
CONF_FILES=	${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf
SUPPORT_FILES=	${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic
SUPPORT_FILES+=	${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types
a111 1
MAKE_DIRS=		${APACHE_SYSCONFDIR}
d151 1
a151 1
		${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default	\
d153 1
a153 1
		${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default;		\
@


1.44
log
@RCD_SCRIPTS now just lists the filenames (see bsd.pkg.install.mk).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.43 2001/11/19 16:23:13 jlam Exp $
d11 1
a11 1
PKGNAME=		apache6-1.3.22
d21 1
a21 1
IPV6_PATCH=		apache-1.3.22-v6-20011017.diff.gz
@


1.43
log
@Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in
bsd.pkg.install.mk:

	* Remove old DEINSTALL/INSTALL scripts.
	* Move some text printed at POST-INSTALL time into the MESSAGE file.
	* Adjust rc.d scripts to respect rc.conf settings, so that the
	  script may be directly copied into /etc/rc.d.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.42 2001/10/22 18:10:28 jlam Exp $
d112 1
a112 1
RCD_SCRIPTS=	${PREFIX}/etc/rc.d/apache /etc/rc.d/apache
@


1.42
log
@Minimize the diffs between the apache and apache6 packages:

- Whitespace changes to Makefile
- From the commit log for apache/Makefile:

Don't do the dance with ROOT_GROUP.  Apache extension modules installed by
apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}",
which should do the right thing regardless of the platform.  ${INSTALL} is
replaced with the full path to the install program used by pkgsrc, which
should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris.

This should fix pkg/14232 by Pierre Bourgin.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.41 2001/10/20 17:46:50 jlam Exp $
d49 1
a49 1
APACHE_SYSCONFDIR?=	${LOCALBASE}/etc/httpd
d51 1
d107 1
a107 2
DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
INSTALL_FILE=		${WRKDIR}/INSTALL
d109 9
a117 14
# Given foo=${bar}, replace @@foo@@ with ${bar}.
#
FILES_SUBST=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
FILES_SUBST+=		CAT=${CAT:Q}
FILES_SUBST+=		CHMOD=${CHMOD:Q}
FILES_SUBST+=		CHOWN=${CHOWN:Q}
FILES_SUBST+=		CMP=${CMP:Q}
FILES_SUBST+=		CP=${CP:Q}
FILES_SUBST+=		MKDIR=${MKDIR:Q}
FILES_SUBST+=		PREFIX=${PREFIX}
FILES_SUBST+=		RM=${RM:Q}
FILES_SUBST+=		RMDIR=${RMDIR:Q}
FILES_SUBST+=		TRUE=${TRUE:Q}
FILES_SUBST_SED=	${FILES_SUBST:S/=/@@!/:S/$/!g/:S/^/-e s!@@/}
a146 2
	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
d164 1
@


1.41
log
@Only link -lgcc whole-archive on NetBSD ELF platforms, to allow a.out
platforms to correctly links this package.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.40 2001/10/17 19:27:27 jlam Exp $
d64 4
a123 4
# Note that there is NO static compile module hook here.  This is intentional.
# Under Apache 1.3, modules can be compiled to link dynamically to the server
# using the "apxs" program.  See apxs(8).

d128 5
d140 4
a143 2
	${SED} -e 's/#Listen ::/Listen ::/' -e 's/#Listen 0.0.0.0/Listen 0.0.0.0/' \
	    <${WRKSRC}/conf/httpd.conf-dist- >${WRKSRC}/conf/httpd.conf-dist
d167 1
@


1.40
log
@Make this look more like the apache Makefile:

* Buildlinkify
* Use pkgsrc expat so that there are no symbol conflicts when an expat XML
  parser is loaded by a DSO.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.39 2001/10/17 07:47:52 martti Exp $
d81 3
a83 3
# On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
# from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
# written in C++ will resolve correctly.
d85 1
a85 1
.if (${OPSYS} == "NetBSD")
@


1.39
log
@- Updated to Apache 1.3.22
- Updated the IPv6 patch

Apache 1.3.20 - 1.3.22 Major changes

  Security vulnerabilities

     * A vulnerability was found in the Win32 port of Apache 1.3.20.  A
       client submitting a very long URI could cause a directory listing
       to be returned rather than the default index page. A 403 Forbidden
       will now be returned.  CAN-2001-0729
     * A vulnerability was found in the split-logfile support program. A
       request with a specially crafted Host: header could allow any file
       with a .log extension on the system to be written to. PR#7848
       CAN-2001-0730
     * A vulnerability was found when Multiviews are used to negotiate
       the directory index. In some configurations, requesting a URI with
       a QUERY_STRING of M=D could return a directory listing rather than
       the expected index page.  CAN-2001-0731

     The security issues above have been assigned standardized names, CAN-
     by the Common Vulnerabilities and Exposures project (cve.mitre.org)

  New features

   The main new features in 1.3.22 (compared to 1.3.20) are:
     * The user manual has been updated. As well as a number of small
       fixes these updates include new translations into French and
       Japanese, a guide to using Apache httpd on Cygwin, a lexicon of
       Apache error messages, updated TPF documentation, and a
       comprehensive guide to using log files
     * The user manual can now be moved out of the htdocs DocumentRoot
       during installation by invoking configure with the --manualdir=
       switch, to allow separation of on-line docs from regular contents.
     * The supplied icons are now also distributed in PNG format
     * A significant overhaul to the Apache Bench program, ab has taken
       place, as first reported in April. The new Apache Bench includes
       fixes, additional statistics, csv and gnuplot output, and some
       SSL support
     * New directives have been added to the mod_usertrack module, The
       first, CookieDomain, can be used to customise the Domain
       attribute.  The patch to add the CookieDomain directive was first
       submitted over two years ago. Historically mod_usertrack has used
       the obsolete Netscape cookie syntax. The new CookieStyle directive
       allows use of the RFC2109 or RFC2965 syntax instead. PR#5023,
       PR#5920, PR#6140.
     * The server will now display a warning if line-end comments (#) are
       found in the configuration file. Not all directives are able to
       handle comments on the same line
     * A new directive, AcceptMutex, allows run-time configuration of the
       mutex type used for accept serialization, currently a compile-time
       only setting in 1.3. Since different types of mutex have different
       performance characteristics on different platforms, this directive
       will allow administrators to tune their Apache server more easily.
       The current list of possible methods is: uslock, pthread, sysvsem,
       fcntl, flock, os2sem, tpfcore, none. Not all platforms support all
       methods
     * mod_auth has been enhanced to allow access to a document to be
       controlled based on the owner of the file being served. Require
       file-owner will only allow files to be served where the
       authenticated username matches the user that owns the document.
       Require file-group works in a similar way checking that the group
       matches

   New features that relate to specific platforms:
     * A new directive, AcceptFilter, has been added to control BSD
       accept filters at run-time.  This should make it easier to move
       server binaries across different BSD machines without requiring
       recompilation.  Support for accept filters was first added to
       version 1.3.14, the functionality can postpone the requirement for
       a child process to handle a new connection until an HTTP request
       has arrived, therefore increasing the number of connections that a
       given number of child processes can handle
     * On Win32 mod_unique_id, mod_mime_magic, and the mod_vhost_alias
       modules are now enabled
     * The Cygwin port includes a number of fixes and updates.  Cygwin
       support was first introduced in version 1.3.20
     * On Windows 2000, the service display names can now be modified
       by the user (use the service control panel applet)
     * On Win32 a new option -W can be used to set up a dependency on
       another service, see win_service.html
     * The server will now take advantage of recent improvements to the
       TPF operating system which include an enhanced system fork and
       exec, updates to allow non-blocking file descriptors, and an
       update to shutdown processing

  Bugs fixed

   The following bugs were found in Apache 1.3.20 and have been fixed in
   Apache 1.3.22:
     * Under certain circumstances a child may crash due to a bug in
       mod_include.  If a server uses an ErrorDocument for 404 (request
       not found) errors which points to a server-parsed HTML file which
       uses a <!--#include  virtual="file" --> section, then a request
       containing %2f will result in a segfault. The segfault is harmless
       and does not cause a security problem, but is being triggered by
       the recent IIS worm
     * The Multiviews functionality has been fixed to prevent
       mod_negotiation from serving any multiview variant that contains
       unknown filename extensions. PR#8130
     * Apache will prefer installed version of the Expat library over the
       bundled version. This fixes conflicts when multiple copies of the
       Expat library get loaded (notably when using mod_perl and
       XML::Parsers::Expat)
     * UnsetEnv now works from the main body of a configuration file.
       PR#8254
     * When used as a reverse proxy any headers set by other modules
       (such as mod_usertrack or mod_securid) now get passed on to the
       back-end server. PR#6055
     * Server response headers can now be logged via the proxy. PR#7461
     * mod_proxy will now pay attention to HTTP headers that specify the
       request is not to be cached. PR#5668
     * When a client making a request via mod_proxy died unexpectedly,
       mod_proxy did not close its connection. PR#8090
     * The CacheForceCompletion directive has been fixed PR#7383,
       PR#8067, PR#6585
     * A memory leak has been fixed in the mod_mime_magic module
     * A Satisfy All option has been added to the default container
       designed to stop access to .htaccess files.  Without this
       directive, these files could still be fetched if they were within
       the scope of a Satisfy Any directive.

   The following bugs relate to specific platforms:
     * A number of fixes for NetWare have been added. These include:
       enabling long file names in htpasswd and htdigest, protection
       against ill behaved modules, better handling of abnormal
       shutdowns, dealing with the limited stack space during server side
       includes, and recognising special filenames such as proxy:http://
       correctly
     * A shutdown hang could occur on Solaris when using lots of piped
       TransferLogs and at least one piped ErrorLog
     * On EBCDIC platforms a bug in the proxy module stopped SSL proxying
       working
     * On Win32, mod_unique_id did not guarantee a unique ID due to
       threading
     * The Win32 Makefiles are now 100% compatible with the Microsoft
       Visual C++ compiler versions 5,6,7
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.38 2001/10/16 04:47:06 jlam Exp $
d30 2
a31 1
HAS_CONFIGURE=		# defined
d91 2
a92 4
DEPENDS+=		db-2.7.7:../../databases/db
LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib			\
			-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
d94 2
d162 1
@


1.38
log
@Use --whole-archive, not -whole-archive, as the latter isn't recognized by
a.out ld.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.37 2001/10/16 04:11:06 jlam Exp $
d10 2
a11 2
DISTNAME=		apache_1.3.20
PKGNAME=		apache6-1.3.20nb1
d21 1
a21 2
IPV6_PATCH=		apache-1.3.20-v6-20011009.diff.gz
PATCH_DIST_STRIP=	-p1	# IPv6 patch needs -p1
@


1.37
log
@Update apache{,6} to 1.3.20nb1.  Changes from version 1.3.20 are:

On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
written in C++ will resolve correctly.  This makes php4-sablot work with
mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.36 2001/10/09 13:20:17 martti Exp $
d86 1
a86 1
LINK_LIBGCC_LDFLAGS=	-Wl,-whole-archive -lgcc -Wl,-no-whole-archive
@


1.36
log
@Updated the IPv6 patch in attempt to solve pkg/13751.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.35 2001/10/08 13:23:37 martti Exp $
d79 9
@


1.35
log
@- Upgraded to 1.3.20.
- IPv6 patch will be maintained at ftp://ftp.piuha.net/pub/misc/

A better ChangeLog (1.3.19 -> 1.3.20) is available in
pkgsrc/www/apache/Makefile rev 1.73
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.34 2001/09/27 23:18:51 jlam Exp $
d11 1
a11 1
PKGNAME=		apache6-1.3.20
d21 1
a21 1
IPV6_PATCH=		apache-1.3.20-v6-20010807.diff.gz
@


1.34
log
@Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.33 2001/07/16 15:41:51 itojun Exp $
d10 2
a11 2
DISTNAME=		apache_1.3.19
PKGNAME=		apache6-1.3.19
d19 1
a19 1
MASTER_SITES+=		ftp://ftp.kame.net/pub/kame/misc/
d21 1
a21 1
IPV6_PATCH=		apache-1.3.19-v6-20010301a.diff.gz
@


1.33
log
@listen to both IPv4 and IPv6 wildcard by default.
workarounds PR12655.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.32 2001/07/13 07:09:25 jlam Exp $
d28 1
a28 1
CONFLICTS=		apache-* apache-*modssl-* apache6-*
@


1.32
log
@In package Makefiles, create FILES_SUBST instead of duplicating sed
expression for substituting in DEINSTALL/INSTALL scripts.  Use "${CMP} -s"
instead of "diff -q" since the former is more portable across OSes.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31 2001/05/18 06:01:36 jlam Exp $
d125 3
@


1.31
log
@Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in
/etc/mk.conf to any string of legal compiler flags to tune different aspects
of the built httpd.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.30 2001/05/08 17:28:09 jlam Exp $
d96 15
d116 1
a116 1
	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
d127 1
a127 2
	${SED}	-e "s|@@PREFIX@@|${PREFIX}|g"				\
		-e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g"	\
d131 4
a134 17
	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
	${SED}	-e "s|@@PREFIX@@|${PREFIX}|g"				\
		-e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g"	\
		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
	${SED}	-e "s|@@CAT@@|${CAT}|g"					\
		-e "s|@@RM@@|${RM}|g"					\
		-e "s|@@RMDIR@@|${RMDIR}|g"				\
		-e "s|@@TRUE@@|${TRUE}|g"					\
		-e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g"	\
		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
	${SED}	-e "s|@@CAT@@|${CAT}|g"					\
		-e "s|@@CHMOD@@|${CHMOD}|g"				\
		-e "s|@@CHOWN@@|${CHOWN}|g"				\
		-e "s|@@CP@@|${CP}|g"					\
		-e "s|@@MKDIR@@|${MKDIR}|g"				\
		-e "s|@@APACHE_SYSCONFDIR@@|${APACHE_SYSCONFDIR}|g"	\
		${PKGDIR}/INSTALL > ${INSTALL_FILE}
d141 2
a142 2
	for i in httpd.conf magic mime.types; do			\
		${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$$i.default	\
d144 1
a144 1
		${RM} -f ${APACHE_SYSCONFDIR}/$$i.default;		\
@


1.30
log
@Allow changing document root for suexec through ${APACHE_SUEXEC_DOCROOT}.
Closes pkg/12852 by Eric Schnoebelen <eric@@milo.cirr.com>.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.29 2001/04/29 21:21:13 jlam Exp $
d39 1
a39 1
CONFIGURE_ENV+=		OPTIM="${OPTIM}"
d74 2
d77 2
a78 2
OPTIM+=			-DBUFFERED_LOGS
CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
d89 3
a91 1
BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC
@


1.29
log
@Make apache and apache6 package skeletons look more similar.  Change
maintainer of apache6 package back to itojun@@netbsd.org.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.28 2001/04/14 19:50:05 kim Exp $
d54 1
d58 2
a59 1
			--suexec-safepath='${SUEXEC_PATH}'
d61 1
a61 1
BUILD_DEFS+=		APACHE_USER
@


1.28
log
@Fix MASTER_SITES
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.27 2001/04/14 19:42:54 kim Exp $
d3 2
a4 3
# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
# (to indicate changes in the shipped third party patches such as the mod_ssl
# EAPI when there has been no change to the Apache version number).
d6 1
a6 3
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6 enable patch.
# IPv6 enable patch conflicts with third-party modules anyway, due to
d14 1
d18 1
a18 1
# IPv6 patch, needs -p1
d20 3
a22 1
DISTFILES+=		apache-1.3.19-v6-20010301a.diff.gz
d24 1
a24 1
MAINTAINER=		jlam@@netbsd.org
d26 1
a26 1
COMMENT=		HTTP (Web) server, with IPv6 support
d28 1
a28 2
CONFLICTS=		apache-*modssl-* apache6-*
CONFLICTS=		apache-*
d33 1
a33 9
CONFIGURE_ARGS+=	--prefix=${PREFIX}				\
			--sbindir=${PREFIX}/sbin			\
			--libexecdir=${PREFIX}/lib/httpd		\
			--datadir=${PREFIX}/share/httpd			\
			--cgidir=${PREFIX}/libexec/cgi-bin		\
			--includedir=${PREFIX}/include/httpd		\
			--runtimedir=/var/run				\
			--logfiledir=/var/log/httpd			\
			--proxycachedir=/var/spool/httpd/proxy
a49 1
CONFIGURE_ARGS+=	--sysconfdir=${APACHE_SYSCONFDIR}
d98 4
a101 4
	for i in apache-1.3.19-v6-20010301a.diff.gz; do \
		${GZCAT} ${_DISTDIR}/$$i | \
		    ${PATCH} ${PATCH_DIST_ARGS:C/-p0/-p1/} \
		    || ( ${ECHO} Patch $$i failed ; exit 1 ) ; \
d105 4
a108 3
post-build:
	${SED}	-e "s,@@PREFIX@@,${PREFIX},g"				\
		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
d112 3
@


1.27
log
@Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.26 2001/03/01 04:03:08 itojun Exp $
d16 1
a16 1
MASTER_SITES=		http://httpd.apache.org/dist/ \
@


1.26
log
@update to 1.3.19 with IPv6 patch.

--- from apache/Announcements
                         Apache 1.3.19  Major changes

   The primary security fix is:
     * The default installation could lead mod_negotiation and mod_dir or
       mod_autoindex to display a directory listing instead of the
       multiview'ed index.html.* files, if a very long path was created
       artificially by using many slashes.  Now 403 FORBIDDEN is returned.

   The bug fixes are:
     * The ServerRoot directive now removes trailing slashes.
     * Restore functionality broken by the mod_rewrite security fix:
       The mod_rewrite string arithmetic is corrected for rewrite map.
     * Some possible segfault conditions have been fixed.
     * Under certain circumstances, Apache did not supply the
       right response headers when requiring authentication.

   The main new features include:
     * New configuration error reporting if the UserDir argument is set
       to a relative path on Win32 or Netware [which do not support home
       directories], or a relative path on any platform if that path
       includes the '*' username substitution.

   Selected new features that relate to Windows platforms:
     * Apache on Win9x now ensures the service is stopped before removal.
     * Test httpd.conf (-t) now holds the console open on "SYNTAX OK".
     * Apache/Win32 no longer holds open the console on error unless
       it was invoked from a shortcut with the -w option.
     * mod_user was significantly refactored to assure that the UserDir
       directive is parsed effectively the same across platforms, fixing
       a UserDir bug introduced in 1.3.17 on the Win32 platform.

   Selected new features relating to other platforms:
     * Netware problems with file extension truncatation are resolved.
     * Netware recognizes the SERVER/VOLUME:/PATH/FILE filename pattern.
     * Netware mod_tls properly disables nagle for SSL connections,
       and properly negotiates SSL based on the port.
     * Startup and Shutdown issues were addressed on TPF.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.25 2001/02/17 17:21:54 wiz Exp $
a36 1
			--sysconfdir=${PREFIX}/etc/httpd		\
d58 4
d125 1
d132 1
d139 6
@


1.25
log
@Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.24 2001/02/06 12:55:42 itojun Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.17
PKGNAME=		apache6-1.3.17.1
d22 1
a22 4
DISTFILES+=		apache-1.3.17-v6-20010206a.diff.gz

PATCH_SITES=		http://httpd.apache.org/dist/
PATCHFILES=		apache_1.3.17-fix.diff
d105 1
a105 1
	for i in apache-1.3.17-v6-20010206a.diff.gz; do \
@


1.24
log
@slightly better way to handle -p1 patches
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.23 2001/02/06 12:50:19 itojun Exp $
d29 1
@


1.23
log
@pull official patch from apache.org.  make it 1.3.17.1
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.22 2001/02/06 12:43:06 itojun Exp $
a32 6
.if defined(PATCH_DEBUG) || defined(PKG_VERBOSE)
PATCH_DIST_ARGS1=	-d ${WRKSRC} -E -p1
.else
PATCH_DIST_ARGS1=	-d ${WRKSRC} --forward --quiet -E -p1
.endif

d108 3
a110 2
		${GZCAT} ${_DISTDIR}/$$i | ${PATCH} ${PATCH_DIST_ARGS1} \
		|| ( ${ECHO} Patch $$i failed ; exit 1 ) ; \
@


1.22
log
@s/apache/apache6/.  oops
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.21 2001/02/06 10:58:18 itojun Exp $
d14 1
a14 1
PKGNAME=		apache6-1.3.17
d20 3
d24 2
a25 3
PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
PATCHFILES=		apache-1.3.17-v6-20010206a.diff.gz
PATCH_DIST_STRIP=	-p1
d33 7
a39 1
EXTRACT_ONLY=		${DISTFILES:N*.gif}
d113 4
@


1.21
log
@upgrade to 1.3.17 + IPv6 patch.  pkgsrc directory is much more similar to
pksrc/www/apache.  see pkgsrc/www/apache changelog for full changelog.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.20 2001/01/15 11:43:59 itojun Exp $
d14 1
a14 1
PKGNAME=		apache-1.3.17
@


1.20
log
@use latest IPv6 patch.  this fixes problem with virtual host directives
when incoming IPv4 connections are captured by AF_INET6 socket (IPv4 mapped
address).  not really matter for normal NetBSD installation.

I beileve IPv4 mapped address is very bad from security/access control POV.
really.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.19 2000/11/14 19:58:05 itojun Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.14
PKGNAME=		apache6-1.3.14
d16 1
a16 2
MASTER_SITES=		http://www.apache.org/dist/ \
			ftp://ftp.modssl.org/source/ \
a19 1
#			${SSL_DISTNAME}${EXTRACT_SUFX}
d22 1
a22 1
PATCHFILES=		apache-1.3.14-v6-20010115a.diff.gz
d25 2
a26 2
MAINTAINER=		itojun@@itojun.org
HOMEPAGE=		http://www.apache.org/
d28 2
a29 3
CONFLICTS=		apache-*modssl-* apache-*

#SSL_DISTNAME=		mod_ssl-2.6.3-1.3.12
d32 1
a32 12
HAS_CONFIGURE=		YES
CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
			--runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
			--logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
			--proxycachedir=/var/spool/httpd/proxy \
			--includedir=${PREFIX}/include/httpd \
			--sbindir=${PREFIX}/sbin \
			--enable-module=most \
			--enable-module=auth_db \
			--disable-module=auth_dbm \
			--with-perl=${PERL5}
#			--enable-rule=EAPI --disable-module=ssl 
d34 15
d60 15
a74 2
CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
d77 2
a79 1
CONFIGURE_ARGS+=	--disable-rule=STATUS
d86 2
a87 1
LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
d92 1
a92 1
PLIST_SRC=		${WRKDIR}/PLIST
d94 2
a95 1
BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC USE_INET6
d101 2
a102 15
#post-extract:
#	@@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
#	@@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
#	@@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/

#pre-patch:
#	@@cd ${WRKSRC} && ${CAT} \
#		../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
#		../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
#		../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
#		../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
#		| ${PATCH} ${PATCH_ARGS}
#	@@cd ${WRKSRC} && ${TAIL} +129 \
#		../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
#		| ${PATCH} ${PATCH_ARGS}
d105 1
a105 2
	@@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} -f
	@@${CHMOD} +x ${CONFIGURE_SCRIPT}
d108 16
a123 2
	${SED} s#@@PREFIX@@#${PREFIX}#g <${FILESDIR}/apache.sh \
	  >${WRKDIR}/apache.sh
d126 4
a129 2
	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
	  ${PREFIX}/share/httpd/htdocs
d131 1
a131 9
	@@${MV} ${PREFIX}/lib/httpd/libproxy.so \
	  ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \
	  ${MKDIR} ${PREFIX}/lib/httpd
	@@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
.for FILE in man/man8/suexec.8 sbin/suexec
	@@if ${TEST} -e ${PREFIX}/${FILE} ; then \
	  ${ECHO} ${FILE} >>${PLIST_SRC}; \
	fi
.endfor
a133 6

.if !defined(NOPIC)
CONFIGURE_ARGS+=	--enable-module=so --enable-shared=proxy
.else
CONFIGURE_ARGS+=	--disable-module=proxy
.endif
@


1.19
log
@upgrade to 1.3.14 + IPv6 patch.  apache side fixed security hole between
1.3.12 -> 1.3.14.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.18 2000/09/20 05:14:12 jlam Exp $
d24 1
a24 1
PATCHFILES=		apache-1.3.14-v6-20001114.diff.gz
@


1.18
log
@Install rc.d control script as "foo" instead of "foo.sh" to comply with
how NetBSD's rc.d system interprets script names.  Also add appropriate
REQUIRE and PROVIDE sections to allow direct use in NetBSD's rc.d system.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.17 2000/09/08 11:42:43 itojun Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.12
PKGNAME=		apache6-1.3.12
d24 1
a24 1
PATCHFILES=		apache-1.3.12-v6-20000908a.diff.gz
@


1.17
log
@use 9/8 apache IPv6 patch.  this fixes some problem in http proxying code
(URL parser makes mistake on certain pattern)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.16 2000/08/28 09:14:52 jlam Exp $
d111 1
a111 1
	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh
@


1.16
log
@Use PERL5 variable for location of perl5 binary.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.15 2000/08/15 10:31:24 itojun Exp $
d24 1
a24 1
PATCHFILES=		apache-1.3.12-v6-20000815.diff.gz
@


1.15
log
@upgrade to 1.3.12 + latest IPv6 patch.

solves cross site scripting problem in 1.3.11 (www.apache.org)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.14 2000/03/27 08:55:00 tron Exp $
d45 1
a45 1
			--with-perl=${PREFIX}/bin/perl
@


1.14
log
@Adapt to new handling of "${CONFIGURE}".
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2000/02/22 17:43:23 veego Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.11
PKGNAME=		apache6-1.3.11p0
d24 1
a24 1
PATCHFILES=		apache-1.3.11-v6-20000220a.diff.gz
d32 1
a32 1
#SSL_DISTNAME=		mod_ssl-2.2.8-1.3.6
@


1.13
log
@Add the patches for Solaris from apache/Makefile rev1.44.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2000/02/21 07:14:44 itojun Exp $
d47 1
a47 1
CONFIGURE_SCRIPT=	configure.v6
d102 1
a102 1
	@@${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT}
@


1.12
log
@use apache 1.3.11 + IPv6 patch as base version.
for changes between 1.3.9 to 1.3.11, please see commit logs for
pkgsrc/www/apache, or apache changelogs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2000/02/20 22:05:42 wiz Exp $
d69 7
d101 1
a101 1
	@@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
d117 1
a117 1
	@@if [ -e ${PREFIX}/${FILE} ]; then \
@


1.11
log
@replace 'find' by '${FIND}' where appropriate
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2000/02/05 14:01:12 wiz Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.9
PKGNAME=		apache6-1.3.9p0
d24 1
a24 1
PATCHFILES=		apache-139-v6-19990901a.diff.gz
d49 2
@


1.10
log
@replaced tail by ${TAIL}
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2000/01/26 16:04:18 wiz Exp $
d92 1
a92 1
	@@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
@


1.9
log
@don't mark it as BROKEN on non-IPv6-hosts, IGNORE it
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 1999/09/21 15:12:03 jdolecek Exp $
d87 1
a87 1
#	@@cd ${WRKSRC} && tail +129 \
@


1.8
log
@comment out SSL_DISTNAME as well, so it's clear from the first sight that
SSL is not supported here
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 1999/09/03 22:00:53 tron Exp $
d53 1
a53 1
BROKEN=			"IPv6 only build"
@


1.7
log
@Compare "${USE_INET6}" explicitly with "YES" so that you can override
settings at the command line.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 1999/09/01 09:00:26 itojun Exp $
d32 1
a32 1
SSL_DISTNAME=		mod_ssl-2.2.8-1.3.6
@


1.6
log
@add "p0" to PKGNAME to indicate version of NetBSD-local changes.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 1999/09/01 07:41:01 itojun Exp $
d52 1
a52 1
.if !defined(USE_INET6)
@


1.5
log
@upgrade apache original version to 1.3.9.
use latest IPv6 patch from ftp://ftp.kame.net/pub/kame/misc/.

fixes PR: 8307
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 1999/08/18 09:24:09 agc Exp $
d14 1
a14 1
PKGNAME=		apache6-1.3.9
@


1.4
log
@Record build options in the BuildInfo file via BUILD_DEFS. These can be
displayed using the -B option to pkg_info(1).

Add USE_INET6 to BUILD_DEFS
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 1999/08/18 08:29:11 agc Exp $
d13 2
a14 2
DISTNAME=		apache_1.3.6
PKGNAME=		apache6-1.3.6p0
d24 1
a24 1
PATCHFILES=		apache-136-v6-19990724.diff.gz
@


1.3
log
@Record build options in the BuildInfo file via BUILD_DEFS. These can be
displayed using the -B option to pkg_info(1).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 1999/07/23 18:19:29 itojun Exp $
d69 1
a69 1
BUILD_DEFS+=		AMANDA_USER AMANDA_SMB AMANDA_VAR
@


1.2
log
@provide and enable IPv6-ready apache.
This is provided as separate package because:
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6 enable patch.
# IPv6 enable patch conflicts with third-party modules anyway, due to
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $
d68 2
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.35 1999/06/05 20:32:17 tron Exp $
d7 4
a10 2
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
d14 1
a14 1
PKGNAME=		apache-1.3.6p0
a19 1
			${SSL_DISTNAME}${EXTRACT_SUFX} \
d21 1
d23 5
a27 1
MAINTAINER=		cjs@@netbsd.org
d30 1
a30 1
CONFLICTS=		apache-*modssl-*
d42 2
a43 2
			--enable-rule=EAPI --enable-module=most \
			--disable-module=ssl --enable-module=auth_db \
d46 2
d52 4
d73 15
a87 15
post-extract:
	@@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
	@@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
	@@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/

pre-patch:
	@@cd ${WRKSRC} && ${CAT} \
		../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
		../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
		../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
		../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
		| ${PATCH} ${PATCH_ARGS}
	@@cd ${WRKSRC} && tail +129 \
		../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
		| ${PATCH} ${PATCH_ARGS}
d91 1
@


1.1.1.1
log
@import pkgsrc/www/apache into pkgsrc/www/apache6,
to make a IPv6-ready version of apache package.
@
text
@@