diff options
author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2019-12-31 15:11:18 +0000 |
---|---|---|
committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2019-12-31 15:11:18 +0000 |
commit | 34196d10e5ee69d20c1534ccb6acc97c48296249 (patch) | |
tree | 2a8e1b46e250d661710bf15a002a6f11d62b504d | |
parent | ec5997fc92034903024fa8b93deb0db8b7103bdb (diff) | |
download | ports-34196d10e5ee69d20c1534ccb6acc97c48296249.tar.gz ports-34196d10e5ee69d20c1534ccb6acc97c48296249.zip |
- Change LDPATH to FPC_LDPATH into lang/fpc/Makefile. It can be changed from
/etc/make.conf
- Add FPC_LDPATH to freepascal compiler. By default it is defined to
%%LOCALBASE%%/bin/ld.bfd but it can be changed setting FPC_LDPATH environment
variable
- Remove compatX dependencies from bootstrap and compiler. It could fix problems
when GENERIC kernel is not used [1]
- Rebuild bootstrap (ppcx64 and ppc386) with new changes
- Bump PORTREVISION
PR: 239135
Submitted by: fbsdbugs4 __at__ sentry.org
Notes
Notes:
svn path=/head/; revision=521624
30 files changed, 85 insertions, 56 deletions
diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile index c159449394b6..184b2354105c 100644 --- a/databases/fpc-fpindexer/Makefile +++ b/databases/fpc-fpindexer/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases lang PKGNAMESUFFIX= -fpindexer diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile index 309ce4689c3c..614ab6b2ec6f 100644 --- a/databases/fpc-gdbm/Makefile +++ b/databases/fpc-gdbm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases lang PKGNAMESUFFIX= -gdbm diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile index 472a99069cd6..0c8890ac20bb 100644 --- a/databases/fpc-ibase/Makefile +++ b/databases/fpc-ibase/Makefile @@ -1,7 +1,7 @@ # Created by: John Merryweather Cooper # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases lang PKGNAMESUFFIX= -ibase diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile index bf635ab82767..06fde544031d 100644 --- a/databases/fpc-postgres/Makefile +++ b/databases/fpc-postgres/Makefile @@ -1,7 +1,7 @@ # Created by: John Merryweather Cooper et al # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases lang PKGNAMESUFFIX= -postgres diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile index c2ff97180215..2c94b51b596f 100644 --- a/devel/fpc-fcl-db/Makefile +++ b/devel/fpc-fcl-db/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-db diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile index 3f75b376cd1f..a94eebbdbbda 100644 --- a/devel/fpc-fcl-js/Makefile +++ b/devel/fpc-fcl-js/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-js -PORTREVISION= 3 COMMENT= Free Pascal Javascript scanner/parser/syntax tree (FCL) diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile index 9c8b6d4db00c..ba5dea11a4f0 100644 --- a/devel/fpc-fcl-json/Makefile +++ b/devel/fpc-fcl-json/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-json -PORTREVISION= 3 COMMENT= Free Pascal JavaScript Object Notation implemenation (FCL) diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile index 51a3e34bb912..4e4e3fbd5165 100644 --- a/devel/fpc-fcl-passrc/Makefile +++ b/devel/fpc-fcl-passrc/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-passrc -PORTREVISION= 3 COMMENT= Free Pascal language parsing library (FPC) diff --git a/devel/fpc-fcl-pdf/Makefile b/devel/fpc-fcl-pdf/Makefile index 8d78a4b62949..7c4cdfe769fd 100644 --- a/devel/fpc-fcl-pdf/Makefile +++ b/devel/fpc-fcl-pdf/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-pdf -PORTREVISION= 3 COMMENT= Free Pascal pdf (FCL) diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile index 5a601b57617c..9045e884d992 100644 --- a/devel/fpc-fcl-sdo/Makefile +++ b/devel/fpc-fcl-sdo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-sdo diff --git a/devel/fpc-fcl-stl/Makefile b/devel/fpc-fcl-stl/Makefile index 1efe8912bbe8..836af00b5fd5 100644 --- a/devel/fpc-fcl-stl/Makefile +++ b/devel/fpc-fcl-stl/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-stl -PORTREVISION= 3 COMMENT= Free Pascal generic container library (FCL) diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile index f7cfec408098..cb577fbd442e 100644 --- a/devel/fpc-fcl-web/Makefile +++ b/devel/fpc-fcl-web/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 6 CATEGORIES= devel lang PKGNAMESUFFIX= -fcl-web -PORTREVISION= 5 COMMENT= Free Pascal web application libary (FCL) diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile index 598f495820aa..2160114e00f4 100644 --- a/devel/fpc-fppkg/Makefile +++ b/devel/fpc-fppkg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang PKGNAMESUFFIX= -fppkg diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile index 4a17947b06b8..1e54b74e4375 100644 --- a/devel/fpc-sdl/Makefile +++ b/devel/fpc-sdl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel lang PKGNAMESUFFIX= -sdl diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index 37a5a1af069c..3b01a4f833f8 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -3,6 +3,7 @@ PORTNAME= hedgewars PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.hedgewars.org/download/releases/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index eb8532cb159b..db18a8dbf146 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 - +PORTREVISION= 4 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/lang/fpc-rtl-objpas/Makefile b/lang/fpc-rtl-objpas/Makefile index 5f902a6368b4..d33f06ea2e04 100644 --- a/lang/fpc-rtl-objpas/Makefile +++ b/lang/fpc-rtl-objpas/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 4 CATEGORIES= lang PKGNAMESUFFIX= -rtl-objpas -PORTREVISION= 3 COMMENT= Free Pascal compatibility unit with Delphi diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile index d86457602bd4..7d05c4b2b3a4 100644 --- a/lang/fpc-utils/Makefile +++ b/lang/fpc-utils/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang PKGNAMESUFFIX= -utils diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 909ee3e05500..ab1ea01df455 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -3,7 +3,7 @@ PORTNAME= fpc PORTVERSION= 3.0.4 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \ @@ -28,7 +28,7 @@ USE_BINUTILS= yes BOOTVER= 3.0.4 MANVER= 3.0.4 -LDPATH= "${LOCALBASE}/bin/ld.bfd" +FPC_LDPATH?= "${LOCALBASE}/bin/ld.bfd" #USE_GITHUB= yes #GH_ACCOUNT= fpc-svn @@ -72,7 +72,8 @@ MAKE_ARGS+= FPCMAKE=${NEWFPCMAKE} \ INSTALL="${INSTALL_DATA}" \ INSTALLEXE="${INSTALL_PROGRAM}" \ INSTALLSCR="${INSTALL_SCRIPT}" \ - INSTALL_PREFIX=${STAGEDIR}${PREFIX} + INSTALL_PREFIX=${STAGEDIR}${PREFIX} \ + FPC_LDPATH=${FPC_LDPATH} NEWPPC= PP=${WRKSRC}/compiler/${PPNAME} NEWFPC= FPC=${WRKSRC}/compiler/${PPNAME} BOOTDIR= ${PPNAME}-${BOOTVER}-${OPSYS:tl} @@ -106,13 +107,15 @@ post-patch: .if ${OPSYS} == FreeBSD @${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \ ${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as + @${REINPLACE_CMD} -i "" -e 's|197|477|g' \ + ${WRKSRC}/rtl/freebsd/sysnr.inc .else @${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \ ${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as .endif .if empty(ICONV_LIB) @${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \ - -e "s|%%LDPATH%%|${LDPATH}|g" \ + -e "s|%%FPC_LDPATH%%|${FPC_LDPATH}|g" \ ${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas @${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \ ${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index ee54c67df7d8..a6efd51f1753 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -32,7 +32,8 @@ MAKE_ARGS+= PP="${LOCALBASE}/bin/fpc" \ INSTALL="${INSTALL_DATA}" \ INSTALLEXE="${INSTALL_PROGRAM}" \ INSTALLSCR="${INSTALL_SCRIPT}" \ - INSTALL_PREFIX="${STAGEDIR}${PREFIX}" + INSTALL_PREFIX="${STAGEDIR}${PREFIX}" \ + FPC_LDPATH=${FPC_LDPATH} ALL_TARGET= fpc_baseinfo release .if ${PORT_OPTIONS:MEXAMPLES} && defined(HAVE_EXAMPLES) diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 8c9e8da22029..94bb968a9b8a 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1567485058 +TIMESTAMP = 1577757794 SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845 SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617 -SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 5cb99da20f8b7526aacdd6f3b242debb7608127e55a65a362f78717cd2592c7a -SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121502 -SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = c5b55d450a0835de33613ea1147245c5442525caf029f71f62dd77f771753c7e -SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198446 +SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = e8ee85613149a40f887fe7f0ad46604fb93b52989d7212dfe7bb909bdab63859 +SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121658 +SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = ba021dd49afedf554f9c3dddeb5b81c2728836ca95848625f80dbe5dd3c7b2d8 +SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198609 SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = bc5357fc6e56d77eeeb5d820023f7f721f5febcc684837f296a598c6c772b26c SIZE (freepascal/fpc-3.0.4.man.tar.gz) = 47294 diff --git a/lang/fpc/files/patch-compiler_systems_t__bsd.pas b/lang/fpc/files/patch-compiler_systems_t__bsd.pas index 92098f7cc7ea..10c84b259d53 100644 --- a/lang/fpc/files/patch-compiler_systems_t__bsd.pas +++ b/lang/fpc/files/patch-compiler_systems_t__bsd.pas @@ -1,46 +1,64 @@ --- compiler/systems/t_bsd.pas 2014-12-07 15:27:02.000000000 -0500 -+++ compiler/systems/t_bsd.pas 2019-09-02 21:10:43.316197000 -0500 -@@ -146,8 +146,8 @@ ++++ compiler/systems/t_bsd.pas 2019-12-30 19:00:54.968908000 -0500 +@@ -60,6 +60,7 @@ + private + LdSupportsNoResponseFile : boolean; + LibrarySuffix : Char; ++ LdPath : String; + Function WriteResponseFile(isdll:boolean) : Boolean; + function GetDarwinCrt1ObjName(isdll: boolean): TCmdStr; + Function GetDarwinPrtobjName(isdll: boolean): TCmdStr; +@@ -139,6 +140,9 @@ + } + begin + LibrarySuffix:=' '; ++ LdPath:=GetEnvironmentVariable('FPC_LDPATH'); ++ if not FileExists(LdPath,True) then ++ LdPath:='%%FPC_LDPATH%%'; + LdSupportsNoResponseFile := (target_info.system in ([system_m68k_netbsd]+systems_darwin)); + with Info do + begin +@@ -146,8 +150,8 @@ begin if not(target_info.system in systems_darwin) then begin - ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; - DllCmd[1]:='ld $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' -+ ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; -+ DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' ++ ExeCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $CATRES'; ++ DllCmd[1]:=LdPath + ' $TARGET $EMUL $OPT -shared -L. -o $EXE $CATRES' end else begin -@@ -166,22 +166,22 @@ +@@ -166,22 +170,22 @@ programs with problems that require Valgrind will have more than 60KB of data (first 4KB of address space is always invalid) } - ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; -+ ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; ++ ExeCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; if not(cs_gdb_valgrind in current_settings.globalswitches) then ExeCmd[1]:=ExeCmd[1]+' -pagezero_size 0x10000'; {$else ndef cpu64bitaddr} - ExeCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; -+ ExeCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; ++ ExeCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -multiply_defined suppress -L. -o $EXE $CATRES'; {$endif ndef cpu64bitaddr} if (apptype<>app_bundle) then - DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' -+ DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' ++ DllCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -dylib -multiply_defined suppress -L. -o $EXE $CATRES' else - DllCmd[1]:='ld $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' -+ DllCmd[1]:='%%LDPATH%% $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' ++ DllCmd[1]:=LdPath + ' $PRTOBJ $TARGET $EMUL $OPT $GCSECTIONS -dynamic -bundle -multiply_defined suppress -L. -o $EXE $CATRES' end end else begin - ExeCmd[1]:='ld $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; - DllCmd[1]:='ld $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; -+ ExeCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; -+ DllCmd[1]:='%%LDPATH%% $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; ++ ExeCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES'; ++ DllCmd[1]:=LdPath + ' $TARGET $EMUL $OPT $INIT $FINI $SONAME -shared -L. -o $EXE $RES'; end; if not(target_info.system in systems_darwin) then DllCmd[2]:='strip --strip-unneeded $EXE' -@@ -192,6 +192,8 @@ +@@ -192,6 +196,8 @@ DynamicLinker:='/usr/libexec/ld.so' else if target_info.system in systems_netbsd then DynamicLinker:='/usr/libexec/ld.elf_so' @@ -49,16 +67,16 @@ else DynamicLinker:=''; end; -@@ -555,7 +557,7 @@ +@@ -555,7 +561,7 @@ While not SharedLibFiles.Empty do begin S:=SharedLibFiles.GetFirst; - if (s<>'c') or reorder then -+ if (((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then ++ if (((((((((s<>'c') and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) and (s<>'iconv')) or reorder then begin i:=Pos(target_info.sharedlibext,S); if i>0 then -@@ -718,7 +720,12 @@ +@@ -718,7 +724,12 @@ Replace(cmdstr,'$DYNLINK',DynLinkStr); if (target_info.system in systems_darwin) then Replace(cmdstr,'$PRTOBJ',GetDarwinPrtobjName(false)); @@ -66,7 +84,7 @@ + if target_info.system=system_x86_64_dragonfly then + BinStr:='/usr/libexec/binutils225/elf/ld.bfd'; + if target_info.system in systems_freebsd then -+ BinStr:='%%LDPATH%%' ++ BinStr:=LdPath + else + BinStr:=FindUtil(utilsprefix+BinStr); diff --git a/lang/fpc/files/pkg-message.in b/lang/fpc/files/pkg-message.in index 4b511beb7e4d..d90535d45583 100644 --- a/lang/fpc/files/pkg-message.in +++ b/lang/fpc/files/pkg-message.in @@ -20,7 +20,14 @@ * editors/fpc-ide -5) Enjoy it ;) +5) This port add support to fp compiler to get value from FPC_LDPATH + environment variable. By default fp compiler use %%LOCALBASE%%/bin/ld.bfd for + linking binaries. If you want change this, just must be define FPC_LDPATH + with path to ld tool that will be used by fp compiler. Take on mind that fpc + only works with binutils on this moment but could work with another ld tool + later on next versions of freepascal + +6) Enjoy it ;) EOM } ] diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile index 03e20ced4131..7df86e1897e6 100644 --- a/lang/nbc/Makefile +++ b/lang/nbc/Makefile @@ -3,7 +3,7 @@ PORTNAME= nbc PORTVERSION= 1.2.1.r4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= lang MASTER_SITES= SF/bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/} DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile index 53dfa28b93d5..d16bd34b945a 100644 --- a/multimedia/fpc-libvlc/Makefile +++ b/multimedia/fpc-libvlc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia lang PKGNAMESUFFIX= -libvlc diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile index 6bab5971ddd4..976a35f366fc 100644 --- a/science/checkmol/Makefile +++ b/science/checkmol/Makefile @@ -3,16 +3,15 @@ PORTNAME= checkmol PORTVERSION= 0.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MASTER_SITES= http://merian.pch.univie.ac.at/pch/download/chemistry/checkmol/ +DISTFILES= ${PORTNAME} EXTRACT_SUFX= .pas MAINTAINER= acm@FreeBSD.org COMMENT= Analyze molecules for the presence of functional groups -BROKEN= unfetchable - LICENSE= GPLv2+ NO_WRKSUBDIR= yes @@ -29,7 +28,7 @@ do-build: (cd ${WRKSRC} && ${LOCALBASE}/bin/fpc ${EXTRACT_ONLY} -S2 -O3) do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}) + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}) (cd ${STAGEDIR}${PREFIX}/bin && ${LN} ${PORTNAME} matchmol) .include <bsd.port.mk> diff --git a/science/checkmol/distinfo b/science/checkmol/distinfo index 5e9d41bb49f8..27ccd69daf38 100644 --- a/science/checkmol/distinfo +++ b/science/checkmol/distinfo @@ -1,2 +1,3 @@ -SHA256 (checkmol-0.5.pas) = 53c729ed4c2f98a19f2ede8280189d766e6107d980ba2410e98f541c0d852829 -SIZE (checkmol-0.5.pas) = 554154 +TIMESTAMP = 1577760992 +SHA256 (checkmol) = 6913ea64238a3bfe1dc9929d979e20c87fc5f40d53e300722ad18178c0dc80f2 +SIZE (checkmol) = 555927 diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile index e055a86362d6..d3fb5897de84 100644 --- a/science/mol2ps/Makefile +++ b/science/mol2ps/Makefile @@ -3,7 +3,7 @@ PORTNAME= mol2ps PORTVERSION= 0.4b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MASTER_SITES= http://merian.pch.univie.ac.at/pch/download/chemistry/${PORTNAME}/ DISTNAME= ${PORTNAME} diff --git a/www/fpc-googleapi/Makefile b/www/fpc-googleapi/Makefile index 161df50dcfa2..7bb25572aaa1 100644 --- a/www/fpc-googleapi/Makefile +++ b/www/fpc-googleapi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www lang PKGNAMESUFFIX= -googleapi diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile index 35381f2d8104..b4eca1ad340d 100644 --- a/x11/fpc-x11/Makefile +++ b/x11/fpc-x11/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +PORTREVISION= 5 CATEGORIES= x11 lang PKGNAMESUFFIX= -x11 -PORTREVISION= 4 COMMENT= Free Pascal interface to X windows server |