Date: Sun, 30 Sep 2012 00:28:08 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305058 - head/lang/fpc Message-ID: <201209300028.q8U0S8c0026593@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sun Sep 30 00:28:07 2012 New Revision: 305058 URL: http://svn.freebsd.org/changeset/ports/305058 Log: - Fix editors/fpc-ide Modified: head/lang/fpc/Makefile.units head/lang/fpc/pkg-plist Modified: head/lang/fpc/Makefile.units ============================================================================== --- head/lang/fpc/Makefile.units Sun Sep 30 00:09:15 2012 (r305057) +++ head/lang/fpc/Makefile.units Sun Sep 30 00:28:07 2012 (r305058) @@ -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 Modified: head/lang/fpc/pkg-plist ============================================================================== --- head/lang/fpc/pkg-plist Sun Sep 30 00:09:15 2012 (r305057) +++ head/lang/fpc/pkg-plist Sun Sep 30 00:28:07 2012 (r305058) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209300028.q8U0S8c0026593>