From 6933f085a2b6e8849c9e5ffbf60c2793bc5f846f Mon Sep 17 00:00:00 2001 From: acm Date: Thu, 19 Apr 2012 06:20:01 +0000 Subject: - Update to 2.6.0 --- www/fpc-fastcgi/Makefile | 2 +- .../files/patch-packages-fastcgi_Makefile | 34 ++++++++++++++++++++++ www/fpc-fastcgi/pkg-plist | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile (limited to 'www/fpc-fastcgi') diff --git a/www/fpc-fastcgi/Makefile b/www/fpc-fastcgi/Makefile index a13e9602b2dc..d46874d01f05 100644 --- a/www/fpc-fastcgi/Makefile +++ b/www/fpc-fastcgi/Makefile @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -fastcgi MAINTAINER= acm@FreeBSD.org COMMENT= Free Pascal fastcgi unit -USE_FPC= yes +USE_FPC= fpmkunit 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 new file mode 100644 index 000000000000..a5cef75d4514 --- /dev/null +++ b/www/fpc-fastcgi/files/patch-packages-fastcgi_Makefile @@ -0,0 +1,34 @@ +--- 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 5f60619dd30b..b0d2bf1f5c3c 100644 --- a/www/fpc-fastcgi/pkg-plist +++ b/www/fpc-fastcgi/pkg-plist @@ -1,6 +1,6 @@ -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi/Package.fpc 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 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fastcgi @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%% -- cgit