svn commit: r470848 - in head/editors/coedit: . files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Fri May 25 16:05:25 UTC 2018
Author: acm
Date: Fri May 25 16:05:23 2018
New Revision: 470848
URL: https://svnweb.freebsd.org/changeset/ports/470848
Log:
- Update to 3.6.4
- Add FLAVORS
Approved by: portmgr
Differential Revision: https://reviews.freebsd.org/D14661
Modified:
head/editors/coedit/Makefile
head/editors/coedit/distinfo
head/editors/coedit/files/patch-dastworx_build.sh
Modified: head/editors/coedit/Makefile
==============================================================================
--- head/editors/coedit/Makefile Fri May 25 16:00:46 2018 (r470847)
+++ head/editors/coedit/Makefile Fri May 25 16:05:23 2018 (r470848)
@@ -1,18 +1,17 @@
-# Created by: Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
PORTNAME= coedit
-PORTVERSION= 3.6.1
+PORTVERSION= 3.6.4
DISTVERSIONPREFIX=v
CATEGORIES= editors
+PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
MAINTAINER= acm at FreeBSD.org
COMMENT= IDE for the D programming language
LICENSE= BSL
-BUILD_DEPENDS= lazbuild:editors/lazarus \
- ldmd2:lang/ldc \
+BUILD_DEPENDS= ldmd2:lang/ldc \
${LOCALBASE}/lib/d/libiz.a:devel/iz \
${LOCALBASE}/lib/d/libdparse.a:devel/libdparse
RUN_DEPENDS= ldmd2:lang/ldc \
@@ -26,10 +25,11 @@ USE_GITHUB= yes
GH_ACCOUNT= BBasile
GH_PROJECT= Coedit
-USES= fpc
-USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
+USES= fpc lazarus:flavors
+USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
fcl-stl fcl-web fcl-xml numlib openssl pasjpeg rtl-objpas \
regexpr rtl-extra x11
+USE_XORG= x11
DESKTOP_ENTRIES="Coedit" \
"IDE for the D programming language" \
@@ -38,39 +38,24 @@ DESKTOP_ENTRIES="Coedit" \
"Application;IDE;Development;" \
${TRUE}
-OPTIONS_SINGLE= LCL
-OPTIONS_SINGLE_LCL= GTK2 QT4 QT5
+D_LIB_DIR= ${LOCALBASE}/lib/d
+D_INCLUDE_DIR= ${LOCALBASE}/include/d
-GTK2_DESC= Use gtk20 interface
-QT4_DESC= Use qt4 interface
-QT5_DESC= Use qt5 interface
+LAZARUS_PROJECT_FILES= anchordocking/anchordocking.lpk lazproj/coedit.lpi
-OPTIONS_DEFAULT= GTK2
+LAZBUILD_ARGS= -d
-D_LIB_DIR= ${LOCALBASE}/lib/d
-D_INCLUDE_DIR= ${LOCALBASE}/include/d
-PROJECT_FILE= lazproj/coedit.lpi
-LAZARUS_VER= 1.8.0
-LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild
-LAZARUS_DIR= ${WRKSRC}/lazarus-${LAZARUS_VER}
-LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
LDMD2_CMD= ${LOCALBASE}/bin/ldmd2
-GTK2_BUILD_DEPENDS= ${LCL_UNITS_DIR}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2
-GTK2_USE= GNOME=gtk20 FPC=gtk2
-GTK2_MAKE_ENV= GUI=gtk2
-GTK2_VARS= LCL_PLATFORM=gtk2
+gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4
-QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt/interfaces.ppu:editors/lazarus-lcl-qt
-QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas
-QT4_MAKE_ENV= GUI=qt
-QT4_VARS= LCL_PLATFORM=qt
+.if ${FLAVOR:Ugtk2:Mgtk2}
+USE_FPC+= cairo
+USE_GNOME+= cairo
+.endif
-QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt5/interfaces.ppu:editors/lazarus-lcl-qt5
-QT4_LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas
-QT4_MAKE_ENV= GUI=qt5
-QT4_VARS= LCL_PLATFORM=qt5
-
post-patch:
${REINPLACE_CMD} -e 's|%%LDMD2_CMD%%|${LDMD2_CMD}|g' \
-e 's|%%D_LIB_DIR%%|${D_LIB_DIR}|g' \
@@ -79,20 +64,12 @@ post-patch:
${REINPLACE_CMD} -e 's|LINUX|UNIX|g' ${WRKSRC}/src/ce_common.pas ${WRKSRC}/src/ce_dcd.pas
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/ce_compilers.pas
-pre-build:
+post-configure:
@${MKDIR} ${WRKSRC}/tmppcp
- @${MKDIR} ${LAZARUS_DIR}
- @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \
- ${FIND} * -type d -exec ${MKDIR} ${LAZARUS_DIR}/{} \;
- @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \
- ${FIND} * -type f -exec ${LN} -fs ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/{} ${LAZARUS_DIR}/{} \;
- @${FIND} ${LAZARUS_DIR} -type d -name ${BUILDNAME} -type d -print0 | \
- ${XARGS} -0 ${RM} -R
+ ${CP} -a ${LAZARUS_DIR}/components/anchordocking ${WRKSRC}
-do-build:
+pre-build:
@cd ${WRKSRC}/dastworx && ${SH} build.sh
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} --pcp=${WRKSRC}/tmppcp ${PROJECT_FILE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/coedit ${STAGEDIR}${PREFIX}/bin/
Modified: head/editors/coedit/distinfo
==============================================================================
--- head/editors/coedit/distinfo Fri May 25 16:00:46 2018 (r470847)
+++ head/editors/coedit/distinfo Fri May 25 16:05:23 2018 (r470848)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517606831
-SHA256 (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 8bb0b6ec365c70c81a89e696b9fbfcd9a0a77f3fd5dae8b94b4b4049d95b0e9b
-SIZE (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 3857174
+TIMESTAMP = 1520727939
+SHA256 (BBasile-Coedit-v3.6.4_GH0.tar.gz) = afed9234facf9683e0de3620f97d2f00e4b35aae38e7b39b3bd5333ba3278052
+SIZE (BBasile-Coedit-v3.6.4_GH0.tar.gz) = 3862290
Modified: head/editors/coedit/files/patch-dastworx_build.sh
==============================================================================
--- head/editors/coedit/files/patch-dastworx_build.sh Fri May 25 16:00:46 2018 (r470847)
+++ head/editors/coedit/files/patch-dastworx_build.sh Fri May 25 16:05:23 2018 (r470848)
@@ -1,6 +1,6 @@
---- dastworx/build.sh.orig 2017-07-14 05:55:36 UTC
-+++ dastworx/build.sh
-@@ -1,13 +1,3 @@
+--- dastworx/build.sh 2018-02-11 21:48:35.000000000 -0500
++++ dastworx/build.sh 2018-02-12 12:01:10.311013000 -0500
+@@ -1,18 +1,3 @@
-#iz sources
-cd ../etc/iz/import/
-iz=$(find `pwd` -type f -name \*.d)
@@ -11,23 +11,23 @@
-dparse=$(find `pwd` -type f -name \*.d)
-cd ../../../dastworx
-
+-#stdx-alloc sources
+-cd ../etc/stdx-allocator/source/
+-stdxalloc=$(find `pwd` -type f -name \*.d)
+-cd ../../../dastworx
+-
#dast sources
cd src/
dast=$(find `pwd` -type f -name \*.d)
-@@ -16,12 +6,12 @@ cd ../
+@@ -21,9 +6,9 @@
echo building...
#build
--dmd ${dast[@]} ${dparse[@]} ${iz[@]} \
-+%%LDMD2_CMD%% ${dast} \
+-dmd ${dast[@]} ${dparse[@]} ${iz[@]} ${stdxalloc[@]} \
++%%LDMD2_CMD%% ${dast} \
-O -release -inline -boundscheck=off \
---Isrc -I../etc/iz/import -I../etc/libdparse/src \
+--Isrc -I../etc/iz/import -I../etc/libdparse/src -I../etc/stdx-allocator/source \
+-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_LIB_DIR%%/libdparse.a \
-of../bin/dastworx
#cleanup
- rm ../bin/dastworx.o
-
--echo ...done
-\ No newline at end of file
-+echo ...done
More information about the svn-ports-head
mailing list