diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-10-29 17:38:01 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2023-11-10 20:13:20 +0000 |
| commit | 84584fcab510d17e7d30d71fd47942c40b6d536a (patch) | |
| tree | f7aaef92e6b08f524739e112937547887701ec3b | |
| parent | b14983e6dacbac75430c67fe2a8bd0dd0f406d52 (diff) | |
| download | ports-84584fcab510d17e7d30d71fd47942c40b6d536a.tar.gz ports-84584fcab510d17e7d30d71fd47942c40b6d536a.zip | |
editors/lazarus-*: Update CONFLICTS
- editors/lazarus-qt5: Bump PORTREVISION. qt5pas was updated
- editors/lazarus-*: Add -p to ${INSTALL_DATA} to Add -p to ${INSTALL_DATA} to
preserves the access and modification times. It avoid issues with checksum
changes and it improves compile time when lazarus ide is rebuild by users.
- Bump PORTREVISION
(cherry picked from commit 8c962df69fb136431a541f4bbd64e24e8e3eff64)
| -rw-r--r-- | editors/lazarus-qt5/Makefile | 4 | ||||
| -rw-r--r-- | editors/lazarus/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile index c23c7c3a3856..1e0e96340327 100644 --- a/editors/lazarus-qt5/Makefile +++ b/editors/lazarus-qt5/Makefile @@ -1,10 +1,10 @@ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX?= -qt5 COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5) -CONFLICTS= ${PORTNAME}-gtk2 +CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5-devel lazarus-qt6-devel LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index d48af3565a26..6f80a1243386 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -2,7 +2,7 @@ PORTNAME= lazarus PORTVERSION= 2.2.6 DISTVERSIONSUFFIX= -0 PKGNAMESUFFIX?= -gtk2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ LOCAL/acm/freepascal @@ -12,7 +12,7 @@ MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) WWW= https://www.lazarus-ide.org/ -CONFLICTS?= ${PORTNAME}-qt5 +CONFLICTS?= lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel lazarusqt6-devel BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils @@ -136,7 +136,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; + ${FIND} * -type f -exec ${INSTALL_DATA} -p {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor @${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \ ${STAGEDIR}${DATADIR}/tools/updatepofiles |