From owner-svn-ports-all@FreeBSD.ORG Sun Sep 30 00:28:08 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97E3D106566B; Sun, 30 Sep 2012 00:28:08 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 837B78FC14; Sun, 30 Sep 2012 00:28:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8U0S87w026596; Sun, 30 Sep 2012 00:28:08 GMT (envelope-from acm@svn.freebsd.org) Received: (from acm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8U0S8c0026593; Sun, 30 Sep 2012 00:28:08 GMT (envelope-from acm@svn.freebsd.org) Message-Id: <201209300028.q8U0S8c0026593@svn.freebsd.org> From: Jose Alonso Cardenas Marquez Date: Sun, 30 Sep 2012 00:28:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305058 - head/lang/fpc X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Sep 2012 00:28:08 -0000 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