- Update to 1.8.2

- Remove obsolete files
- Modify pkg-message file

Differential Revision:	https://reviews.freebsd.org/D14661
This commit is contained in:
Jose Alonso Cardenas Marquez 2018-05-25 15:57:05 +00:00
parent b9ff60575f
commit 240f0b298b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=470845
6 changed files with 25 additions and 209 deletions

View file

@ -1,8 +1,8 @@
# Created by: Shaun Amott <shaun@inerd.com>
# $FreeBSD$
PORTNAME= lazarus
PORTVERSION= 1.8.0
PORTVERSION= 1.8.2
PKGNAMESUFFIX?= -gtk2
PORTREVISION?= 0
CATEGORIES= editors devel
MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
@ -10,16 +10,17 @@ MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
DIST_SUBDIR= freepascal
MAINTAINER?= acm@FreeBSD.org
COMMENT?= Portable Delphi-like IDE for the FreePascal compiler
COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2)
BUILD_DEPENDS?= #
RUN_DEPENDS?= #
CONFLICTS?= ${PORTNAME}-qt4-* ${PORTNAME}-qt5-*
BUILD_DEPENDS?= fpcres:lang/fpc-utils
RUN_DEPENDS?= fpcres:lang/fpc-utils
ONLY_FOR_ARCHS= i386 amd64
USES= fpc gmake
USE_GNOME= #
USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
USES= fpc gettext gmake iconv
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 gtk2 ibase iconvenc mysql \
numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \
sqlite x11
@ -31,36 +32,16 @@ PLIST= ${WRKDIR}/pkg-plist
WRKSRC?= ${WRKDIR}/${PORTNAME}
DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION}
.if !defined(PKGNAMESUFFIX)
OPTIONS_DEFINE= GDB
OPTIONS_SINGLE= LCL
OPTIONS_SINGLE_LCL= GTK2 QT4 QT5
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
.include <bsd.port.options.mk>
LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,}
BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl}
LCL_UNITS_DIR= ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
.if !defined(PKGNAMESUFFIX)
BUILD_DEPENDS+= fpcres:lang/fpc-utils \
${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
RUN_DEPENDS+= fpcres:lang/fpc-utils \
${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
USES+= gettext iconv
USE_FPC+= chm
LCL_PLATFORM?= gtk2
MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1
SUB_FILES= pkg-message
@ -70,25 +51,9 @@ SUB_LIST+= PORTSDIR="${PORTSDIR}"
RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb
.endif
.if ${PORT_OPTIONS:MGTK2}
.if ${PKGNAMESUFFIX} == "-gtk2"
USES+= gnome
USE_GNOME= cairo gtk20 gdkpixbuf2
LCL_PLATFORM= gtk2
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
.endif
.if ${PORT_OPTIONS:MQT4}
LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas
LCL_PLATFORM= qt
BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
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:
@ -100,28 +65,18 @@ post-extract:
@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
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}
pre-build:
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE}
do-build:
@cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
${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/units components/ideintf/units \
components/synedit/units components/lazcontrols/lib
ide/Makefile*.orig ide/Makefile*.bak
pre-install:
@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
@ -129,7 +84,6 @@ pre-install:
@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
@${RM} ${PLIST}
@${RM} ${WRKSRC}/lcl/units
@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
${WRKSRC}/lazarus.app/Contents/MacOS \
${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
@ -187,8 +141,4 @@ do-install:
.endfor
${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
.else
.include "${MASTERDIR}/Makefile.common"
.endif
.include <bsd.port.mk>

View file

@ -1,104 +0,0 @@
# $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.3 2012/12/12 21:08:13 svnexp Exp $
EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \
${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \
${PORTNAME}/images ${PORTNAME}/components/synedit \
${PORTNAME}/components/lazcontrols
.if ${PKGNAMESUFFIX} == "-lcl-nogui"
EXTRACT_AFTER_ARGS+= ${PORTNAME}/components/debuggerintf \
${PORTNAME}/components/lazdebuggergdbmi
.endif
PATCHDIR= ${.CURDIR}/files
FILESDIR= ${.CURDIR}/files
PLIST_SUB+= BUILDNAME=${BUILDNAME}
LCLDIR= ${PORTNAME}/lcl
WRKSRC= ${WRKDIR}/${LCLDIR}
.if ${PKGNAMESUFFIX} != "-lcl-units"
BUILDSRC= ${WRKSRC}/interfaces
.else
BUILDSRC= ${WRKSRC}
.endif
.if ${PKGNAMESUFFIX} != "-lcl-units"
pre-build:
@${MKDIR} ${WRKSRC}/units/${BUILDNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/
@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/
.endif
do-build:
@cd ${WRKDIR}/${PORTNAME}/packager/registration && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
@cd ${WRKDIR}/${PORTNAME}/components/lazutils && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
@cd ${WRKDIR}/${PORTNAME}/components/ideintf && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
@cd ${WRKDIR}/${PORTNAME}/components/synedit && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
.if ${PKGNAMESUFFIX} == "-lcl-nogui"
@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
.endif
@cd ${BUILDSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
pre-install:
@${RM} ${PLIST}
@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
.if ${PKGNAMESUFFIX} == "-lcl-nogui"
@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/debuggerintf/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST}
@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazdebuggergdbmi/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST}
.endif
@cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
@cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}
.if ${PKGNAMESUFFIX} == "-lcl-nogui"
@${MKDIR} ${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}
@${MKDIR} ${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}
.endif
@${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}
@${MKDIR} ${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}
@${MKDIR} ${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}
@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
.if ${PKGNAMESUFFIX} == "-lcl-nogui"
@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}/{}" \;
@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}/{}" \;
.endif
@cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
@cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \
${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \;

View file

@ -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 = 1520354258
SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219
SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678

View file

@ -1,6 +1,6 @@
--- Makefile 2014-03-23 19:30:47.000000000 -0500
+++ Makefile 2014-03-25 19:19:37.000000000 -0500
@@ -294,7 +294,7 @@
--- 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),)
@ -9,12 +9,3 @@
endif
ifneq ($(findstring $(OS_TARGET),win32 win64),)
IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat)
@@ -2848,7 +2848,7 @@
examples:
$(MAKE) -C examples
all: lazbuild lcl basecomponents ide starter
-bigide: lazbuild lcl basecomponents bigidecomponents idebig starter lhelp
+bigide: lazbuild bigidecomponents idebig starter lhelp
cleanide:
$(MAKE) -C ide cleanide
cleanlaz: cleanide

View file

@ -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)

View file

@ -24,12 +24,11 @@ The Lazarus RAD was installed
and these can be built with an interface different than lazarus has compiled
by default:
editors/lazarus-lcl-nogui
editors/lazarus-lcl-gtk2
editors/lazarus-lcl-qt
editors/lazarus-lcl-qt5
editors/lazarus
editors/lazarus-qt4
editors/lazarus-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 gtk2, qt4 or qt5
interfaces. Please look at net-p2p/transmission-remote-gui like a example of
how use it