3 files changed, 2 insertions, 38 deletions

diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile
index 938fb759c7a9..7ddbe76138b3 100644
--- a/www/fpc-fastcgi/Makefile
+++ b/www/fpc-fastcgi/Makefile
@@ -1,14 +1,13 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
 
-PORTREVISION=	2
 CATEGORIES=	www lang
 PKGNAMESUFFIX=	-fastcgi
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal fastcgi unit
 
-USE_FPC=	fcl-process fpmkunit hash paszlib
+USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile b/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile
deleted file mode 100644
index a5cef75d4514..000000000000
--- a/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- packages/fastcgi/Makefile	2012-02-24 01:40:44.000000000 -0500
-+++ packages/fastcgi/Makefile	2012-02-24 01:42:02.000000000 -0500
-@@ -2057,15 +2057,15 @@
- endif
- .NOTPARALLEL:
- fpmake: fpmake.pp
--	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
-+	$(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
- all:	fpmake
--	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+	$(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -CX
- smart:	fpmake
--	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
-+	$(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
- release:	fpmake
--	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
-+	$(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
- debug:	fpmake
--	$(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
-+	$(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
- ifeq ($(FPMAKE_BIN_CLEAN),)
- clean:	
- else
-@@ -2085,8 +2085,8 @@
- endif
- install:	fpmake
- ifdef UNIXHier
--	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
-+	$(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
- else
--	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
-+	$(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
- endif
- distinstall:	install
diff --git a/www/fpc-fastcgi/pkg-plist b/www/fpc-fastcgi/pkg-plist
index c9029564efb4..dfa18a90ed79 100644
--- a/www/fpc-fastcgi/pkg-plist
+++ b/www/fpc-fastcgi/pkg-plist
@@ -1,4 +1,3 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fastcgi.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fastcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/fpunits.cfg
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/libpfastcgi.a