View | Details | Raw Unified | Return to bug 192557 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-201 / +213 lines)
Lines 2-25 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	4.1.${SVNREVISION}
5
PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
6
PORTREVISION=	4
7
PORTEPOCH=	2
6
PORTEPOCH=	2
8
CATEGORIES=	editors java
7
CATEGORIES=	editors java
9
MASTER_SITES=	${MASTER_SITE_LOCAL}
8
#MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-rc3-r${SVNREVISION}/source/
10
MASTER_SITE_SUBDIR=	maho/openoffice
9
MASTER_SITES=	${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@} \
11
DISTFILES+=	${OOOSRC} ${EXTSRC} unowinreg.dll
10
		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
12
EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
11
.if defined(LANG_PKGNAME)
12
PKGNAMEPREFIX=		${LANG_PKGNAME}-
13
.endif
14
.if defined(LANG_SUFFIX)
15
PKGNAMESUFFIX=		-${LANG_SUFFIX}
16
.endif
17
DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
18
EXTRACT_ONLY=	${OOOSRC}
13
19
20
MAINTAINER=	office@FreeBSD.org
14
#de facto maintainer is maho@FreeBSD.org
21
#de facto maintainer is maho@FreeBSD.org
15
#Frequent Patch submitters should optionally sign Apache iCLA
22
#Frequent Patch submitters should optionally sign Apache iCLA
16
MAINTAINER=	office@FreeBSD.org
23
COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version)
17
COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
18
24
19
LICENSE=	APACHE20
25
LICENSE=	APACHE20
20
26
21
PKGNAMESUFFIX=	-devel
27
BUILD_DEPENDS=								\
28
		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
29
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
30
		zip:${PORTSDIR}/archivers/zip				\
31
		ant:${PORTSDIR}/devel/apache-ant			\
32
		dmake:${PORTSDIR}/devel/dmake				\
33
		epm:${PORTSDIR}/devel/epm				\
34
		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
35
		imake:${PORTSDIR}/devel/imake				\
36
		gpatch:${PORTSDIR}/devel/patch				\
37
		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
38
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
39
		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
40
		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
41
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
42
		bash:${PORTSDIR}/shells/bash				\
43
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
44
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
45
LIB_DEPENDS=								\
46
		libapr-1.so:${PORTSDIR}/devel/apr1			\
47
		libcurl.so:${PORTSDIR}/ftp/curl				\
48
		libcairo.so:${PORTSDIR}/graphics/cairo			\
49
		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
50
		libpng.so:${PORTSDIR}/graphics/png			\
51
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
52
		libCoinMP.so:${PORTSDIR}/math/coinmp			\
53
		libfreetype.so:${PORTSDIR}/print/freetype2		\
54
		libnss3.so:${PORTSDIR}/security/nss			\
55
		libexpat.so:${PORTSDIR}/textproc/expat2			\
56
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
57
		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
58
		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
59
		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
60
		librdf.so:${PORTSDIR}/textproc/redland			\
61
		libserf-1.so:${PORTSDIR}/www/serf
62
#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
63
RUN_DEPENDS=								\
64
		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
