diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c7b35b125c6a..4a75a8bf3b20 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -1,162 +1,162 @@ # MAINTAINER: ports@FreeBSD.org # # Note: before committing to this file, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. # # Provide default versions for ports with multiple versions selectable # by the user. # # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # # DEFAULT_VERSIONS= perl5=5.20 ruby=2.7 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT GL \ IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL NINJA PERL5 \ PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH .if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" .endif #.undef ${lang}_DEFAULT .endfor .for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} .endfor # Possible values: 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 5, 6, 18 BDB_DEFAULT?= 5 # Possible values: 2, 3 COROSYNC_DEFAULT?= 2 # Possible_values: full canna nox devel_full devel_nox #EMACS_DEFAULT?= let the flavor be the default if not explicitly set # Possible values: 2.5, 3.0, 4.0 FIREBIRD_DEFAULT?= 2.5 # Possible values: flang (experimental), gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.2.2 FPC_DEFAULT?= 3.2.2 # Possible values: 8 (last to support powerpcspe), 9, 10, 11 # (Any other version is completely unsupported and not meant for general use.) .if ${ARCH} == "powerpcspe" GCC_DEFAULT?= 8 .else GCC_DEFAULT?= 10 .endif # Possible values: mesa-libs, mesa-devel GL_DEFAULT?= mesa-libs # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl # Possible values: 6, 6-nox11, 7, 7-nox11 IMAGEMAGICK_DEFAULT?= 7 # Possible values: 7, 8, 11, 12, 13, 14, 15, 16 JAVA_DEFAULT?= 8 -# Possible values: 2.0.10 -LAZARUS_DEFAULT?= 2.0.10 +# Possible values: 2.0.12 +LAZARUS_DEFAULT?= 2.0.12 # Possible values: rust, legacy .if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc) LIBRSVG2_DEFAULT?= rust .else LIBRSVG2_DEFAULT?= legacy .endif # Possible values: c7 LINUX_DEFAULT?= c7 # Possible values: 70, 80, 90, 10, 11, -devel (to be used when non-base compiler is required) # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before # bumping the LLVM version. .if ${ARCH} == powerpc LLVM_DEFAULT?= 10 .else LLVM_DEFAULT?= 90 .endif # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.2 # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT= 5.10 # Possible values: 5.5, 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.5p, 5.6p, 5.7p, 5.6w, 5.7w MYSQL_DEFAULT?= 5.7 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja # Possible values: 5.30, 5.32, 5.34, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.32 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. .if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= ${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;' .endif _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.6, 10, 11, 12, 13 PGSQL_DEFAULT?= 12 # Possible values: 7.3, 7.4, 8.0 PHP_DEFAULT?= 7.4 # Possible values: 2.7, 3.6, 3.7, 3.8, 3.9, 3.10 PYTHON_DEFAULT?= 3.8 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.6, 3.7, 3.8, 3.9, 3.10 PYTHON3_DEFAULT?= 3.8 # Possible values: 2.6, 2.7, 3.0 RUBY_DEFAULT?= 2.7 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust # Possible values: 4.12, 4.13 SAMBA_DEFAULT?= 4.12 # Possible values: base, openssl, libressl, libressl-devel .if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. . if !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) . if defined(PKG_BIN) # find installed port and use it for dependency . if !defined(OPENSSL_INSTALLED) . if defined(DESTDIR) PKGARGS= -c ${DESTDIR} . else PKGARGS= . endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : . endif . if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" . endif . else check-makevars:: @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" @${ECHO_MSG} "to determine what port it comes from." @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." @${FALSE} . endif . endif . endif # Make sure we have a default in the end SSL_DEFAULT?= base .endif # Possible values: 8.5, 8.6, 8.7 TCLTK_DEFAULT?= 8.6 # Possible values: 4, 6 VARNISH_DEFAULT?= 4 .endif diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index c9d2efc1af75..948769789a1b 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -1,178 +1,178 @@ PORTNAME= lazarus -PORTVERSION= 2.0.10 -DISTVERSIONSUFFIX= -2 +PORTVERSION= 2.0.12 +#DISTVERSIONSUFFIX= -2 PKGNAMESUFFIX?= -gtk2 -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ LOCAL/acm/freepascal DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) CONFLICTS?= ${PORTNAME}-qt5-* BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils RUN_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ gmake:devel/gmake \ fpcres:lang/fpc-utils \ ${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source ONLY_FOR_ARCHS= i386 amd64 USES= desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg USE_FPC?= chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ fcl-registry fcl-res fcl-web fcl-xml fppkg gtk2 ibase iconvenc mysql \ numlib odbc opengl openssl oracle pasjpeg postgres regexpr rtl-extra \ rtl-generics sqlite x11 USE_XORG= x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= GDB GDB_DESC= Install a newest version of gdb OPTIONS_DEFAULT= GDB .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} LCL_PLATFORM?= gtk2 MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" .if ${PORT_OPTIONS:MGDB} RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb .endif .if ${PKGNAMESUFFIX} == "-gtk2" USES+= gnome USE_GNOME= cairo gtk20 gdkpixbuf2 .endif post-extract: @${MKDIR} ${WRKDIR}/man1 @${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/examples ${WRKDIR}/examples @${MV} ${WRKSRC}/docs ${WRKDIR}/docs post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|startlazarus|${PORTNAME}|g' ${WRKSRC}/install/${PORTNAME}.desktop do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ ${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \ ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper @${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper @${RM} ${PLIST} @${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS . for FILE in bin/lazarus bin/lazbuild @${ECHO_CMD} ${FILE} >> ${PLIST} . endfor . for m in ${MAN1S} @${ECHO_CMD} man/man1/${m}.gz >> ${PLIST} . endfor @${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST} @cd ${WRKDIR}/docs && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} @${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST} @cd ${WRKDIR}/examples && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} @${ECHO_CMD} "share/applications/lazarus.desktop" >> ${PLIST} . for RESO in 128 16 256 32 48 64 @${ECHO_CMD} share/icons/hicolor/${RESO}x${RESO}/apps/lazarus.png >> ${PLIST} . endfor @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" | ${SORT} | ${SED} -e 's|^|share/icons/hicolor/48x48/mimetypes/|' >> ${PLIST} @${ECHO_CMD} "share/icons/hicolor/scalable/apps/lazarus.svg" >> ${PLIST} @${ECHO_CMD} "share/mime/packages/lazarus.xml" >> ${PLIST} do-install: .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \ packager tools units @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor @${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \ ${STAGEDIR}${DATADIR}/tools/updatepofiles .for FILE in lazarus startlazarus lazbuild ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR} .endfor @cd ${WRKDIR}/docs && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \; @${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs @cd ${WRKDIR}/examples && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \; @${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples .for RESO in 128 16 256 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps ${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}${RESO}x${RESO}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps/${PORTNAME}.png .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes/{} \; @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps @${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml ${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/Makefile* ${WRKSRC}/fpmake* ${STAGEDIR}${DATADIR} .for FILE in ${MAN1S} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor ${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild .include diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index 4dea61ea43e7..80348a92039a 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601836014 -SHA256 (freepascal/lazarus-2.0.10-2.tar.gz) = 64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7 -SIZE (freepascal/lazarus-2.0.10-2.tar.gz) = 69626076 +TIMESTAMP = 1627717078 +SHA256 (freepascal/lazarus-2.0.12.tar.gz) = ba6cef7f823a2d28166229982efc926039d42313c40e22fe0c6776c13d0015b2 +SIZE (freepascal/lazarus-2.0.12.tar.gz) = 69560778 diff --git a/editors/lazarus/files/patch-Makefile b/editors/lazarus/files/patch-Makefile deleted file mode 100644 index 9ac26bed5b2e..000000000000 --- a/editors/lazarus/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2018-02-25 03:49:41.000000000 -0500 -+++ Makefile 2018-03-06 15:24:00.905598000 -0500 -@@ -339,7 +339,7 @@ - LAZARUS_INSTALL_DIR=C:\lazarus - endif - ifneq ($(findstring $(OS_TARGET),freebsd),) --LAZARUS_INSTALL_DIR=/usr/local/lazarus -+LAZARUS_INSTALL_DIR=%%DATADIR%% - endif - ifneq ($(findstring $(OS_TARGET),win32 win64),) - IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat)