Date: Wed, 26 Mar 2014 08:17:14 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349233 - head/editors/openoffice-devel Message-ID: <201403260817.s2Q8HEup071509@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Mar 26 08:17:13 2014 New Revision: 349233 URL: http://svnweb.freebsd.org/changeset/ports/349233 QAT: https://qat.redports.org/buildarchive/r349233/ Log: Support stage Modified: head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Wed Mar 26 08:11:08 2014 (r349232) +++ head/editors/openoffice-devel/Makefile Wed Mar 26 08:17:13 2014 (r349233) @@ -20,15 +20,14 @@ LICENSE= APACHE20 PKGNAMESUFFIX= -devel -USE_GNOME= desktopfileutils gtk20 libxslt libidl glib20 +USE_GNOME= gtk20 libxslt libidl glib20 USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes USE_GCC= yes USE_PYTHON= yes -USE_BZIP2= yes -USES+= bison perl5 gmake pkgconfig +USES+= bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils USE_PERL5= build WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes @@ -38,28 +37,20 @@ OPTIONS_DEFAULT=GCONF GNOMEVFS GNOMEVFS_DESC= Enable GNOME Virtual File System CCACHE_DESC= Mimimize compile time of C/C++ programs -NO_STAGE= yes .include "${.CURDIR}/files/Makefile.localized" -.include <bsd.port.options.mk> -.include <bsd.port.pre.mk> - USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -.else -CONFIGURE_ARGS+=--disable-gconf -.endif +GCONF_USE= GNOME=gconf2 +GCONF_CONFIGURE_OFF=--disable-gconf -.if ${PORT_OPTIONS:MGNOMEVFS} -USE_GNOME+= gnomevfs2 -.else -CONFIGURE_ARGS+=--disable-gnome-vfs -.endif +GNOMEVFS_USE= GNOME=gnomevfs2 +GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs + +.include <bsd.port.pre.mk> ONLY_FOR_ARCHS= i386 amd64 @@ -112,21 +103,21 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOO PATH=${WRKSRC}/solenv/bin:$$PATH \ CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - expat:${PORTSDIR}/textproc/expat2 \ - jpeg:${PORTSDIR}/graphics/jpeg \ - curl:${PORTSDIR}/ftp/curl \ - hunspell-1.3:${PORTSDIR}/textproc/hunspell \ +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libcurl.so:${PORTSDIR}/ftp/curl \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ - rdf:${PORTSDIR}/textproc/redland \ - textcat:${PORTSDIR}/textproc/libtextcat \ - freetype:${PORTSDIR}/print/freetype2 \ - apr-1:${PORTSDIR}/devel/apr1 \ - CoinMP:${PORTSDIR}/math/coinmp \ - serf-1:${PORTSDIR}/www/serf \ - freetype:${PORTSDIR}/print/freetype2 \ - textcat:${PORTSDIR}/textproc/libtextcat \ - nss3:${PORTSDIR}/security/nss + librdf.so:${PORTSDIR}/textproc/redland \ + libtextcat.so:${PORTSDIR}/textproc/libtextcat \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libapr-1.so:${PORTSDIR}/devel/apr1 \ + libCoinMP.so:${PORTSDIR}/math/coinmp \ + libserf-1.so:${PORTSDIR}/www/serf \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libtextcat.so:${PORTSDIR}/textproc/libtextcat \ + libnss3.so:${PORTSDIR}/security/nss BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ @@ -277,15 +268,15 @@ do-install: ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \ done - @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} - @cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} - @${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc - @${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc - @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @${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\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: - @${FIND} ${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; + @${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ @@ -294,64 +285,59 @@ post-install: -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ - ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter + ${STAGEDIR}${PREFIX}/bin/${EXECBASE} + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin + @${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter @${ECHO_CMD} "" > ${TMPPLIST} @${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} @${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} @${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST} @${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} - @cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ + @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} @for app in base calc draw impress math writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ + ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ done @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop + ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ - ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop - @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak - @${RM} -f ${DESKTOPDIR}/${EXECBASE} - @${MKDIR} ${DESKTOPDIR} + ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop + @${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak + @${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ - ${DESKTOPDIR}/${EXECBASE} + ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} - @${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE} @${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ - ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \ - ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \ done ; \ done - @${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE} @${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} .include <${FILESDIR}/Makefile.others> .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403260817.s2Q8HEup071509>