Index: editors/openoffice-4/Makefile =================================================================== --- editors/openoffice-4/Makefile +++ editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -69,6 +69,8 @@ AOOVERSION1= 4 AOOVERSION2= 1 AOOVERSION3= 1 +# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD +AOOTAG= AOO411m6\(Build:9775\) SVNREVISION= 1617669 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz @@ -78,6 +80,7 @@ OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} OOODIR= openoffice${AOOVERSION1} +AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} DIST_SUBDIR= openoffice @@ -92,21 +95,25 @@ USE_GL= gl glu USE_GSTREAMER= yes USE_GCC= yes -USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2 +USES= bison compiler desktop-file-utils gmake perl5 pkgconfig python \ + tar:bzip2 USE_PERL5= build WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE -OPTIONS_DEFAULT=GCONF GNOMEVFS -GNOMEVFS_DESC= Enable GNOME Virtual File System -CCACHE_DESC= Mimimize compile time of C/C++ programs +OPTIONS_DEFINE= CUPS GCONF GNOMEVFS CCACHE +OPTIONS_DEFAULT= CUPS GCONF GNOMEVFS +GNOMEVFS_DESC= Enable GNOME Virtual File System +CCACHE_DESC= Mimimize compile time of C/C++ programs -GCONF_USE= GNOME=gconf2 -GCONF_CONFIGURE_OFF=--disable-gconf +CUPS_CONFIGURE_ENABLE= cups +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client -GNOMEVFS_USE= GNOME=gnomevfs2 -GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs +GCONF_USE= GNOME=gconf2 +GCONF_CONFIGURE_ENABLE= gconf + +GNOMEVFS_USE= GNOME=gnomevfs2 +GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs .include @@ -114,6 +121,10 @@ .include <${FILESDIR}/Makefile.localized> +.if ${COMPILER_TYPE} == clang +BROKEN= Crashes at runtime when opening dialog boxes +.endif + USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= openjdk @@ -153,7 +164,7 @@ WRKSRC?= ${WRKSUBDIR}/main BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message -SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR} +SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} .if defined(DISABLE_MAKE_JOBS) MAKE_JOBS_NUMBER= 4 @@ -283,7 +294,7 @@ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} ${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc - ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc + ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/${AOOUDIR}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} Index: editors/openoffice-4/files/pkg-message.in =================================================================== --- editors/openoffice-4/files/pkg-message.in +++ editors/openoffice-4/files/pkg-message.in @@ -1,9 +1,9 @@ -Apache OpenOffice Build %%OOOTAG%% Personal Install How-To +Apache OpenOffice Build %%AOOTAG%% Personal Install How-To Written by: Martin Blapp and Maho Nakata -Apache OpenOffice %%OOOTAG%% will soon been installed in +Apache OpenOffice %%AOOTAG%% will soon be installed in %%PREFIX%%/%%EXECBASE%% 1. User installation @@ -11,7 +11,7 @@ Just type "%%EXECBASE%%" after you have successfully installed the package. If there is no installed OO.org dir -in your homedir, the setup installs ".%%OOODIR%%" folder. +in your homedir, the setup installs "%%AOOUDIR%%" folder. 2. Starting OO.org ------------------ @@ -35,5 +35,5 @@ 3. If you run into problems -------------------------------------------------- If you somehow run into problems, please remove the already -installed ".%%OOODIR%%" dir in your homedir. Redo the user +installed "%%AOOUDIR%%" dir in your homedir. Redo the user installation and the problems should go away. Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile +++ editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -71,6 +71,8 @@ AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 +# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD +AOOTAG= AOO420m1\(Build:9800\) SVNREVISION= 1652526 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz @@ -80,7 +82,7 @@ .if defined(AOORC) AOOSUFFIX= ${AOOVERSION}-${AOORC} OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} -AOODISTTAG= +AOODISTTAG= .else AOOSUFFIX= ${PORTVERSION} OOOSRC= apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX} @@ -88,6 +90,7 @@ .endif OOODIR= openoffice${AOOVERSION1} +AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} DIST_SUBDIR= openoffice @@ -102,21 +105,25 @@ USE_GL= gl glu USE_GSTREAMER= yes USE_GCC= yes -USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:xz +USES= bison compiler desktop-file-utils gmake perl5 pkgconfig python \ + tar:xz USE_PERL5= build WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= GCONF GNOMEVFS CCACHE -OPTIONS_DEFAULT=GCONF GNOMEVFS -GNOMEVFS_DESC= Enable GNOME Virtual File System -CCACHE_DESC= Mimimize compile time of C/C++ programs +OPTIONS_DEFINE= CUPS GCONF GNOMEVFS CCACHE +OPTIONS_DEFAULT= CUPS GCONF GNOMEVFS +GNOMEVFS_DESC= Enable GNOME Virtual File System +CCACHE_DESC= Mimimize compile time of C/C++ programs -GCONF_USE= GNOME=gconf2 -GCONF_CONFIGURE_OFF=--disable-gconf +CUPS_CONFIGURE_ENABLE= cups +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client -GNOMEVFS_USE= GNOME=gnomevfs2 -GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs +GCONF_USE= GNOME=gconf2 +GCONF_CONFIGURE_ENABLE= gconf + +GNOMEVFS_USE= GNOME=gnomevfs2 +GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs .include @@ -124,6 +131,10 @@ .include <${FILESDIR}/Makefile.localized> +.if ${COMPILER_TYPE} == clang +BROKEN= Crashes at runtime when opening dialog boxes +.endif + USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= openjdk @@ -163,7 +174,7 @@ WRKSRC?= ${WRKSUBDIR}/main BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message -SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR} +SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} .if defined(DISABLE_MAKE_JOBS) MAKE_JOBS_NUMBER= 4 @@ -293,7 +304,7 @@ ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} ${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc - ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc + ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/${AOOUDIR}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} Index: editors/openoffice-devel/files/pkg-message.in =================================================================== --- editors/openoffice-devel/files/pkg-message.in +++ editors/openoffice-devel/files/pkg-message.in @@ -1,9 +1,9 @@ -Apache OpenOffice Build %%OOOTAG%% Personal Install How-To +Apache OpenOffice Build %%AOOTAG%% Personal Install How-To Written by: Martin Blapp and Maho Nakata -Apache OpenOffice %%OOOTAG%% will soon been installed in +Apache OpenOffice %%AOOTAG%% will soon be installed in %%PREFIX%%/%%EXECBASE%% 1. User installation @@ -11,7 +11,7 @@ Just type "%%EXECBASE%%" after you have successfully installed the package. If there is no installed OO.org dir -in your homedir, the setup installs ".%%OOODIR%%" folder. +in your homedir, the setup installs "%%AOOUDIR%%" folder. 2. Starting OO.org ------------------ @@ -35,5 +35,5 @@ 3. If you run into problems -------------------------------------------------- If you somehow run into problems, please remove the already -installed ".%%OOODIR%%" dir in your homedir. Redo the user +installed "%%AOOUDIR%%" dir in your homedir. Redo the user installation and the problems should go away.