diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-05-20 05:35:12 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-05-20 05:35:12 +0000 |
| commit | 0868be1e330082b4abefb7237d3e15a6b647d506 (patch) | |
| tree | 483e12e35623542510f01adc55fe405b84424a7f /editors | |
| parent | Upgrade to 2.13.10. (diff) | |
- Fix build
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=297001
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/lazarus/Makefile | 11 | ||||
| -rw-r--r-- | editors/lazarus/files/patch-ide_Makefile | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 0a03fcd5a88d..b66d4d76d6bd 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -7,7 +7,7 @@ PORTNAME= lazarus PORTVERSION= 0.9.30.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= editors devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} \ @@ -21,8 +21,6 @@ COMMENT?= A portable Delphi-like IDE for the FreePascal compiler BUILD_DEPENDS?= # RUN_DEPENDS?= # -BROKEN= does not build - PROJECTHOST= bsdistfiles ONLY_FOR_ARCHS= i386 amd64 @@ -31,7 +29,10 @@ USE_GMAKE= yes USE_GNOME= # USE_FPC?= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-res fcl-xml \ iconvenc pasjpeg x11 -MAKE_ENV= OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${LOCALBASE}/lib/qt4 ${OPT_EXTRA}" +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" PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} @@ -53,8 +54,10 @@ LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME} .if !defined(PKGNAMESUFFIX) BUILD_DEPENDS+= fpcres:${PORTSDIR}/lang/fpc-utils \ + ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \ ${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui RUN_DEPENDS+= fpcres:${PORTSDIR}/lang/fpc-utils \ + ${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \ ${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui USE_ICONV= yes diff --git a/editors/lazarus/files/patch-ide_Makefile b/editors/lazarus/files/patch-ide_Makefile new file mode 100644 index 000000000000..6a29697b2cda --- /dev/null +++ b/editors/lazarus/files/patch-ide_Makefile @@ -0,0 +1,11 @@ +--- 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 |