From owner-svn-ports-head@freebsd.org Sat Jan 2 20:58:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E36E8A5EA58; Sat, 2 Jan 2016 20:58:44 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9B3A71133; Sat, 2 Jan 2016 20:58:44 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u02Kwh6M008572; Sat, 2 Jan 2016 20:58:43 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u02KwhwJ008570; Sat, 2 Jan 2016 20:58:43 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201601022058.u02KwhwJ008570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sat, 2 Jan 2016 20:58:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405096 - in head/editors: openoffice-4 openoffice-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2016 20:58:45 -0000 Author: truckman Date: Sat Jan 2 20:58:43 2016 New Revision: 405096 URL: https://svnweb.freebsd.org/changeset/ports/405096 Log: Correct the Icon entry in the .desktop files so that the icons are visible in the menu. PR: 205758 Modified: head/editors/openoffice-4/Makefile head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Sat Jan 2 20:45:29 2016 (r405095) +++ head/editors/openoffice-4/Makefile Sat Jan 2 20:58:43 2016 (r405096) @@ -3,6 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} +PORTREVISION= 1 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -325,7 +326,7 @@ post-extract: -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C} post-patch: - ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \ + ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \ ${WRKSRC}/sysui/desktop/productversion.mk ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \ ${WRKSRC}/desktop/scripts/soffice.sh Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sat Jan 2 20:45:29 2016 (r405095) +++ head/editors/openoffice-devel/Makefile Sat Jan 2 20:58:43 2016 (r405096) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -#PORTREVISION= 1 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -336,7 +336,7 @@ post-extract: -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C} post-patch: - ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \ + ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \ ${WRKSRC}/sysui/desktop/productversion.mk ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \ ${WRKSRC}/desktop/scripts/soffice.sh