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

Collapse All | Expand All

(-)Makefile (-85 / +98 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	4.1.0
5
PORTVERSION=	${AOOVERSION}
6
CATEGORIES=	editors java
6
CATEGORIES=	editors java
7
MASTER_SITES=	${MASTER_SITE_APACHE:S@%SUBDIR%@openoffice/${PORTVERSION}/source@} \
7
MASTER_SITES=	${MASTER_SITE_APACHE:S@%SUBDIR%@openoffice/${PORTVERSION}/source@} \
8
		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
8
		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
Lines 13-19 Link Here
13
PKGNAMESUFFIX=		-${LANG_SUFFIX}
13
PKGNAMESUFFIX=		-${LANG_SUFFIX}
14
.endif
14
.endif
15
DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
15
DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
16
EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
16
EXTRACT_ONLY=	${OOOSRC}
17
17
18
MAINTAINER=	office@FreeBSD.org
18
MAINTAINER=	office@FreeBSD.org
19
#de facto maintainer is maho@FreeBSD.org
19
#de facto maintainer is maho@FreeBSD.org
Lines 41-78 Link Here
41
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
41
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
42
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
42
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
43
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
43
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
44
#		mdds>=0.9.0:${PORTSDIR}/devel/mdds
45
LIB_DEPENDS=								\
44
LIB_DEPENDS=								\
46
		libapr-1.so:${PORTSDIR}/devel/apr1			\
45
		libapr-1.so:${PORTSDIR}/devel/apr1			\
47
		libcurl.so:${PORTSDIR}/ftp/curl				\
46
		libcurl.so:${PORTSDIR}/ftp/curl				\
48
		libcairo.so:${PORTSDIR}/graphics/cairo			\
47
		libcairo.so:${PORTSDIR}/graphics/cairo			\
48
		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
49
		libpng.so:${PORTSDIR}/graphics/png			\
49
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
50
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
50
		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
51
		libCoinMP.so:${PORTSDIR}/math/coinmp			\
51
		libCoinMP.so:${PORTSDIR}/math/coinmp			\
52
		libfreetype.so:${PORTSDIR}/print/freetype2		\
52
		libfreetype.so:${PORTSDIR}/print/freetype2		\
53
		libnss3.so:${PORTSDIR}/security/nss			\
53
		libnss3.so:${PORTSDIR}/security/nss			\
54
		libexpat.so:${PORTSDIR}/textproc/expat2			\
54
		libexpat.so:${PORTSDIR}/textproc/expat2			\
55
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
55
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
56
		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
56
		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
57
		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
57
		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
58
		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
58
		librdf.so:${PORTSDIR}/textproc/redland			\
59
		librdf.so:${PORTSDIR}/textproc/redland			\
59
		libserf-1.so:${PORTSDIR}/www/serf
60
		libserf-1.so:${PORTSDIR}/www/serf
60
#		libjpeg.so:${PORTSDIR}/graphics/jpeg
61
#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
61
RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
62
RUN_DEPENDS=								\
63
		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
62
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
64
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
63
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
65
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
64
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
66
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
65
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
67
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
66
68
69
AOOVERSION1=		4
70
AOOVERSION2=		1
71
AOOVERSION3=		0
72
AOOVERSION=		${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
73
AOOXXX=			${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
67
SVNREVISION=		1589052
74
SVNREVISION=		1589052
68
OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
75
OOOSRC=			apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
69
EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}_1${EXTRACT_SUFX}
76
EXTSRC=			ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140809.tar.gz
70
77
71
OOODIR=			openoffice4
78
OOODIR=			openoffice${AOOVERSION1}
72
INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
79
AOOSUFFIX=		${PORTVERSION}
73
EXECBASE?=		openoffice-${PORTVERSION}
80
INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
81
EXECBASE?=		openoffice-${AOOSUFFIX}
74
DIST_SUBDIR=		openoffice
82
DIST_SUBDIR=		openoffice
75
SIMPLEOSVER=		${OSREL:C/\.//g}
76
83
77
NO_LATEST_LINK=	yes
84
NO_LATEST_LINK=	yes
78
85
Lines 84-91 Link Here
84
USE_GL=		gl glu
91
USE_GL=		gl glu
85
USE_GSTREAMER=	yes
92
USE_GSTREAMER=	yes
86
USE_GCC=	yes
93
USE_GCC=	yes
87
USE_PYTHON=	yes
94
USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2
88
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
89
USE_PERL5=	build
95
USE_PERL5=	build
90
WITHOUT_CPU_CFLAGS=	true
96
WITHOUT_CPU_CFLAGS=	true
91
MAKE_JOBS_SAFE=	yes
97
MAKE_JOBS_SAFE=	yes
Lines 142-148 Link Here
142
148
143
USE_AUTOTOOLS=	autoconf
149
USE_AUTOTOOLS=	autoconf
144
GNU_CONFIGURE=	yes
150
GNU_CONFIGURE=	yes
145
WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
151
WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
152
WRKSRC?=	${WRKSUBDIR}/main
146
BASH?=		${PREFIX}/bin/bash
153
BASH?=		${PREFIX}/bin/bash
147
SUB_FILES=	pkg-message
154
SUB_FILES=	pkg-message
148
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
155
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
Lines 151-157 Link Here
151
MAKE_JOBS_NUMBER=	4
158
MAKE_JOBS_NUMBER=	4
152
.endif
159
.endif
153
160
154
CONFIGURE_ARGS+=	--with-system-apache-commons=yes \
161
CONFIGURE_ARGS+=							\
162
			--with-system-apache-commons=yes		\
155
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
163
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
156
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
164
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
157
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
165
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
Lines 173-181 Link Here
173
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
181
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
174
			--with-gperf=${LOCALBASE}/bin/gperf		\
182
			--with-gperf=${LOCALBASE}/bin/gperf		\
175
			--enable-gstreamer				\
183
			--enable-gstreamer				\
176
			--with-system-graphite				\
177
			--with-system-hunspell				\
184
			--with-system-hunspell				\
178
			--with-system-hyphen				\
185
			--with-system-hyphen				\
186
			--with-system-jpeg				\
179
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
187
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
180
			--with-system-libtextcat			\
188
			--with-system-libtextcat			\
181
			--with-system-libxml				\
189
			--with-system-libxml				\
Lines 184-189 Link Here
184
			--with-system-lucene				\
192
			--with-system-lucene				\
185
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
193
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
186
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
194
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
195
			--with-system-mythes				\
187
			--with-system-nss				\
196
			--with-system-nss				\
188
			--enable-opengl					\
197
			--enable-opengl					\
189
			--with-system-openssl				\
198
			--with-system-openssl				\
Lines 204-209 Link Here
204
			--x-includes={LOCALBASE}/include		\
213
			--x-includes={LOCALBASE}/include		\
205
			--x-libraries=${LOCALBASE}lib			\
214
			--x-libraries=${LOCALBASE}lib			\
206
			--with-system-zlib
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
207
219
208
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
220
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
209
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
221
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
Lines 218-323 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
	@${RM} -rf ${WRKSRC}/l10n
249
	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
250
	${RM} -rf ${WRKSRC}/l10n
238
251
239
post-patch:
252
post-patch:
240
.if defined (USE_GCC)
253
.if defined (USE_GCC)
241
	@${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
242
	@${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
243
.else
256
.else
244
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
257
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
245
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
258
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
246
.endif
259
.endif
247
260
248
pre-configure:
261
pre-configure:
249
	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
262
	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
250
263
251
do-build:
264
do-build:
252
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "[repositories]\n" > source_config
265
	cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
253
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "main=active\n" >> source_config
266
	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
254
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "extras=active\n" >> source_config
267
	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
255
	@cd ${WRKSRC} ; ./bootstrap
268
	cd ${WRKSRC} ; ./bootstrap
256
	@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}"
257
270
258
do-install:
271
do-install:
259
	@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
260
	@${RM} -Rf ${WRKDIR}/tmp
273
	${RM} -Rf ${WRKDIR}/tmp
261
	@${MKDIR} ${WRKDIR}/tmp
274
	${MKDIR} ${WRKDIR}/tmp
262
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
275
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
263
		${ECHO_CMD} "extracting $$i" ; \
276
		${ECHO_CMD} "extracting $$i" ; \
264
		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 ; \
265
	done
278
	done
266
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
279
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
267
	@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}
268
	@${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
269
	@${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
270
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
283
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
271
	@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/
272
285
273
post-install:
286
post-install:
274
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
287
	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
275
	@for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
288
	for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
276
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/$${prog}; \
289
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
277
	done
290
	done
278
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
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
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
313
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
301
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
314
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
302
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
315
	cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
303
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
316
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
304
	@for app in base calc draw impress math writer; do \
317
	for app in base calc draw impress math writer; do \
305
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
318
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
306
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
319
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
307
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
320
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
308
	done
321
	done
309
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
322
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
310
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
323
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
311
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
324
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
312
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
325
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
313
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
326
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
314
	@${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
327
	${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
315
	@${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
328
	${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
316
	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
329
	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
317
	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
330
	${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
318
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
331
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
319
	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
332
	${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
320
	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
333
	for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
321
		for app in base calc draw impress math printeradmin writer; do \
334
		for app in base calc draw impress math printeradmin writer; do \
322
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
335
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
323
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
336
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
Lines 333-341 Link Here
333
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
346
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
334
		done ; \
347
		done ; \
335
	done
348
	done
336
	@${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}
337
	@${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}
338
	@${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}
339
352
340
.include <${FILESDIR}/Makefile.others>
353
.include <${FILESDIR}/Makefile.others>
341
354
(-)distinfo (-2 / +2 lines)
Lines 1-6 Link Here
1
SHA256 (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
1
SHA256 (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
2
SIZE (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = 217686497
2
SIZE (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = 217686497
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = ce261cc499f54a61f3b0f06e0f86eedc6fa477deb2ada25f6ca3f0e7f05400b5
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = d0b4925cbf8a32b9dfbf8ca708a485e150c85fe131cc60cff9eb8f0d0b5a710d
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052_1.tar.bz2) = 128368053
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = 94099621
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 --------------------------------------------------------

Return to bug 192545