Retire Apache 1.3 and 2.0.

3 files changed, 33 insertions, 37 deletions

diff --git a/www/ap-fastcgi/DESCR b/www/ap-fastcgi/DESCR
index 9d5d4ad4c94..fd3d6e4652e 100644
--- a/www/ap-fastcgi/DESCR
+++ b/www/ap-fastcgi/DESCR
@@ -5,5 +5,5 @@ processes running between requests.  So, unlike CGI, you do not have the
 overhead of starting up a new process and doing application initialization
 (e.g. connecting to a database) each time somebody requests a document.
 
-This package works with Apache version 1.3 series.  In order to use FastCGI
-with the version 2 series, use www/ap2-fastcgi instead.
+This package works with Apache version 2 series.  In order to use FastCGI
+with the version 1.3 series, use www/ap-fastcgi instead.
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 24d38ab238f..f4630411ea9 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,15 +1,37 @@
-# $NetBSD: Makefile,v 1.32 2012/10/28 06:30:04 asau Exp $
-#
+# $NetBSD: Makefile,v 1.33 2014/06/10 15:22:15 joerg Exp $
 
-.include "Makefile.common"
+DISTNAME=	mod_fastcgi-2.4.6
+PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
+CATEGORIES=	www
+MASTER_SITES=	http://www.fastcgi.com/dist/
 
-PKGNAME=	${DISTNAME:S/mod_/ap13-/}
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.fastcgi.com/
+COMMENT=	New, improved CGI-like interface module for Apache
 
-CONFLICTS=	ap-fastcgi-[0-9]*
+PLIST_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
+MESSAGE_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
 
-APACHE_MODULE=	yes
-APACHE_MODULE_NAME=	mod_fastcgi.so
-APACHE_MANUAL=	htdocs/manual
+INSTALLATION_DIRS+=	share/httpd/${APACHE_MANUAL}/mod
 
-.include "../../www/apache/module.mk"
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html	\
+		${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/
+
+PKG_APACHE_ACCEPTED=	apache22
+APACHE_MANUAL=		manual
+APACHE_MODULE=		YES
+USE_LIBTOOL=		YES
+
+MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
+
+SUBST_CLASSES+=		ap2
+SUBST_STAGE.ap2=	pre-build
+SUBST_FILES.ap2=	Makefile
+SUBST_SED.ap2=		-e s,/usr/local/apache2,${PREFIX}/share/httpd,
+
+post-patch:
+	${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile
+
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common
deleted file mode 100644
index 0b02d0c796b..00000000000
--- a/www/ap-fastcgi/Makefile.common
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2010/02/20 14:58:45 joerg Exp $
-#
-# used by www/ap-fastcgi/Makefile
-# used by www/ap2-fastcgi/Makefile
-#
-DISTNAME=	mod_fastcgi-2.4.6
-CATEGORIES=	www
-MASTER_SITES=	http://www.fastcgi.com/dist/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fastcgi.com/
-COMMENT=	New, improved CGI-like interface module for Apache
-
-DISTINFO_FILE=	${.CURDIR}/../../www/ap-fastcgi/distinfo
-PATCHDIR=	${.CURDIR}/../../www/ap-fastcgi/patches
-PLIST_SRC=	${.CURDIR}/../../www/ap-fastcgi/PLIST
-MESSAGE_SRC=	${.CURDIR}/../../www/ap-fastcgi/MESSAGE
-
-PLIST_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
-MESSAGE_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
-
-INSTALLATION_DIRS+=	share/httpd/${APACHE_MANUAL}/mod
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html	\
-		${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/