diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2018-01-30 22:11:13 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2018-01-30 22:11:13 +0000 |
| commit | a78ac4eb9990a0c44bf11bdb522cbe7a3bf3ad45 (patch) | |
| tree | 8f9016d16db947e0cef35ace15f5a66fd43323f0 | |
| parent | 8d7b87d25932583d8d3c37792b2aa8f9dd29c0bf (diff) | |
Notes
28 files changed, 66 insertions, 140 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index a0e4ed150d14..e91196807bbd 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -37,7 +37,7 @@ FIREBIRD_DEFAULT?= 2.5 # Possible values: flang (experimental), gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.0.0 -FPC_DEFAULT?= 3.0.4 +FPC_DEFAULT?= 3.0.2 # Possible values: 4.9, 5, 6, 7 GCC_DEFAULT?= 6 # Possible values: 7, 8, 9, agpl diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk index 56ceb05fe5da..7d965c34309a 100644 --- a/Mk/bsd.fpc.mk +++ b/Mk/bsd.fpc.mk @@ -72,12 +72,12 @@ _FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \ fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \ fpindexer fppkg fv gdbint gdbm gmp googleapi graph gtk2 \ hermes httpd22 httpd24 ibase iconvenc imagemagick \ - ldap libcurl libgd libmicrohttpd libpng libvlc libxml2 lua mad \ - modplug mysql ncurses newt numlib odbc oggvorbis openal opengl \ - openssl oracle pasjpeg pcap postgres proj4 pthreads pxlib \ - regexpr rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode \ - sdl sqlite svgalib symbolic syslog unzip users utmp uuid x11 \ - xforms zlib + ldap libcurl libgd libpng libvlc libxml2 lua mad modplug mysql \ + ncurses newt numlib odbc oggvorbis openal opengl openssl \ + oracle pasjpeg pcap postgres proj4 pthreads pxlib regexpr \ + rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode sdl \ + sqlite svgalib symbolic syslog unzip users utmp \ + uuid x11 xforms zlib .if defined(WANT_FPC_BASE) . if ${WANT_FPC_BASE:tl} == "yes" @@ -163,7 +163,6 @@ imagemagick_UNIT= graphics/fpc-imagemagick ldap_UNIT= net/fpc-ldap libcurl_UNIT= ftp/fpc-libcurl libgd_UNIT= graphics/fpc-libgd -libmicrohttpd_UNIT= www/fpc-libmicrohttpd libpng_UNIT= graphics/fpc-libpng libvlc_UNIT= multimedia/fpc-libvlc libxml2_UNIT= textproc/fpc-libxml2 diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile index 9ce4bf3cfffc..fe0f193e8827 100644 --- a/archivers/peazip/Makefile +++ b/archivers/peazip/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= peazip -PORTVERSION= 6.5.0 +PORTVERSION= 6.4.1 CATEGORIES= archivers MASTER_SITES= https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -25,13 +25,13 @@ DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt) LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.lpi project_gwrap.lpi LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} -LAZARUS_VER= 1.8.0 +LAZARUS_VER= 1.6.4 LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} ARCHIVER_FILES= # OPTIONS_DEFINE= 7Z ARC ZPAQ UNACE OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 +OPTIONS_SINGLE_LCL= GTK2 QT4 7Z_DESC= 7z file archiver support ARC_DESC= Arc file archiver support @@ -39,7 +39,6 @@ ZPAQ_DESC= Zpaq file archiver support UNACE_DESC= Unace file archiver support GTK2_DESC= Use gtk20 interface QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface OPTIONS_DEFAULT= GTK2 7Z @@ -58,12 +57,6 @@ LCL_PLATFORM= qt BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt .endif -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -.endif - .if ${PORT_OPTIONS:M7Z} RUN_DEPENDS+= 7z:archivers/p7zip ARCHIVER_FILES+=7z @@ -96,9 +89,6 @@ PLIST_SUB+= UNACE="" PLIST_SUB+= UNACE="@comment " .endif -post-patch: - ${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas - do-build: .for PROJECT_FILE in ${LAZARUS_PROJECT_FILES} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/archivers/peazip/distinfo b/archivers/peazip/distinfo index 93955b914936..3d6e25108462 100644 --- a/archivers/peazip/distinfo +++ b/archivers/peazip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513107866 -SHA256 (peazip-6.5.0.src.zip) = 1c19c7d6c346b511c635c95d6ff0277ee0811873133757d3c06c26fec558e7bf -SIZE (peazip-6.5.0.src.zip) = 4181167 +TIMESTAMP = 1499397491 +SHA256 (peazip-6.4.1.src.zip) = 6be126675c83df95b020da6221cf5063aed83510783d55254f4923c29a5245d0 +SIZE (peazip-6.4.1.src.zip) = 4098287 diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp index faf28fef7882..d07556713822 100644 --- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp +++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp @@ -1,11 +1,11 @@ ---- packages/mad/fpmake.pp 2017-09-02 11:48:24.000000000 -0500 -+++ packages/mad/fpmake.pp 2017-12-12 12:22:21.182111000 -0500 -@@ -17,7 +17,7 @@ +--- packages/mad/fpmake.pp.orig 2015-11-13 21:15:29 UTC ++++ packages/mad/fpmake.pp +@@ -17,7 +17,7 @@ begin P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.Version:='3.0.4'; + P.Version:='3.0.2'; - P.OSes := [linux,win32,win64,wii]; -+ P.OSes := [linux,win32,win64,wii,dragonfly,freebsd]; ++ P.OSes := [linux,win32,win64,wii,freebsd,dragonfly]; P.SourcePath.Add('src'); T:=P.Targets.AddUnit('mad.pas'); diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp index dc5a1ae8d6b8..8312b59a7908 100644 --- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp +++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp @@ -1,9 +1,9 @@ ---- packages/modplug/fpmake.pp 2017-09-02 11:48:24.000000000 -0500 -+++ packages/modplug/fpmake.pp 2017-12-12 12:24:14.440128000 -0500 -@@ -17,7 +17,7 @@ +--- packages/modplug/fpmake.pp.orig 2015-11-13 21:15:29 UTC ++++ packages/modplug/fpmake.pp +@@ -17,7 +17,7 @@ begin P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.Version:='3.0.4'; + P.Version:='3.0.2'; - P.OSes := [linux]; + P.OSes := [linux,dragonfly,freebsd]; P.SourcePath.Add('src'); diff --git a/devel/fpc-fcl-passrc/pkg-plist b/devel/fpc-fcl-passrc/pkg-plist index 83fd70eb105d..7c0f1cbb226a 100644 --- a/devel/fpc-fcl-passrc/pkg-plist +++ b/devel/fpc-fcl-passrc/pkg-plist @@ -11,5 +11,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.rsj lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu +lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.rsj diff --git a/editors/Makefile b/editors/Makefile index 63a9772e5bd3..ac5b41682945 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -77,7 +77,6 @@ SUBDIR += lazarus-lcl-gtk2 SUBDIR += lazarus-lcl-nogui SUBDIR += lazarus-lcl-qt - SUBDIR += lazarus-lcl-qt5 SUBDIR += lazarus-lcl-units SUBDIR += le SUBDIR += leafpad diff --git a/editors/lazarus-lcl-qt5/Makefile b/editors/lazarus-lcl-qt5/Makefile deleted file mode 100644 index 9891096a8f5d..000000000000 --- a/editors/lazarus-lcl-qt5/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> -# $FreeBSD$ - -PKGNAMESUFFIX= -lcl-qt5 - -COMMENT= Lazarus components library - QT5 backend - -BUILD_DEPENDS= ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units - -USE_FPC= fcl-base fcl-db fcl-image fcl-registry fcl-res \ - fcl-xml pasjpeg x11 - -LCL_INTERFACE= qt5 - -MASTERDIR= ${.CURDIR}/../../editors/lazarus - -.include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas b/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas deleted file mode 100644 index 0f1fdf1fc625..000000000000 --- a/editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- interfaces/qt/qt45.pas.orig 2014-02-05 12:08:29 UTC -+++ interfaces/qt/qt45.pas -@@ -45,7 +45,7 @@ const - {$ENDIF} - - {$IFNDEF QTOPIA} -- {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)} -+ {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)} - {$DEFINE BINUX} - Qt4PasLib = 'libQt4Pas.so.5'; - {$ENDIF} diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile index 4c049005311f..b2a53085dd9f 100644 --- a/editors/lazarus-lcl-units/Makefile +++ b/editors/lazarus-lcl-units/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -lcl-units COMMENT= Lazarus components library units USE_FPC= fcl-base fcl-db fcl-image fcl-json fcl-registry \ - fcl-res fcl-xml iconvenc pasjpeg regexpr + fcl-res fcl-xml iconvenc pasjpeg LCL_INTERFACE= # diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index d40ea24ad6e0..19fac27b03aa 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.8.0 +PORTVERSION= 1.6.4 +DISTVERSIONSUFFIX= -0 PORTREVISION?= 0 CATEGORIES= editors devel -MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ +MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \ LOCAL/acm/freepascal DIST_SUBDIR= freepascal @@ -32,12 +33,11 @@ DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} .if !defined(PKGNAMESUFFIX) OPTIONS_DEFINE= GDB OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 +OPTIONS_SINGLE_LCL= GTK2 QT4 GDB_DESC= Install a newest version of gdb GTK2_DESC= Use gtk20 interface QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface OPTIONS_DEFAULT= GTK2 GDB .endif @@ -82,13 +82,6 @@ BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus- RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt .endif -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -.endif - post-extract: @${MKDIR} ${WRKDIR}/man1 @${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/ @@ -99,7 +92,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE} + -e 's|tools: lcl|tools:|g' -e '3080d' -e '3082d' -e '3083d' -e '3084d' -e '3085d' -e '3086d' ${WRKSRC}/${MAKEFILE} pre-build: @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index fc2574cebbdf..8530e29429c0 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513100874 -SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844 -SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372 +TIMESTAMP = 1488377664 +SHA256 (freepascal/lazarus-1.6.4-0.tar.gz) = 336654c5ad32244e64a56511108965b6b8eb25fe5882f61b2c15a24d8435a5e2 +SIZE (freepascal/lazarus-1.6.4-0.tar.gz) = 57180961 diff --git a/editors/lazarus/files/patch-components-synedit_synedit.pp b/editors/lazarus/files/patch-components-synedit_synedit.pp deleted file mode 100644 index 92a6300235d4..000000000000 --- a/editors/lazarus/files/patch-components-synedit_synedit.pp +++ /dev/null @@ -1,20 +0,0 @@ ---- components/synedit/synedit.pp 2018-01-30 13:41:54.904942000 -0500 -+++ components/synedit/synedit.pp 2018-01-30 13:40:23.811860000 -0500 -@@ -8945,7 +8945,7 @@ - while not Highlighter.GetEol do begin - Start := Highlighter.GetTokenPos + 1; - Token := Highlighter.GetToken; -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then begin - Attri := Highlighter.GetTokenAttribute; - TokenType := Highlighter.GetTokenKind; - exit(True); -@@ -8990,7 +8990,7 @@ - //TokenType := Highlighter.GetTokenKind; - Attri := Highlighter.GetTokenAttribute; - //DebugLn([' TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]); -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then - begin - AtIdent := Attri = Highlighter.IdentifierAttribute; - NearString := (Attri = Highlighter.StringAttribute) diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in index 185aa361e4c4..c9404b376f8e 100644 --- a/editors/lazarus/files/pkg-message.in +++ b/editors/lazarus/files/pkg-message.in @@ -27,9 +27,8 @@ The Lazarus RAD was installed editors/lazarus-lcl-nogui editors/lazarus-lcl-gtk2 editors/lazarus-lcl-qt - editors/lazarus-lcl-qt5 - You can added those ports if you want support for nogui, gtk2, qt or qt5 + You can added those ports if you want support for nogui, gtk2 or qt interfaces. Please look at net-p2p/transmission-remote-gui like a example of how use it diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index be4c243b1146..714c5a128556 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -1,6 +1,7 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 2 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile index 92832c56bd7b..101d6f964ce0 100644 --- a/graphics/fpc-opengl/Makefile +++ b/graphics/fpc-opengl/Makefile @@ -1,6 +1,7 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= graphics lang PKGNAMESUFFIX= -opengl diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile index 3591886853b5..666131adb77d 100644 --- a/lang/fpc-base/Makefile +++ b/lang/fpc-base/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= base -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.2 CATEGORIES= lang PKGNAMEPREFIX= fpc- diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile index 363f5b8766fc..d82327b1891c 100644 --- a/lang/fpc-docs/Makefile +++ b/lang/fpc-docs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= docs -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.2 CATEGORIES= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \ ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/ diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo index 3fb596935218..9720cc93874c 100644 --- a/lang/fpc-docs/distinfo +++ b/lang/fpc-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517333020 -SHA256 (freepascal/3.0.4/doc-pdf.tar.gz) = 0c70ac388a5a6a1c775308661ce4feb9cfa9d9c1084fd6939bfa101d5488817b -SIZE (freepascal/3.0.4/doc-pdf.tar.gz) = 9161471 +TIMESTAMP = 1488124955 +SHA256 (freepascal/3.0.2/doc-pdf.tar.gz) = f43d782346773913cda49b4fefd304f0ba10bc5e027f515629e43679c19cf1d6 +SIZE (freepascal/3.0.2/doc-pdf.tar.gz) = 9313946 diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index 6a823b176f7a..f2df562353c8 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= units -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.2 +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= fpc- @@ -19,7 +20,7 @@ ALL_OPTIONS= A52 ASPELL BFD BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \ FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_PDF FCL_REGISTRY FCL_RES \ FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML FFTW \ FPINDEXER FPPKG FV GDBM GMP GOOGLEAPI GTK2 HERMES ICONVENC \ - IMAGEMAGICK LDAP LIBCURL LIBGD LIBMICROHTTPD LIBPNG LIBXML2 LIBVLC LUA MAD \ + IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBXML2 LIBVLC LUA MAD \ MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL \ OPENSSL PASJPEG PCAP PROJ4 PXLIB RSVG REXX RTL_CONSOLE \ RTL_EXTRA RTL_OBJPAS RTL_UNICODE SDL SVGALIB SYMBOLIC \ @@ -73,7 +74,6 @@ IMAGEMAGICK_DESC= Interface to ImageMagick LDAP_DESC= Interface to OpenLDAP LIBCURL_DESC= Interface to curl library LIBGD_DESC= Interface to gd library -LIBMICROHTTPD_DESC= Interface to libmicrohttpd library LIBPNG_DESC= Interface to png library LIBVLC_DESC= Unit for VLC LIBXML2_DESC= Interface to libxml2 library diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index 6ae4deea2375..0c469dad90da 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fpc -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.2 PORTREVISION?= 0 CATEGORIES?= lang MASTER_SITES= ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \ @@ -23,8 +23,8 @@ COMMENT?= Free Pascal compiler with Turbo and Delphi USES= gmake iconv ONLY_FOR_ARCHS= i386 amd64 -BOOTVER= 3.0.4 -MANVER= 3.0.4 +BOOTVER= 3.0.2 +MANVER= 3.0.2 #USE_GITHUB= yes #GH_ACCOUNT= fpc-svn @@ -36,12 +36,12 @@ FPCSRCDIR= ${PORTNAME}-${PORTVERSION} .if ${ARCH} == "i386" PPNAME= ppc386 FPC_ARCH= i386 -PLIST_SUB= FPC_I386="" \ +PLIST_SUB+= FPC_I386="" \ FPC_AMD64="@comment " .elif ${ARCH} == "amd64" PPNAME= ppcx64 FPC_ARCH= x86_64 -PLIST_SUB= FPC_I386="@comment " \ +PLIST_SUB+= FPC_I386="@comment " \ FPC_AMD64="" .endif @@ -177,7 +177,7 @@ do-install: "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \ "${STAGEDIR}${PREFIX}/etc" @${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \ - -e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4;${LOCALBASE}/lib/qt5|g' \ + -e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' \ ${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample .else diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo index 64c847518c73..e549ae0bfef5 100644 --- a/lang/fpc/distinfo +++ b/lang/fpc/distinfo @@ -1,3 +1,11 @@ -TIMESTAMP = 1513096978 -SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845 -SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617 +TIMESTAMP = 1487994867 +SHA256 (freepascal/fpc-3.0.2.source.tar.gz) = 67fccddf5da992356f4e90d836444750ce9363608c7db8e38c077f710fcb6258 +SIZE (freepascal/fpc-3.0.2.source.tar.gz) = 39841597 +SHA256 (freepascal/ppc386-3.0.2-freebsd.tar.gz) = 4f362bdd6cd6917d9623e5e2cdcf9d501713ff86c290c2320f8b0cac2d742d2d +SIZE (freepascal/ppc386-3.0.2-freebsd.tar.gz) = 1145982 +SHA256 (freepascal/ppcx64-3.0.2-freebsd.tar.gz) = 7fcdd9431501420c00b78e21d20bf0caa571cfede8bc98af222b23470ef7f3ef +SIZE (freepascal/ppcx64-3.0.2-freebsd.tar.gz) = 1210777 +SHA256 (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = f74a268a206fbd52d3c92f4e0722cd135ca91c1988a83826401cabdd78b3222b +SIZE (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = 1035650 +SHA256 (freepascal/fpc-3.0.2.man.tar.gz) = daaf316588f35eab08b6c9cec9a0702cebaf985c68e5d3a607e04145f32f27d3 +SIZE (freepascal/fpc-3.0.2.man.tar.gz) = 47298 diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile index 4f21b00f9577..91d50888d1fd 100644 --- a/multimedia/fpc-libvlc/Makefile +++ b/multimedia/fpc-libvlc/Makefile @@ -1,6 +1,7 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= multimedia lang PKGNAMESUFFIX= -libvlc diff --git a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp index 2d85944ec243..e231091c74f6 100644 --- a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp +++ b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp @@ -1,13 +1,13 @@ ---- packages/libvlc/fpmake.pp 2017-09-02 11:48:24.000000000 -0500 -+++ packages/libvlc/fpmake.pp 2017-12-12 12:19:09.246128000 -0500 -@@ -15,15 +15,15 @@ +--- packages/libvlc/fpmake.pp.orig 2015-08-07 13:22:31 UTC ++++ packages/libvlc/fpmake.pp +@@ -15,15 +15,15 @@ begin {$ifdef ALLPACKAGES} P.Directory:=ADirectory; {$endif ALLPACKAGES} - P.OSes := [win32, win64, linux, freebsd]; + P.OSes := [win32, win64, linux, dragonfly, freebsd]; P.Dependencies.Add('fcl-base'); - P.Version:='3.0.4'; + P.Version:='3.0.2'; P.License := 'LGPL with modification'; P.HomepageURL := 'www.freepascal.org'; P.Email := 'michael@freepascal.org'; diff --git a/www/Makefile b/www/Makefile index 840293ccd69e..04fc4b891f73 100644 --- a/www/Makefile +++ b/www/Makefile @@ -181,7 +181,6 @@ SUBDIR += fpc-googleapi SUBDIR += fpc-httpd22 SUBDIR += fpc-httpd24 - SUBDIR += fpc-libmicrohttpd SUBDIR += free-sa-devel SUBDIR += freeway SUBDIR += fswiki diff --git a/www/fpc-libmicrohttpd/Makefile b/www/fpc-libmicrohttpd/Makefile deleted file mode 100644 index 19cd7461b04c..000000000000 --- a/www/fpc-libmicrohttpd/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Christopher Key <cjk32@cam.ac.uk> -# $FreeBSD$ - -CATEGORIES= www lang -PKGNAMESUFFIX= -libmicrohttpd - -COMMENT= Free Pascal libmicrohttpd unit - -USE_FPC= rtl-extra - -MASTERDIR= ${.CURDIR}/../../lang/fpc -WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//} -EXTRACTUNITDIR= ${WRKUNITDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/www/fpc-libmicrohttpd/pkg-plist b/www/fpc-libmicrohttpd/pkg-plist deleted file mode 100644 index 43aaf72b44f8..000000000000 --- a/www/fpc-libmicrohttpd/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/libmicrohttpd.fpm -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libmicrohttpd/libmicrohttpd.o -lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libmicrohttpd/libmicrohttpd.ppu |