svn commit: r308795 - in head/editors/lazarus: . files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Wed Dec 12 21:05:09 UTC 2012
Author: acm
Date: Wed Dec 12 21:05:08 2012
New Revision: 308795
URL: http://svnweb.freebsd.org/changeset/ports/308795
Log:
- Update to 1.0.4
- Add support for OptionsNG
- Remove obsolete patch files
Deleted:
head/editors/lazarus/files/patch-ide_Makefile
head/editors/lazarus/files/patch-ide_Makefile.fpc
Modified:
head/editors/lazarus/Makefile
head/editors/lazarus/Makefile.common
head/editors/lazarus/distinfo
Modified: head/editors/lazarus/Makefile
==============================================================================
--- head/editors/lazarus/Makefile Wed Dec 12 20:52:37 2012 (r308794)
+++ head/editors/lazarus/Makefile Wed Dec 12 21:05:08 2012 (r308795)
@@ -1,18 +1,14 @@
-# New ports collection makefile for: lazarus
-# Date Created: 2006-02-09
-# Whom: Shaun Amott <shaun at inerd.com>
-#
+# Created by: Shaun Amott <shaun at 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 at 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-
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 startlaz
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}
Modified: head/editors/lazarus/Makefile.common
==============================================================================
--- head/editors/lazarus/Makefile.common Wed Dec 12 20:52:37 2012 (r308794)
+++ head/editors/lazarus/Makefile.common Wed Dec 12 21:05:08 2012 (r308795)
@@ -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}
Modified: head/editors/lazarus/distinfo
==============================================================================
--- head/editors/lazarus/distinfo Wed Dec 12 20:52:37 2012 (r308794)
+++ head/editors/lazarus/distinfo Wed Dec 12 21:05:08 2012 (r308795)
@@ -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
More information about the svn-ports-head
mailing list