diff options
| author | marcus <marcus@FreeBSD.org> | 2004-02-22 10:05:13 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-02-22 10:05:13 +0800 |
| commit | 59c3501a7da3a8d089e4bed2ca5a11293a3d86fa (patch) | |
| tree | 1d2aad5291f89c243e5c40b146a0d920e484fbc7 /lang/fpc | |
| parent | cf9d5996d29dffb02884d400adbdeb497fa2c81d (diff) | |
| download | freebsd-ports-graphics-59c3501a7da3a8d089e4bed2ca5a11293a3d86fa.tar.gz freebsd-ports-graphics-59c3501a7da3a8d089e4bed2ca5a11293a3d86fa.tar.zst freebsd-ports-graphics-59c3501a7da3a8d089e4bed2ca5a11293a3d86fa.zip | |
* Fix the build on -CURRENT
* Clean up Makefile
* Fix build when an earlier version of fpc was already installed
PR: 62485
Submitted by: maintainer
Diffstat (limited to 'lang/fpc')
| -rw-r--r-- | lang/fpc/Makefile | 71 | ||||
| -rw-r--r-- | lang/fpc/distinfo | 1 | ||||
| -rw-r--r-- | lang/fpc/pkg-install | 2 |
3 files changed, 42 insertions, 32 deletions
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 3bd35384cc1..547b537296e 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -7,7 +7,7 @@ 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/ \ @@ -23,16 +23,11 @@ EXTRACT_SUFX= .tar MAINTAINER= coop9211@uidaho.edu COMMENT= Free Pascal compiler with Turbo, Delphi and other extensions -BROKEN= "Install fails" - .include <bsd.port.pre.mk> -LIB_DEPENDS= gds.1:${PORTSDIR}/databases/firebird -.if ${OSVERSION} >= 500000 -LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x -.endif +LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird .if ${OSVERSION} < 470000 -EXTRACT_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +EXTRACT_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar TAR= ${LOCALBASE}/bin/gtar .endif USE_MYSQL= yes @@ -71,11 +66,15 @@ have_boot!= if [ -x ${LOCALBASE}/bin/ppc386 ]; then \ .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 \ @@ -132,31 +131,41 @@ post-patch: "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 --git a/lang/fpc/distinfo b/lang/fpc/distinfo index cdc32c64a7d..54527a31654 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1 +1,2 @@ MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667 +SIZE (fpc-1.0.10.ELF.tar) = 17448960 diff --git a/lang/fpc/pkg-install b/lang/fpc/pkg-install index 7e0bb413178..eef589442dc 100644 --- a/lang/fpc/pkg-install +++ b/lang/fpc/pkg-install @@ -7,7 +7,7 @@ ACTION=$2 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 |