From 53c3690ac9d7002657b7a77bd88125c96bdeac03 Mon Sep 17 00:00:00 2001
From: acm <acm@FreeBSD.org>
Date: Sun, 30 Sep 2012 00:28:07 +0000
Subject: - Fix editors/fpc-ide

---
 lang/fpc/Makefile.units | 9 +++++++--
 lang/fpc/pkg-plist      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'lang')

diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 171f19915be3..3bedf197ec54 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -8,16 +8,17 @@ PATCHDIR=		${.CURDIR}/files
 FILESDIR=		${.CURDIR}/files
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+FPCDIR=			${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION}
 UNITPREFIX=    		unit-
 UNITEXTRACT_SUFX=	.tar.gz
 UNITNAME=		${UNITPREFIX}${PKGNAMESUFFIX:S/-//}${BUILDNAME:S/^/./}${UNITEXTRACT_SUFX}
 UNITDIR=		lib/fpc/${PORTVERSION}/units/${BUILDNAME}
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACTUNITDIR}
-OPT=-CX
+OPT=-Ur -CX
 
 MAKE_ENV+=		PP=${LOCALBASE}/bin/${PPNAME} \
-			FPCDIR=${LOCALBASE}/lib/${PORTNAME}/${PORTVERSION} \
+			FPCDIR=${FPCDIR} \
 			FPCMAKE=${LOCALBASE}/bin/fpcmake \
 			FPCTARGET=${BUILDNAME} \
 			ARCH=${FPC_ARCH} \
@@ -141,6 +142,10 @@ USE_FIREBIRD=	yes
 USE_ICONV=	yes
 .endif
 
+.if ${PKGNAMESUFFIX} == "-ide"
+FPCDIR=		#
+.endif
+
 .if ${PKGNAMESUFFIX} == "-imagemagick"
 .	if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index be0703a5c5fd..c04d7f9e0380 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/lang/fpc/pkg-plist,v 1.14 2012-04-19 06:19:58 acm Exp $
+@comment $FreeBSD: ports/lang/fpc/pkg-plist,v 1.14 2012/04/19 06:19:58 acm Exp $
 
 @unexec if cmp -s %D/etc/fpc.cfg.sample %D/etc/fpc.cfg; then rm -f %D/etc/fpc.cfg; fi
 etc/fpc.cfg.sample
-- 
cgit