svn commit: r414357 - head/editors/openoffice-devel
Don Lewis
truckman at FreeBSD.org
Sat Apr 30 19:04:33 UTC 2016
Author: truckman
Date: Sat Apr 30 19:04:31 2016
New Revision: 414357
URL: https://svnweb.freebsd.org/changeset/ports/414357
Log:
Revert the part of the change in r408688 that allowed the PDF Import
extension to build with boost 1.60, which should have been reverted
in r411540. The fix implemented upstream does not require linking
with any boost libraries, so return boost to always just being
a build dependency.
Update TARGET_ORDER_OVERRIDE to for the changes to Uses/gnome.mk
in r413768.
Don't bother trying to create ${STAGEDIR}${DESKTOPDIR} since it
is already handled by mtree.
Modified:
head/editors/openoffice-devel/Makefile
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Sat Apr 30 18:55:11 2016 (r414356)
+++ head/editors/openoffice-devel/Makefile Sat Apr 30 19:04:31 2016 (r414357)
@@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-#PORTREVISION= 1
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -55,6 +55,7 @@ BUILD_DEPENDS= \
${LOCALBASE}/bin/unzip:archivers/unzip \
zip:archivers/zip \
ant:devel/apache-ant \
+ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
dmake:devel/dmake \
epm:devel/epm \
${LOCALBASE}/bin/gperf:devel/gperf \
@@ -175,13 +176,11 @@ MMEDIA_USE= GSTREAMER=yes
SDK_CONFIGURE_ENABLE= odk
PDFIMPORT_CONFIGURE_ENABLE= pdfimport
-PDFIMPORT_LIB_DEPENDS= libboost_system.so:devel/boost-libs
-PDFIMPORT_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
-# Don't run gnome-post-install until after post-install generates the plist
-TARGET_ORDER_OVERRIDE= 710:gnome-post-install
+# Don't run gnome-post-icons until after post-install generates the plist
+TARGET_ORDER_OVERRIDE= 710:gnome-post-icons
.include <bsd.port.pre.mk>
@@ -410,7 +409,6 @@ do-build:
do-install:
@${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
- ${STAGEDIR}${DESKTOPDIR} \
${STAGEDIR}${PREFIX}/share/mime/packages
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
for i in *.tar.?z ; do \
More information about the svn-ports-head
mailing list