ports/62485: [MAINTAINER-UPDATE] Fix lang/fpc build on -CURRENT
John Merryweather Cooper
coop9211 at uidaho.edu
Sat Feb 7 17:50:12 UTC 2004
>Number: 62485
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] Fix lang/fpc build on -CURRENT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 07 09:50:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD borgdemon.losaca.adelphia.net 4.9-STABLE FreeBSD 4.9-STABLE #10: Thu Feb 5 10:10:14 PST 2004 root at borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/K6-2 i386
>Description:
* Fix build on -CURRENT
* Cleanup Makefile
* Fix build using a previously installed fpc
>How-To-Repeat:
see Bento logs
>Fix:
--- patch-fpc-to-1.0.10_2 begins here ---
# This is a patch for fpc to update it to fpc-1.0.10_2
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####
#### Patch data follows ####
diff -u 'fpc/Makefile' 'fpc-1.0.10_2/Makefile'
Index: ./Makefile
--- ./Makefile Sat Feb 7 09:34:03 2004
+++ ./Makefile Fri Feb 6 22:02:31 2004
@@ -2,12 +2,12 @@
# Date created: 28 November 2001
# Whom: John Merryweather Cooper et al
#
-# $FreeBSD: ports/lang/fpc/Makefile,v 1.12 2004/02/07 00:20:53 kris Exp $
+# $FreeBSD$
#
PORTNAME= fpc
PORTVERSION= 1.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/FreeBSD/ \
http://planetmirror.com/pub/fpc/dist/FreeBSD/ \
@@ -25,14 +25,7 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502000
-BROKEN= "Install fails"
-.endif
-
LIB_DEPENDS= gds.1:${PORTSDIR}/databases/firebird
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x
-.endif
.if ${OSVERSION} < 470000
EXTRACT_DEPENDS= gtar:${PORTSDIR}/archivers/gtar
TAR= ${LOCALBASE}/bin/gtar
@@ -73,11 +66,15 @@
.endif
.if empty(have_boot)
-have_boot= ${WRKSRC}/boot
+have_boot= ${WRKSRC}/boot/bin
+# only need misc/compat4x if using the pre-built ppc386
+.if ${OSVERSION} >= 500000
+LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x
+.endif
.endif
-MAKE_ENV+= PATH=${have_boot}/bin:$$PATH \
- FPC=${have_boot}/bin/ppc386 \
+MAKE_ENV+= PATH=${have_boot}:$$PATH \
+ FPC=${have_boot}/ppc386 \
INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
INSTALL_BINDIR=${PREFIX}/bin \
GCCLIBDIR=/usr/lib \
@@ -134,31 +131,41 @@
"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
do-build:
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl && \
- ${GMAKE} ${MAKE_ENV} all
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler && \
- ${GMAKE} ${MAKE_ENV} all
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync && \
- ${GMAKE} ${MAKE_ENV} all
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl && \
- ${GMAKE} ${MAKE_ENV} all
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl \
+ all
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler \
+ all
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync \
+ all
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl \
+ all
# kludge so that bin2obj finds ZSTREAM and builds
cd ${WRKSRC}/share/src/fpc-${PORTVERSION} && \
${CP} fcl/inc/zstream.pp utils
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/utils && \
- ${GMAKE} ${MAKE_ENV} all
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/utils \
+ all
do-install:
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl && \
- ${GMAKE} ${MAKE_ENV} install
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler && \
- ${GMAKE} ${MAKE_ENV} install
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync && \
- ${GMAKE} ${MAKE_ENV} install
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl && \
- ${GMAKE} ${MAKE_ENV} install
- cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/utils && \
- ${GMAKE} ${MAKE_ENV} install
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/rtl \
+ install
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/compiler \
+ install
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/libasync \
+ install
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/fcl \
+ install
+ @${SETENV} ${MAKE_ENV} ${GMAKE} -C \
+ ${WRKSRC}/share/src/fpc-${PORTVERSION}/utils \
+ install
@${MKDIR} ${PREFIX}/man/man1
cd ${WRKSRC}/boot/man/man1 && ${INSTALL_MAN} ${MAN1} \
${PREFIX}/man/man1
diff -u 'fpc/distinfo' 'fpc-1.0.10_2/distinfo'
Index: ./distinfo
--- ./distinfo Thu Jan 8 15:55:42 2004
+++ ./distinfo Sat Feb 7 09:38:48 2004
@@ -1 +1,2 @@
MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
+SIZE (fpc-1.0.10.ELF.tar) = 17448960
diff -u 'fpc/pkg-install' 'fpc-1.0.10_2/pkg-install'
Index: ./pkg-install
--- ./pkg-install Wed Jan 7 02:14:04 2004
+++ ./pkg-install Fri Feb 6 19:49:52 2004
@@ -7,7 +7,7 @@
FILES_DELETE="bin/ppc386 etc/fpc.cfg etc/fpc.cfg.orig"
-LIBDIR=${PKG_PREFIX}/lib/fpc/${PKGNAME##fpc-}
+LIBDIR=${PKG_PREFIX}/lib/fpc/1.0.10
CHMOD=/bin/chmod
LN=/bin/ln
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Sat Feb 7 09:39:48 2004
# Generated by : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 5327 1076133751 0100644
# p 'distinfo' 60 1076175528 0100644
# p 'pkg-install' 693 1076125792 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Sat Feb 7 09:39:48 2004] ####
#### Checksum: 166 5360 10912 ####
--- patch-fpc-to-1.0.10_2 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list