Date: Mon, 26 Aug 2013 22:01:14 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/181574: [patch] editors/openoffice-4: convert to USES, and adoption of optionsNG styling, add CCACHE as configurable option Message-ID: <201308262201.r7QM1EmE098565@freefall.freebsd.org> Resent-Message-ID: <201308262210.r7QMA071099061@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181574
>Category: ports
>Synopsis: [patch] editors/openoffice-4: convert to USES, and adoption of optionsNG styling, add CCACHE as configurable option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 26 22:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r254474: Sun Aug 18 03:32:49 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
remove USE_PERL5_BUILD, as it is satisfied by USE_PERL5 = build
convert USE_GMAKE to USES
add new option of CCACHE and convert to new options sytle
pls note:
distinfo update was needed because of size mismatch during make checksum phase, however couldn't verify any of this as I get a failed build on a module, but the software does build.
>How-To-Repeat:
>Fix:
Index: editors/openoffice-4/Makefile
===================================================================
--- editors/openoffice-4/Makefile (revision 325399)
+++ editors/openoffice-4/Makefile (working copy)
@@ -24,20 +24,22 @@
USE_GL= gl glu
USE_GSTREAMER= yes
#USE_GCC= 4.6+
-USE_GMAKE= yes
USE_PYTHON= yes
-USE_PERL5_BUILD= yes
USE_BZIP2= yes
-USES+= bison perl5
+USES+= bison perl5 gmake
USE_PERL5= build
WITHOUT_CPU_CFLAGS= true
MAKE_JOBS_SAFE= yes
-OPTIONS_DEFINE= GCONF GNOMEVFS
+OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE
OPTIONS_DEFAULT=GCONF GNOMEVFS
GNOMEVFS_DESC= Enable GNOME Virtual File System
+CCACHE_DESC= Mimimize compile time of C/C++ programs
+.include "${.CURDIR}/files/Makefile.localized"
+
.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
USE_JAVA= yes
JAVA_BUILD= jdk
@@ -44,20 +46,18 @@
JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6+
-.if !defined(WITHOUT_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
USE_GNOME+= gconf2
.else
CONFIGURE_ARGS+=--disable-gconf
.endif
-.if !defined(WITHOUT_GNOMEVFS)
+.if ${PORT_OPTIONS:MGNOMEVFS}
USE_GNOME+= gnomevfs2
.else
CONFIGURE_ARGS+=--disable-gnome-vfs
.endif
-.include <${FILESDIR}/Makefile.localized>
-
ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == amd64
@@ -96,7 +96,7 @@
${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
-.if defined(WITH_CCACHE)
+.if ${PORT_OPTIONS:MCCACHE) || defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CCACHE_PREFIX= ccache
OOOCC= ${CCACHE_PREFIX} ${CC}
Index: editors/openoffice-4/distinfo
===================================================================
--- editors/openoffice-4/distinfo (revision 325399)
+++ editors/openoffice-4/distinfo (working copy)
@@ -2,5 +2,5 @@
SIZE (openoffice/apache-openoffice-4.0.0-r1503704-src.tar.bz2) = 211869164
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = 4d21329da736fbdaaf530d705f7872eb2c6c96180ac917db7f66d7cfc1551e06
-SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = 138567395
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = f557f29965485c10da5bd4b4c63d883d774200e891c40fc247e2ffdab9127350
+SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.0.r1503704.tar.bz2) = 68602339
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308262201.r7QM1EmE098565>