diff options
author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-12-12 21:05:08 +0000 |
---|---|---|
committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-12-12 21:05:08 +0000 |
commit | 2a4cd6bf954c6a6219d3773868095f15f418cf31 (patch) | |
tree | 8ffcfb9d9c120819f7d34974fd98228bde8928b9 /editors | |
parent | - Update to 3.5,1 (diff) |
- Update to 1.0.4
- Add support for OptionsNG
- Remove obsolete patch files
Notes
Notes:
svn path=/head/; revision=308795
Diffstat (limited to 'editors')
-rw-r--r-- | editors/lazarus/Makefile | 45 | ||||
-rw-r--r-- | editors/lazarus/Makefile.common | 11 | ||||
-rw-r--r-- | editors/lazarus/distinfo | 4 | ||||
-rw-r--r-- | editors/lazarus/files/patch-ide_Makefile | 11 | ||||
-rw-r--r-- | editors/lazarus/files/patch-ide_Makefile.fpc | 10 |
5 files changed, 32 insertions, 49 deletions
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 68f37ff09243..2aa536e8c547 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -1,18 +1,14 @@ -# New ports collection makefile for: lazarus -# Date Created: 2006-02-09 -# Whom: Shaun Amott <shaun@inerd.com> -# +# Created by: Shaun Amott <shaun@inerd.com> # $FreeBSD$ -# PORTNAME= lazarus -PORTVERSION= 0.9.30.4 -PORTREVISION?= 3 +PORTVERSION= 1.0.4 +PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} \ SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-src/} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-1/} DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org @@ -24,7 +20,7 @@ RUN_DEPENDS?= # PROJECTHOST= bsdistfiles ONLY_FOR_ARCHS= i386 amd64 -USE_BZIP2= yes +#USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= # USE_FPC?= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-res fcl-xml \ @@ -32,13 +28,20 @@ USE_FPC?= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-res fcl-xml \ MAKE_ENV= OPT="-Sgic -Fu../lcl -Fu../lcl/widgetset -Fu../lcl/forms -Fu../../lcl \ -Fu../../lcl/forms -Fu../../lcl/widgetset -Fu../../lcl/nonwin32 \ -Fu. -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${LOCALBASE}/lib/qt4 \ - ${OPT_EXTRA} -Fi../lcl/include -Fi../../lcl/include" + ${OPT_EXTRA} -Fi../lcl/include -Fi../../lcl/include \ + -Fu../components/lazutils -Fu../../components/lazutils" PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} .if !defined(PKGNAMESUFFIX) -OPTIONS= GTK2 "Use gtk20 interface instead of gtk12" on \ - QT4 "Use qt4 interface" off +OPTIONS_SINGLE= LCL +OPTIONS_SINGLE_LCL= GTK1 GTK2 QT4 + +GTK1_DESC= Use gtk12 interface +GTK2_DESC= Use gtk20 interface +QT4_DESC= Use qt4 interface + +OPTIONS_DEFAULT= GTK2 .endif .include <bsd.port.pre.mk> @@ -67,27 +70,23 @@ MAN1= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" -.if defined(WITH_GTK2) && defined(WITH_QT4) -IGNORE= please select only one option QT4 or GTK2, don't select both options -.endif - -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 USE_GNOME= gtk20 gdkpixbuf LCL_PLATFORM= gtk2 BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2 RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2 -.else -.if !defined(WITH_QT4) +.endif + +.if ${PORT_OPTIONS:MGTK1} USE_FPC+= gtk1 USE_GNOME= gtk12 gdkpixbuf LCL_PLATFORM= gtk BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk .endif -.endif -.if defined(WITH_QT4) +.if ${PORT_OPTIONS:MQT4} LIB_DEPENDS+= Qt4Pas.5:${PORTSDIR}/x11-toolkits/qt4pas LCL_PLATFORM= qt BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt @@ -105,14 +104,14 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '3519d' ${WRKSRC}/${MAKEFILE} + -e 's|tools: lcl|tools:|g' -e '2744d' ${WRKSRC}/${MAKEFILE} pre-build: @${LN} -s ${LOCALBASE}/share/${PORTNAME}/lcl/units ${WRKSRC}/lcl/units do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} packager/registration ideintf components ide starter lazbuilder LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${GMAKE} registration lazutils codetools ideintf basecomponents ide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} tools LCL_PLATFORM=${LCL_PLATFORM} diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common index bec02aeda69d..9f248e05a0bf 100644 --- a/editors/lazarus/Makefile.common +++ b/editors/lazarus/Makefile.common @@ -1,9 +1,10 @@ -# $FreeBSD: /tmp/pcvs/ports/editors/lazarus/Makefile.common,v 1.1 2012-05-07 19:08:40 acm Exp $ +# $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.2 2012/11/17 05:57:14 svnexp Exp $ -USE_BZIP2= yes +#USE_BZIP2= yes USE_GMAKE= yes -EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${LCLDIR} +EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${LCLDIR} ${PORTNAME}/packager/registration \ + ${PORTNAME}/components/lazutils PATCHDIR= ${.CURDIR}/files FILESDIR= ${.CURDIR}/files PLIST_SUB+= BUILDNAME=${BUILDNAME} @@ -25,6 +26,10 @@ pre-build: .endif do-build: + @cd ${WRKDIR}/${PORTNAME}/packager/registration && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @cd ${BUILDSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index 1739e0414ba0..3fbb4dc71a3a 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,2 +1,2 @@ -SHA256 (freepascal/lazarus-0.9.30.4-src.tar.bz2) = bbfec390d788d1ba52cb4243fbb487f0463fffc6a9a1b260e1268be13a79cd4e -SIZE (freepascal/lazarus-0.9.30.4-src.tar.bz2) = 17790596 +SHA256 (freepascal/lazarus-1.0.4-1.tar.gz) = e3a52fe5a1053d12fa2c6a4c89faf5487c3184ad584324b0c640db87b5b85744 +SIZE (freepascal/lazarus-1.0.4-1.tar.gz) = 46146420 diff --git a/editors/lazarus/files/patch-ide_Makefile b/editors/lazarus/files/patch-ide_Makefile deleted file mode 100644 index 6a29697b2cda..000000000000 --- a/editors/lazarus/files/patch-ide_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ide/Makefile 2012-05-19 18:19:56.000000000 -0500 -+++ ide/Makefile 2012-05-19 18:20:30.000000000 -0500 -@@ -3315,7 +3315,7 @@ - revisioninc: - ifneq ($(USESVN2REVISIONINC),0) - ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),) -- $(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) OPT='' -+ $(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) OPT='$(OPT)' - endif - ../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc - endif diff --git a/editors/lazarus/files/patch-ide_Makefile.fpc b/editors/lazarus/files/patch-ide_Makefile.fpc deleted file mode 100644 index e0af5f004ed3..000000000000 --- a/editors/lazarus/files/patch-ide_Makefile.fpc +++ /dev/null @@ -1,10 +0,0 @@ ---- ide/Makefile.fpc 2009-04-29 13:07:55.000000000 -0500 -+++ ide/Makefile.fpc 2009-04-29 13:15:23.000000000 -0500 -@@ -22,6 +22,7 @@ - ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \ - ../components/custom \ - ../components/mpaslex \ -+ ../ideintf \ - ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) \ - ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) \ - ../debugger \ |