65
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
66
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
67
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
22
68
69
AOOVERSION1=		4
70
AOOVERSION2=		2
71
AOOVERSION3=		0
72
AOOVERSION=		${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
73
AOOXXX=			${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
74
SVNREVISION=		1626099
75
#OOOSRC=			apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
76
OOOSRC=			apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX}
77
EXTSRC=			ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz
78
79
OOODIR=			openoffice${AOOVERSION1}
80
AOOSUFFIX=		${PORTVERSION}
81
#AOOSUFFIX=		${AOOVERSION}-rc3
82
INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
83
EXECBASE?=		openoffice-${AOOSUFFIX}
84
DIST_SUBDIR=		openoffice
85
86
NO_LATEST_LINK=	yes
87
88
ONLY_FOR_ARCHS=	i386 amd64
89
23
USE_GNOME=	gtk20 libxslt libidl glib20
90
USE_GNOME=	gtk20 libxslt libidl glib20
24
USE_XORG=	x11 ice xaw xau xext xrender xrandr \
91
USE_XORG=	x11 ice xaw xau xext xrender xrandr \
25
		xi xt xcursor xdamage xcomposite xfixes
92
		xi xt xcursor xdamage xcomposite xfixes
Lines 26-32 Link Here
26
USE_GL=		gl glu
93
USE_GL=		gl glu
27
USE_GSTREAMER=	yes
94
USE_GSTREAMER=	yes
28
USE_GCC=	yes
95
USE_GCC=	yes
29
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils python
96
USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2
30
USE_PERL5=	build
97
USE_PERL5=	build
31
WITHOUT_CPU_CFLAGS=	true
98
WITHOUT_CPU_CFLAGS=	true
32
MAKE_JOBS_SAFE=	yes
99
MAKE_JOBS_SAFE=	yes
Lines 36-48 Link Here
36
GNOMEVFS_DESC=	Enable GNOME Virtual File System
103
GNOMEVFS_DESC=	Enable GNOME Virtual File System
37
CCACHE_DESC=	Mimimize compile time of C/C++ programs
104
CCACHE_DESC=	Mimimize compile time of C/C++ programs
38
105
39
.include "${.CURDIR}/files/Makefile.localized"
40
41
USE_JAVA=	yes
42
JAVA_BUILD=	jdk
43
JAVA_VENDOR=	openjdk
44
JAVA_VERSION=	1.6+
45
46
GCONF_USE=	GNOME=gconf2
106
GCONF_USE=	GNOME=gconf2
47
GCONF_CONFIGURE_OFF=--disable-gconf
107
GCONF_CONFIGURE_OFF=--disable-gconf
48
108
Lines 49-58 Link Here
49
GNOMEVFS_USE=	GNOME=gnomevfs2
109
GNOMEVFS_USE=	GNOME=gnomevfs2
50
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
110
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
51
111
112
.include <bsd.port.options.mk>
113
52
.include <bsd.port.pre.mk>
114
.include <bsd.port.pre.mk>
53
115
54
ONLY_FOR_ARCHS=	i386 amd64
116
.include <${FILESDIR}/Makefile.localized>
55
117
118
USE_JAVA=	yes
119
JAVA_BUILD=	jdk
120
JAVA_VENDOR=	openjdk
121
JAVA_VERSION=	1.6+
122
56
.if ${ARCH} == amd64
123
.if ${ARCH} == amd64
57
FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
124
FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
58
.else
125
.else
Lines 59-74 Link Here
59
FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
126
FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
60
.endif
127
.endif
61
128
62
OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
129
LOCALIZED_LANG?=	en-US
63
EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX}
64
OOODIR=			openoffice4
65
SVNREVISION=		1560773
66
INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
67
EXECBASE?=		openoffice-r${SVNREVISION}
68
DIST_SUBDIR=		openoffice
69
SIMPLEOSVER=		${OSREL:C/\.//g}
70
130
71
PACKAGE_PREFIX=		Apache_OpenOffice
131
PACKAGE_PREFIX=		Apache_OpenOffice
132
72
.if ${ARCH} == amd64
133
.if ${ARCH} == amd64
73
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
134
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
74
.else
135
.else
Lines 75-94 Link Here
75
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
136
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
76
.endif
137
.endif
77
138
78
LOCALIZED_LANG?=	en-US
79
.if defined(LANG_PKGNAME)
80
PKGNAMEPREFIX=		${LANG_PKGNAME}-
81
.endif
82
.if defined(LANG_SUFFIX)
83
PKGNAMESUFFIX=		-${LANG_SUFFIX}
84
.endif
85
86
RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
87
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
88
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
89
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
90
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
91
92
.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
139
.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
93
BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
140
BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
94
CCACHE_PREFIX=	ccache
141
CCACHE_PREFIX=	ccache
Lines 99-146 Link Here
99
OOOCXX=		${CXX}
146
OOOCXX=		${CXX}
100
.endif
147
.endif
101
CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
148
CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
102
		PATH=${WRKSRC}/solenv/bin:$$PATH	\
149
		PATH=${WRKSRC}/solenv/bin:$$PATH
103
		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
104
150
105
LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
106
		libexpat.so:${PORTSDIR}/textproc/expat2 \
107
		libjpeg.so:${PORTSDIR}/graphics/jpeg \
108
		libcurl.so:${PORTSDIR}/ftp/curl \
109
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
110
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
111
		librdf.so:${PORTSDIR}/textproc/redland \
112
		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
113
		libfreetype.so:${PORTSDIR}/print/freetype2 \
114
		libapr-1.so:${PORTSDIR}/devel/apr1 \
115
		libCoinMP.so:${PORTSDIR}/math/coinmp \
116
		libserf-1.so:${PORTSDIR}/www/serf \
117
		libfreetype.so:${PORTSDIR}/print/freetype2 \
118
		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
119
		libnss3.so:${PORTSDIR}/security/nss
120
121
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
122
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
123
		gpatch:${PORTSDIR}/devel/patch \
124
		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
125
		bash:${PORTSDIR}/shells/bash \
126
		imake:${PORTSDIR}/devel/imake \
127
		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
128
		ant:${PORTSDIR}/devel/apache-ant \
129
		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
130
		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
131
		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
132
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
133
		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
134
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
135
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
136
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
137
		epm:${PORTSDIR}/devel/epm \
138
		dmake:${PORTSDIR}/devel/dmake \
139
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
140
141
USE_AUTOTOOLS=	autoconf
151
USE_AUTOTOOLS=	autoconf
142
GNU_CONFIGURE=	yes
152
GNU_CONFIGURE=	yes
143
WRKSRC?=	${WRKDIR}/aoo/main
153
WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
154
WRKSRC?=	${WRKSUBDIR}/main
144
BASH?=		${PREFIX}/bin/bash
155
BASH?=		${PREFIX}/bin/bash
145
SUB_FILES=	pkg-message
156
SUB_FILES=	pkg-message
146
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
157
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
Lines 149-210 Link Here
149
MAKE_JOBS_NUMBER=	4
160
MAKE_JOBS_NUMBER=	4
150
.endif
161
.endif
151
162
152
CONFIGURE_ARGS+=	--enable-verbose \
163
CONFIGURE_ARGS+=							\
153
			--enable-symbols=small \
164
			--with-system-apache-commons=yes		\
154
			--enable-crashdump \
155
			--with-vendor="FreeBSD ports system"	\
156
			--with-epm=${LOCALBASE}/bin/epm \
157
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
158
			--with-gperf=${LOCALBASE}/bin/gperf	\
159
			--x-includes=${LOCALBASE}/include	\
160
			--x-libraries=${LOCALBASE}lib	\
161
			--with-system-libxml 		\
162
			--with-system-libxslt 		\
163
			--with-system-cairo --enable-cairo \
164
			--with-system-zlib		\
165
			--with-system-python		\
166
			--with-system-expat		\
167
			--with-system-openssl		\
168
			--with-system-curl		\
169
			--with-system-poppler \
170
			--with-system-redland \
171
			--with-system-libtextcat \
172
			--with-system-vigra \
173
			--with-system-stdlibs \
174
			--with-system-apr \
175
			--with-system-apr-util \
176
			--with-system-coinmp \
177
			--with-system-apache-commons=yes \
178
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
165
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
179
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
166
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
180
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
167
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
181
			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar	\
168
			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
182
			--with-system-lucene \
169
			--with-system-apr				\
183
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar	\
170
			--with-system-apr-util				\
184
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar	\
171
			--with-system-beanshell				\
172
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
173
			--enable-category-b				\
174
			--with-system-cairo --enable-cairo		\
175
			--with-system-coinmp				\
176
			--with-system-curl				\
177
			--enable-crashdump				\
178
			--enable-dbus					\
179
			--with-epm=${LOCALBASE}/bin/epm			\
180
			--with-system-expat				\
181
			--disable-fetch-external			\
182
			--without-fonts					\
183
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
184
			--with-gperf=${LOCALBASE}/bin/gperf		\
185
			--enable-gstreamer				\
186
			--with-system-hunspell				\
187
			--with-system-hyphen				\
188
			--with-system-jpeg				\
185
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
189
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
186
			--with-package-format="archive" \
190
			--with-system-libtextcat			\
187
			--enable-gstreamer \
191
			--with-system-libxml				\
188
			--enable-wiki-publisher \
192
			--with-system-libxslt				\
189
			--enable-dbus \
193
			--enable-lockdown				\
190
			--enable-opengl \
194
			--with-system-lucene				\
191
			--enable-category-b \
195
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
192
			--enable-lockdown \
196
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
193
			--with-system-hunspell \
197
			--with-system-mythes				\
194
			--with-system-saxon     \
198
			--with-system-nss				\
195
			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
199
			--enable-opengl					\
196
			--with-system-beanshell	\
200
			--with-system-openssl				\
197
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
201
			--with-package-format="archive"			\
198
			--without-fonts \
202
			--with-system-poppler				\
199
			--with-system-serf \
203
			--with-system-python				\
200
			--with-system-nss \
204
			--with-system-redland				\
201
			--without-stlport
205
			--with-system-serf				\
206
			--with-system-stdlibs				\
207
			--enable-symbols=small				\
208
			--without-stlport				\
209
			--with-vendor="FreeBSD ports system"		\
210
			--enable-verbose				\
211
			--with-system-vigra				\
212
			--enable-wiki-publisher				\
213
			--x-includes={LOCALBASE}/include		\
214
			--x-libraries=${LOCALBASE}lib			\
215
			--with-system-zlib
216
# system-graphite causes breakage when compiled with clang and linked
217
# with libc++ because aoo is compiled with gcc and linked with libstdc++.
218
#			--with-system-graphite
202
219
203
#			--with-system-jpeg
204
#			--enable-pdfimport
205
#			--without-stlport --disable-mozilla \
206
#			--with-system-graphite \
207
208
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
220
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
209
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
221
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
210
#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
222
#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
Lines 218-325 Link Here
218
# really tweak, extremely useful when you build all localized language versions
230
# really tweak, extremely useful when you build all localized language versions
219
# needed after when you build with ALL_LOCALIZED_LANGS.
231
# needed after when you build with ALL_LOCALIZED_LANGS.
220
.if defined(TWEAK_L10N)
232
.if defined(TWEAK_L10N)
221
	@${RM} -f ${WRKDIR}/.PLIST*
233
	${RM} -f ${WRKDIR}/.PLIST*
222
	@${RM} -f ${WRKDIR}/.install_done.*
234
	${RM} -f ${WRKDIR}/.install_done.*
223
	@${RM} -f ${WRKDIR}/.package_done.*
235
	${RM} -f ${WRKDIR}/.package_done.*
224
	@${RM} -f ${WRKDIR}/.extract_done.*
236
	${RM} -f ${WRKDIR}/.extract_done.*
225
	@${RM} -f ${WRKDIR}/.patch_done.*
237
	${RM} -f ${WRKDIR}/.patch_done.*
226
	@${RM} -f ${WRKDIR}/.configure_done.*
238
	${RM} -f ${WRKDIR}/.configure_done.*
227
	@${RM} -f ${WRKDIR}/.build_done.*
239
	${RM} -f ${WRKDIR}/.build_done.*
228
	@${MKDIR} ${WRKDIR}
240
	${MKDIR} ${WRKDIR}
229
	@${TOUCH} ${EXTRACT_COOKIE}
241
	${TOUCH} ${EXTRACT_COOKIE}
230
	@${TOUCH} ${PATCH_COOKIE}
242
	${TOUCH} ${PATCH_COOKIE}
231
	@${TOUCH} ${CONFIGURE_COOKIE}
243
	${TOUCH} ${CONFIGURE_COOKIE}
232
	@${TOUCH} ${BUILD_COOKIE}
244
	${TOUCH} ${BUILD_COOKIE}
233
.endif
245
.endif
234
246
235
post-extract:
247
post-extract:
236
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
248
	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
237
#	@${MKDIR} ${WRKSRC}/../ext_sources
249
	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
238
#	@${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
250
	${RM} -rf ${WRKSRC}/l10n
239
#	@${RM} -rf ${WRKSRC}/l10n
240
	@${MKDIR} ${WRKSRC}/../ext_sources
241
	@${RM} -rf ${WRKSRC}/l10n
242
251
243
post-patch:
252
post-patch:
244
.if defined (USE_GCC)
253
.if defined (USE_GCC)
245
	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
254
	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
246
	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
255
	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
247
.else
256
.else
248
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
257
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
249
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
258
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
250
.endif
259
.endif
251
260
252
pre-configure:
261
pre-configure:
253
	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
262
	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
254
263
255
do-build:
264
do-build:
256
	@cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config
265
	cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
257
	@cd ${WRKDIR}/aoo ; ${PRINTF} "main=active\n" >> source_config
266
	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
258
	@cd ${WRKDIR}/aoo ; ${PRINTF} "extras=active\n" >> source_config
267
	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
259
	@cd ${WRKSRC} ; ./bootstrap
268
	cd ${WRKSRC} ; ./bootstrap
260
	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
269
	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
261
270
262
do-install:
271
do-install:
263
	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
272
	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
264
	@${RM} -Rf ${WRKDIR}/tmp
273
	${RM} -Rf ${WRKDIR}/tmp
265
	@${MKDIR} ${WRKDIR}/tmp
274
	${MKDIR} ${WRKDIR}/tmp
266
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
275
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
267
		${ECHO_CMD} "extracting $$i" ; \
276
		${ECHO_CMD} "extracting $$i" ; \
268
		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
277
		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
269
	done
278
	done
270
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
279
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
271
	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
280
	cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
272
	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
281
	${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
273
	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
282
	${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
274
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
283
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
275
	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
284
	cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
276
285
277
post-install:
286
post-install:
278
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
287
	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
288
	for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
289
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
290
	done
291
	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
279
	@${ECHO_MSG} "===>  Add wrapper scripts";
292
	@${ECHO_MSG} "===>  Add wrapper scripts";
280
	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
293
	${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
281
	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
294
	${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
282
			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
295
			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
283
			-e 's#%%OOODIR%%#${OOODIR}#g' \
296
			-e 's#%%OOODIR%%#${OOODIR}#g' \
284
			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
297
			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
285
			${WRKDIR}/openoffice-wrapper
298
			${WRKDIR}/openoffice-wrapper
286
	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
299
	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
287
		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
300
		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
288
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
301
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
289
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
302
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
290
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
303
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
291
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
304
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
292
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
305
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
293
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
306
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
294
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
307
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
295
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
308
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
296
	@${ECHO_CMD} "" > ${TMPPLIST}
309
	${ECHO_CMD} "" > ${TMPPLIST}
297
	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
310
	${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
298
	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
311
	${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
299
	@${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20"   >> ${TMPPLIST}
312
	${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20"   >> ${TMPPLIST}
300
	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}"     >> ${TMPPLIST}
313
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
301
	@${ECHO_CMD} "@dirrm share/licenses"                >> ${TMPPLIST}
314
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
302
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
315
	cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
303
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
304
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
305
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
316
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
306
	@for app in base calc draw impress math writer; do \
317
	for app in base calc draw impress math writer; do \
307
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
318
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
308
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
319
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
309
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
320
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
310
	done
321
	done
311
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
322
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
312
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
323
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
313
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
324
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
314
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
325
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
315
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
326
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
316
	@${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
327
	${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
317
	@${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
328
	${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
318
	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
329
	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
319
	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
330
	${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
320
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
331
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
321
	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
332
	${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
322
	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
333
	for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
323
		for app in base calc draw impress math printeradmin writer; do \
334
		for app in base calc draw impress math printeradmin writer; do \
324
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
335
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
325
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
336
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
Lines 335-343 Link Here
335
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
346
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
336
		done ; \
347
		done ; \
337
	done
348
	done
338
	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
349
	${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
339
	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
350
	${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
340
	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
351
	${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
341
352
342
.include <${FILESDIR}/Makefile.others>
353
.include <${FILESDIR}/Makefile.others>
354
343
.include <bsd.port.post.mk>
355
.include <bsd.port.post.mk>
(-)distinfo (-4 / +4 lines)
Lines 1-6 Link Here
1
SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 5a6247121703b10c44161594c23f439d5488bf011750ed7e0632b3f033e67aea
1
SHA256 (openoffice/apache-openoffice-r1626099-src.tar.bz2) = 2415e264f80f94b8e5b3054c0c401655c374011a7958936af3108c275aa34fcf
2
SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 245790501
2
SIZE (openoffice/apache-openoffice-r1626099-src.tar.bz2) = 250285313
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = ae9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = c7085dbf597a31ef332585ab57041b7ec8baf29c5f6029a60be7b7c63cfcb166
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = 147382699
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140918.tar.gz) = 97839277
5
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
5
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
6
SIZE (openoffice/unowinreg.dll) = 6144
6
SIZE (openoffice/unowinreg.dll) = 6144
(-)files/patch-jpeg (+12 lines)
Line 0 Link Here
1
--- svtools/Library_svt.mk.orig	2014-02-25 00:28:36.000000000 -0800
2
+++ svtools/Library_svt.mk	2014-08-04 21:40:00.000000000 -0700
3
@@ -76,6 +76,9 @@
4
 $(eval $(call gb_Library_set_ldflags,svt,\
5
 	$$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
6
 ))
7
+$(eval $(call gb_Library_set_ldflags,svt,\
8
+	$$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \
9
+))
10
 ifeq ($(GUIBASE),os2)
11
 # YD FIXME above is not working... needs ldflags hack...
12
 $(eval $(call gb_Library_set_ldflags,svt,\
(-)files/patch-sal (-40 lines)
Lines 11-53 Link Here
11
     /** Returns a reference to a character of this string. */
11
     /** Returns a reference to a character of this string. */
12
     sal_Char& operator[]( int n ) { return pData->buffer[n]; }
12
     sal_Char& operator[]( int n ) { return pData->buffer[n]; }
13
     /** Returns a const reference to a character of this string. */
13
     /** Returns a const reference to a character of this string. */
14
build -- version: 275224
15
16
17
=============
18
Building module canvas
19
=============
20
21
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc
22
23
24
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory
25
26
27
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools
28
29
30
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null
31
32
33
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl
34
35
36
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
37
38
Compiling: canvas/source/cairo/cairo_textlayout.cxx
39
g++46  -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0   -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1  -I/usr/local/include/freetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include   -I/usr/local/include/freetype2   -I. -I../../unxfbsdx.pro/inc/cairocanvas -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include  -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe  -Wl,-rpath=/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc46/include/c++ -DSUPD=410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGUI -DSOLAR_JAVA   -DVERBOSE -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../unxfbsdx.pro/slo/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx 
40
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)':
41
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
42
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context
43
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)':
44
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
45
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context
46
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputDevice&, const Point&, const com::sun::star::rendering::ViewState&, const com::sun::star::rendering::RenderState&) const':
47
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warning: declaration of 'aIter' shadows a previous local [-Wshadow]
48
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warning: shadowed declaration is here [-Wshadow]
49
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warning: declaration of 'aEnd' shadows a previous local [-Wshadow]
50
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warning: shadowed declaration is here [-Wshadow]
51
dmake:  Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj'
52
ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
53
(-)files/patch-sal-inline (-16 lines)
Lines 1-16 Link Here
1
Index: sal/util/makefile.mk
2
===================================================================
3
--- sal/util/makefile.mk	(revision 1509387)
4
+++ sal/util/makefile.mk	(working copy)
5
@@ -45,6 +45,11 @@
6
 CFLAGS+= $(LFS_CFLAGS)
7
 CXXFLAGS+= $(LFS_CFLAGS)
8
 
9
+# gcc can have some broken inlining optimizations
10
+.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC"
11
+CFLAGS += -fkeep-inline-functions
12
+.ENDIF
13
+
14
 .IF "$(depend)" == ""
15
 
16
 # --- Files --------------------------------------------------------
(-)files/patch-vcl_source_glyphs_graphite_adaptors.cxx (-11 lines)
Lines 1-11 Link Here
1
--- vcl/source/glyphs/graphite_adaptors.cxx.orig	2013-08-13 11:45:43.000000000 +0000
2
+++ vcl/source/glyphs/graphite_adaptors.cxx	2013-12-31 16:39:41.000000000 +0000
3
@@ -45,7 +45,7 @@
4
 
5
 #include <salgdi.hxx>
6
 
7
-#include <freetype/ftsynth.h>
8
+#include <ftsynth.h>
9
 
10
 // Module
11
 #include "gcach_ftyp.hxx"
(-)files/patch-webdav (+99 lines)
Lines 32-34 Link Here
32
 
32
 
33
 typedef serf_connection_t SerfConnection;
33
 typedef serf_connection_t SerfConnection;
34
 
34
 
35
--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig	2014-02-25 00:24:42.000000000 -0800
36
+++ ucb/source/ucp/webdav/SerfCallbacks.hxx	2014-07-28 01:11:38.000000000 -0700
37
@@ -23,7 +23,7 @@
38
 #ifndef INCLUDED_CALLBACKS_HXX
39
 #define INCLUDED_CALLBACKS_HXX
40
 
41
-#include <serf/serf.h>
42
+#include <serf.h>
43
 
44
 extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
45
                                            serf_bucket_t **read_bkt,
46
--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
47
+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx	2014-07-28 01:11:43.000000000 -0700
48
@@ -24,7 +24,7 @@
49
 
50
 #include "SerfCopyReqProcImpl.hxx"
51
 
52
-#include <serf/serf.h>
53
+#include <serf.h>
54
 
55
 namespace http_dav_ucp
56
 {
57
--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig	2014-02-25 00:24:42.000000000 -0800
58
+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx	2014-07-28 01:11:47.000000000 -0700
59
@@ -24,7 +24,7 @@
60
 
61
 #include "SerfDeleteReqProcImpl.hxx"
62
 
63
-#include <serf/serf.h>
64
+#include <serf.h>
65
 
66
 namespace http_dav_ucp
67
 {
68
--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
69
+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx	2014-07-28 01:11:51.000000000 -0700
70
@@ -24,7 +24,7 @@
71
 
72
 #include "SerfMkColReqProcImpl.hxx"
73
 
74
-#include <serf/serf.h>
75
+#include <serf.h>
76
 
77
 namespace http_dav_ucp
78
 {
79
--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
80
+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx	2014-07-28 01:11:57.000000000 -0700
81
@@ -24,7 +24,7 @@
82
 
83
 #include "SerfMoveReqProcImpl.hxx"
84
 
85
-#include <serf/serf.h>
86
+#include <serf.h>
87
 
88
 namespace http_dav_ucp
89
 {
90
--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
91
+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx	2014-07-28 01:12:00.000000000 -0700
92
@@ -24,7 +24,7 @@
93
 
94
 #include "SerfPostReqProcImpl.hxx"
95
 
96
-#include <serf/serf.h>
97
+#include <serf.h>
98
 
99
 using namespace com::sun::star;
100
 
101
--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
102
+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx	2014-07-28 01:12:05.000000000 -0700
103
@@ -26,7 +26,7 @@
104
 
105
 #include "SerfPutReqProcImpl.hxx"
106
 
107
-#include <serf/serf.h>
108
+#include <serf.h>
109
 
110
 namespace http_dav_ucp
111
 {
112
--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig	2014-02-25 00:24:43.000000000 -0800
113
+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx	2014-07-28 01:12:10.000000000 -0700
114
@@ -26,7 +26,7 @@
115
 #include <apr_errno.h>
116
 #include <apr_pools.h>
117
 
118
-#include <serf/serf.h>
119
+#include <serf.h>
120
 
121
 #include "DAVTypes.hxx"
122
 #include "DAVResource.hxx"
123
--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig	2014-02-25 00:24:42.000000000 -0800
124
+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx	2014-07-28 01:12:14.000000000 -0700
125
@@ -22,7 +22,7 @@
126
 #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
127
 #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
128
 
129
-#include <serf/serf.h>
130
+#include <serf.h>
131
 
132
 #include <sal/types.h>
133
 #include "DAVRequestEnvironment.hxx"
(-)pkg-plist (-1 lines)
Line 1 Link Here
1
# Dummy file, do not delete. Package list is generated automatically.

Return to bug 192557