summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDon Lewis <truckman@FreeBSD.org>2015-10-09 22:17:28 +0000
committerDon Lewis <truckman@FreeBSD.org>2015-10-09 22:17:28 +0000
commit8ca4e95df6dc6cf83dbafa496fcd66bd6c165c07 (patch)
tree750bf06703d6912797dd82286fd307647d33a70d /editors
parenteditors/(x)vile: Upgrade version 9.8o => 9.8q (diff)
Removing --enable-symbols=small from CONFIGURE_ARGS allows us to avoid
the need to use ${STRIP_CMD}. Fix an intermittent build failure by adding a missing dependency to the port's build framework. This change has been committed to the upstream trunk.
Notes
Notes: svn path=/head/; revision=398966
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-4/Makefile5
-rw-r--r--editors/openoffice-4/files/patch-sdext_prj_build.lst8
2 files changed, 8 insertions, 5 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 66cf1c1f8be5..1057bb12f470 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -249,7 +249,6 @@ CONFIGURE_ARGS+= \
--with-system-sane \
--with-system-serf \
--with-system-stdlibs \
- --enable-symbols=small \
--without-stlport \
--with-vendor="FreeBSD ports system" \
--enable-verbose \
@@ -401,10 +400,6 @@ do-install:
cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \
${INSTALL_DATA} ${AOOEXTENSIONS} \
${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/
- @cd ${STAGEDIR}${OOPATH}/program ; \
- ${ECHO_CMD} "stripping executables and shared libraries" ; \
- ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
- regview *.so* *.bin
${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
${REINPLACE_CMD} \
-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
diff --git a/editors/openoffice-4/files/patch-sdext_prj_build.lst b/editors/openoffice-4/files/patch-sdext_prj_build.lst
new file mode 100644
index 000000000000..e7ce00333e67
--- /dev/null
+++ b/editors/openoffice-4/files/patch-sdext_prj_build.lst
@@ -0,0 +1,8 @@
+--- sdext/prj/build.lst.orig 2014-02-25 08:27:02 UTC
++++ sdext/prj/build.lst
+@@ -1,4 +1,4 @@
+-dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp NULL
++dx sdext : L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg LIBXSLT:libxslt xmlhelp rsc NULL
+ dx sdext usr1 - all sdext_mkout NULL
+ dx sdext\prj get - all sdext_prj NULL
+ dx sdext\source\minimizer nmake - all sdext_minimizer sdext_inc NULL