From owner-freebsd-office@FreeBSD.ORG Sun Jul 31 04:13:40 2011 Return-Path: Delivered-To: office@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7841B1065670 for ; Sun, 31 Jul 2011 04:13:40 +0000 (UTC) (envelope-from pali.gabor@googlemail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 094C78FC08 for ; Sun, 31 Jul 2011 04:13:39 +0000 (UTC) Received: by fxe4 with SMTP id 4so4839188fxe.13 for ; Sat, 30 Jul 2011 21:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :subject:x-enigmail-version:content-type; bh=Ogko4+cd66KgnR2piWms5X6HRw52eRgyIwVhLtixBXM=; b=OrZRlbWzxEOPzgwuQzE+3iN/hTpaq2g8g3Gw7H7Q3PFfCTJpQDhkF86DNhQtl3aRbL A9xvDgJHSOwRX5lpyTCKdV+yZrx+sULiZYo5F2ZBNaNoteR7Zim25xO2ODzYuk6t/gAa UVztWS1jRp78T1soHafES3LgAxqk+O0KqQHSM= Received: by 10.223.160.75 with SMTP id m11mr4313225fax.42.1312085618711; Sat, 30 Jul 2011 21:13:38 -0700 (PDT) Received: from [192.168.1.101] (catv-80-99-199-223.catv.broadband.hu [80.99.199.223]) by mx.google.com with ESMTPS id c28sm2046790fam.16.2011.07.30.21.13.38 (version=SSLv3 cipher=OTHER); Sat, 30 Jul 2011 21:13:38 -0700 (PDT) Sender: =?UTF-8?B?UMOBTEkgR8OhYm9yIErDoW5vcw==?= Message-ID: <4E34D620.70404@FreeBSD.org> Date: Sun, 31 Jul 2011 06:12:16 +0200 From: Gabor PALI Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.9) Gecko/20100925 Thunderbird/3.1.4 MIME-Version: 1.0 To: office@freebsd.org X-Enigmail-Version: 1.1.2 Content-Type: multipart/mixed; boundary="------------070802000902060907020000" Cc: Subject: [patch] Moving LibreOffice Version to an .mk File X-BeenThere: freebsd-office@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Office applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2011 04:13:40 -0000 This is a multi-part message in MIME format. --------------070802000902060907020000 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, I would need a separate .mk file under editors/libreoffice where I could keep the version number for LibreOffice. This way I could share it with editors/libreoffice-l10n [1]. I attach a patch for this, let me know if there any problems with it. By the way: I have talked with Andras Timar from the LibreOffice team on Friday, and he said currently there is no easy way to build language and help files from source directly (only as part of the complete build). This means that my solution (that I considered ugly) seems to be the only one at the moment. So shall I commit the libreoffice-l10n ports to the ports tree as they are? What do you think? [1] https://github.com/bapt/libreoffice-ports/tree/master/editors/libreoffice-l10n --------------070802000902060907020000 Content-Type: text/plain; name="mk_patch.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mk_patch.diff" diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 9b6d26a..a0f4a3f 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libreoffice -PORTVERSION= 3.3.3 +PORTVERSION= ${LIBO_VERSION} PORTREVISION= 2 LOVERSION= ${PORTVERSION}.1 CATEGORIES= editors @@ -414,3 +414,4 @@ post-install: @${LOCALBASE}/bin/update-desktop-database 2>/dev/null || ${TRUE} .include +.include "${.CURDIR}/../../editors/libreoffice/bsd.libreoffice.mk" diff --git a/editors/libreoffice/bsd.libreoffice.mk b/editors/libreoffice/bsd.libreoffice.mk new file mode 100644 index 0000000..d1a0541 --- /dev/null +++ b/editors/libreoffice/bsd.libreoffice.mk @@ -0,0 +1,9 @@ +# +# $FreeBSD$ +# +# bsd.libreoffice.mk -- Support for ports based on LibreOffice. +# +# Maintained by: office@FreeBSD.org +# + +LIBO_VERSION= 3.3.3 --------------070802000902060907020000--