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

Collapse All | Expand All

(-)Makefile (-25 / +36 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
#			--with-system-graphite
207
217
208
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
218
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
209
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
219
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
Lines 233-238 Link Here
233
.endif
243
.endif
234
244
235
post-extract:
245
post-extract:
246
	@${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
236
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
247
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
237
	@${RM} -rf ${WRKSRC}/l10n
248
	@${RM} -rf ${WRKSRC}/l10n
238
249
Lines 249-257 Link Here
249
	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
260
	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
250
261
251
do-build:
262
do-build:
252
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "[repositories]\n" > source_config
263
	@cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
253
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "main=active\n" >> source_config
264
	@cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
254
	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "extras=active\n" >> source_config
265
	@cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
255
	@cd ${WRKSRC} ; ./bootstrap
266
	@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}"
267
	@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
268
Lines 266-279 Link Here
266
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
277
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
267
	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
278
	@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
279
	@${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
280
	@${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/
281
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
271
	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
282
	@cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
272
283
273
post-install:
284
post-install:
274
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
285
	@${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 \
286
	@for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
276
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/$${prog}; \
287
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
277
	done
288
	done
278
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
289
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
279
	@${ECHO_MSG} "===>  Add wrapper scripts";
290
	@${ECHO_MSG} "===>  Add wrapper scripts";
(-)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,\

Return to bug 192545