From owner-svn-ports-all@FreeBSD.ORG Sun Jan 11 03:22:53 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 405A52B1; Sun, 11 Jan 2015 03:22:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0A5AF7; Sun, 11 Jan 2015 03:22:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0B3MrNU039644; Sun, 11 Jan 2015 03:22:53 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0B3MqCj039641; Sun, 11 Jan 2015 03:22:52 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201501110322.t0B3MqCj039641@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Sun, 11 Jan 2015 03:22:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376733 - in head/comms/cqrlog: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2015 03:22:53 -0000 Author: acm Date: Sun Jan 11 03:22:51 2015 New Revision: 376733 URL: https://svnweb.freebsd.org/changeset/ports/376733 QAT: https://qat.redports.org/buildarchive/r376733/ Log: - Bump PORTREVISION. lazarus has been updated - Add QT/GTK2 OPTIONS like another lazarus app ports - Copy lazarus directory to WRKSRC is not neccesary anymore - Clean up Modified: head/comms/cqrlog/Makefile head/comms/cqrlog/files/environmentoptions.xml.in head/comms/cqrlog/files/patch-Makefile Modified: head/comms/cqrlog/Makefile ============================================================================== --- head/comms/cqrlog/Makefile Sun Jan 11 03:18:46 2015 (r376732) +++ head/comms/cqrlog/Makefile Sun Jan 11 03:22:51 2015 (r376733) @@ -3,6 +3,7 @@ PORTNAME= cqrlog PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://www.cqrlog.com/files/cqrlog_${PORTVERSION}/ \ ${MASTER_SITE_LOCAL} @@ -18,24 +19,36 @@ BUILD_DEPENDS= lazbuild:${PORTSDIR}/edit LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_FPC= gtk2 +USE_FPC= yes +WANT_GNOME= yes ALL_TARGET= ${PORTNAME} -GETLAZDIR= ${AWK} '/cd .* .* exit/ { print $$2 }' ${LOCALBASE}/bin/lazarus +LAZARUS_VER= 1.2.6 +LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -pre-build: - ${REINPLACE_CMD} -e s!%%LAZSHAREDIR%%!`${GETLAZDIR}`!g \ - ${WRKSRC}/environmentoptions.xml - # We're basically copying the entire editors/lazarus - # port into WRKSRC since lazbuild modifies all sorts - # of files in the lazarus dir during builds. - ${CP} -R `${GETLAZDIR}` ${WRKSRC}/lazdir - ${CHMOD} -R u+w ${WRKSRC}/lazdir +OPTIONS_SINGLE= LCL +OPTIONS_SINGLE_LCL= GTK2 QT4 +OPTIONS_DEFAULT= GTK2 + +.include + +.if ${PORT_OPTIONS:MGTK2} +USE_FPC+= gtk2 +USE_GNOME= gtk20 +LCL_PLATFORM= gtk2 +BUILD_DEPENDS+= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2 +.endif + +.if ${PORT_OPTIONS:MQT4} +LIB_DEPENDS+= libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas +LCL_PLATFORM= qt +BUILD_DEPENDS+= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt +.endif post-patch: @${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \ -e s!%%MAKE_CMD%%!${MAKE_CMD}!g \ - -e s!%%WRKSRC%%!${WRKSRC}!g \ + -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \ ${FILESDIR}/environmentoptions.xml.in \ > ${WRKSRC}/environmentoptions.xml ${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \ @@ -45,5 +58,8 @@ post-patch: ${WRKSRC}/src/fGrayline.pas ${REINPLACE_CMD} -e s!%%PREFIX%%!${PREFIX}!g \ ${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas + ${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \ + -e s!%%LCL_PLATFORM%%!${LCL_PLATFORM}!g \ + ${WRKSRC}/Makefile -.include +.include Modified: head/comms/cqrlog/files/environmentoptions.xml.in ============================================================================== --- head/comms/cqrlog/files/environmentoptions.xml.in Sun Jan 11 03:18:46 2015 (r376732) +++ head/comms/cqrlog/files/environmentoptions.xml.in Sun Jan 11 03:22:51 2015 (r376733) @@ -1,7 +1,7 @@ - + Modified: head/comms/cqrlog/files/patch-Makefile ============================================================================== --- head/comms/cqrlog/files/patch-Makefile Sun Jan 11 03:18:46 2015 (r376732) +++ head/comms/cqrlog/files/patch-Makefile Sun Jan 11 03:22:51 2015 (r376733) @@ -1,7 +1,8 @@ ---- Makefile.orig 2014-04-13 05:14:38.000000000 -0700 -+++ Makefile 2014-07-01 04:04:04.000000000 -0700 +--- Makefile 2014-10-03 14:37:57.000000000 -0500 ++++ Makefile 2015-01-10 21:44:03.000000000 -0500 @@ -1,11 +1,12 @@ - CC=lazbuild +-CC=lazbuild ++CC=lazbuild -d ST=strip -datadir = $(DESTDIR)/usr/share/cqrlog -bindir = $(DESTDIR)/usr/bin @@ -13,7 +14,7 @@ cqrlog: src/cqrlog.lpi - $(CC) --ws=gtk2 src/cqrlog.lpi -+ $(CC) --pcp=. --ws=gtk2 src/cqrlog.lpi ++ $(CC) --pcp=. --ws=%%LCL_PLATFORM%% src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%% $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz