diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-09-30 00:28:07 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-09-30 00:28:07 +0000 |
| commit | b3bf0d27ee66925ab9fe0f096629d320451c702b (patch) | |
| tree | fbf98e027d275a0de376ae1cb46ad8c7d85b89a0 /lang/fpc | |
| parent | 0e66c402891c720f6ceec24f1688f87165c397f6 (diff) | |
| download | ports-b3bf0d27ee66925ab9fe0f096629d320451c702b.tar.gz ports-b3bf0d27ee66925ab9fe0f096629d320451c702b.zip | |
- Fix editors/fpc-ide
Notes
Notes:
svn path=/head/; revision=305058
Diffstat (limited to 'lang/fpc')
| -rw-r--r-- | lang/fpc/Makefile.units | 9 | ||||
| -rw-r--r-- | lang/fpc/pkg-plist | 2 |
2 files changed, 8 insertions, 3 deletions
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 |