2 files changed, 20 insertions, 35 deletions

diff --git a/www/fpc-httpd20/Makefile b/www/fpc-httpd20/Makefile
index 05ae9cfb2406..72ca6d659815 100644
--- a/www/fpc-httpd20/Makefile
+++ b/www/fpc-httpd20/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:	fpc-httpd
-# Date created: 			2007-09-11
+# New ports collection makefile for:	fpc-httpd20
+# Date created: 			2009-01-06
 # Whom: 				Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www lang
-PKGNAMESUFFIX=	-httpd
+PKGNAMESUFFIX=	-httpd20
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal httpd unit
@@ -15,11 +15,9 @@ COMMENT=	Free Pascal httpd unit
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
-OPTIONS=	APACHE13	"Install apache13 server "	off \
-		APACHE20	"Install apache20 server"	off \
-		APACHE22	"Install apache22 server"	off
+OPTIONS=	APACHE20	"Install apache20 server"	off
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/fpc-httpd20/pkg-plist b/www/fpc-httpd20/pkg-plist
index 8d8ea8e2bf1d..e066c6ea6fb1 100644
--- a/www/fpc-httpd20/pkg-plist
+++ b/www/fpc-httpd20/pkg-plist
@@ -1,30 +1,17 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-1.3/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-1.3/httpd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-1.3/httpd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-1.3/libphttpd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/apr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/apriconv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/aprutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/httpd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/apr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/apriconv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/aprutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/httpd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0/libphttpd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/apr.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/apriconv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/aprutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/httpd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/apr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/apriconv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/aprutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/httpd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2/libphttpd.a
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.2
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-2.0
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd-1.3
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/apr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/apriconv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/aprutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/httpd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/apr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/apriconv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/aprutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/httpd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/libpapr.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/libpapriconv.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/libpaprutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20/libphttpd.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/httpd20
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%