[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / misc / libreoffice

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/misc/libreoffice/Makefile between version 1.288 and 1.289

version 1.288, 2022/08/11 05:09:03 version 1.289, 2022/08/22 13:58:32
Line 1 
Line 1 
 # $NetBSD$  # $NetBSD$
   
 VERREL=         7.3.3  VERREL=         7.4.0
 VERRC=          2  VERRC=          3
 VER=            ${VERREL}.${VERRC}  VER=            ${VERREL}.${VERRC}
 DISTNAME=       libreoffice-${VER}  DISTNAME=       libreoffice-${VER}
 PKGREVISION=    3  
 CATEGORIES=     misc  CATEGORIES=     misc
 MASTER_SITES=   http://download.documentfoundation.org/libreoffice/src/${VERREL}/  MASTER_SITES=   http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=   .tar.xz  EXTRACT_SUFX=   .tar.xz
Line 30  SUBST_MESSAGE.use-bash=  Using bash for 
Line 29  SUBST_MESSAGE.use-bash=  Using bash for 
 SUBST_FILES.use-bash+=          autogen.sh  SUBST_FILES.use-bash+=          autogen.sh
 SUBST_VARS.use-bash+=           BASH  SUBST_VARS.use-bash+=           BASH
   
 SUBST_CLASSES+=                 zxing  #SUBST_CLASSES+=                        zxing
 SUBST_STAGE.zxing=              pre-configure  #SUBST_STAGE.zxing=             pre-configure
 SUBST_MESSAGE.zxing=            Include zxing header files  #SUBST_MESSAGE.zxing=           Include zxing header files
 SUBST_FILES.zxing+=             configure.ac  #SUBST_FILES.zxing+=            configure.ac
 SUBST_SED.zxing+=               -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'  #SUBST_SED.zxing+=              -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'
   
   SUBST_CLASSES+=                 dragonbox
   SUBST_STAGE.dragonbox=          pre-configure
   SUBST_MESSAGE.dragonbox=        Include dragonbox header files
   SUBST_FILES.dragonbox+=         configure.ac
   SUBST_SED.dragonbox+=           -e 's,/usr/include/dragonbox-1.0.0,${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
   
 SUBST_CLASSES+=                 font-path  SUBST_CLASSES+=                 font-path
 SUBST_STAGE.font-path=          pre-configure  SUBST_STAGE.font-path=          pre-configure
Line 48  BUILD_TARGET= build
Line 53  BUILD_TARGET= build
   
 .include "../../mk/bsd.prefs.mk"  .include "../../mk/bsd.prefs.mk"
 pre-build:  pre-build:
         # Workaround for internal libjpeg-turbo          # Workaround for external openldap
         ${MKDIR} ${WRKSRC}/workdir/ExternalProject          ${MKDIR} ${WRKSRC}/workdir/ExternalProject
 .if ${OPSYS} == "NetBSD"  .if ${OPSYS} == "NetBSD"
         cd ${WRKSRC} && \          cd ${WRKSRC} && \
Line 85  MORE_DISTFILES= \
Line 90  MORE_DISTFILES= \
         907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz \          907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz \
         edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \          edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \
         source-serif-pro-3.000R.tar.gz \          source-serif-pro-3.000R.tar.gz \
         xmlsec1-1.2.33.tar.gz \          xmlsec1-1.2.34.tar.gz \
         3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \          3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \
         35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \          35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
         39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip \          39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip \
Line 112  MORE_DISTFILES= \
Line 117  MORE_DISTFILES= \
         graphite2-minimal-1.3.14.tgz \          graphite2-minimal-1.3.14.tgz \
         1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip \          1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip \
         EmojiOneColor-SVGinOT-1.3.tar.gz \          EmojiOneColor-SVGinOT-1.3.tar.gz \
         libjpeg-turbo-2.1.1.tar.gz \  
         alef-1.001.tar.gz \          alef-1.001.tar.gz \
         c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \          c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \
         culmus-0.133.tar.gz \          culmus-0.133.tar.gz \
Line 123  MORE_DISTFILES= \
Line 127  MORE_DISTFILES= \
         lxml-4.1.1.tgz \          lxml-4.1.1.tgz \
         Amiri-0.111.zip \          Amiri-0.111.zip \
         ReemKufi-0.7.zip \          ReemKufi-0.7.zip \
         pdfium-4699.tar.bz2 \          pdfium-5058.tar.bz2 \
         dtoa-20180411.tgz \          dtoa-20180411.tgz \
         skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz \          skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz \
         libcmis-0.5.2.tar.xz \          libcmis-0.5.2.tar.xz \
         libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz          libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
   
   #       libjpeg-turbo-2.1.1.tar.gz
   
 .for md in ${MORE_DISTFILES}  .for md in ${MORE_DISTFILES}
 DISTFILES+=             ${md}  DISTFILES+=             ${md}
 SITES.${md}=            https://dev-www.libreoffice.org/src/  SITES.${md}=            https://dev-www.libreoffice.org/src/
Line 174  USE_LIBTOOL=  yes
Line 180  USE_LIBTOOL=  yes
 # Use GNU find from findutils.  # Use GNU find from findutils.
 TOOLS_PLATFORM.find=    # empty  TOOLS_PLATFORM.find=    # empty
 # GUN tar is really needed. Some Makefiles depends on GNUTAR.  # GUN tar is really needed. Some Makefiles depends on GNUTAR.
 USE_TOOLS+=             automake bash bison gmake gtar  USE_TOOLS+=             automake bash bison gmake gsed gtar
 USE_TOOLS+=             msgfmt perl pkg-config unzip zip  USE_TOOLS+=             msgfmt perl pkg-config unzip zip
 PTHREAD_OPTS+=          require  PTHREAD_OPTS+=          require
   
Line 185  CXXFLAGS.NetBSD+= -DNO_CPLUSPLUS_ALLOCA
Line 191  CXXFLAGS.NetBSD+= -DNO_CPLUSPLUS_ALLOCA
   
 # Do not use /tmp, outside of WRKSRC.  # Do not use /tmp, outside of WRKSRC.
 CONFIGURE_ENV+=         TMPDIR=${WRKSRC}/tmp  CONFIGURE_ENV+=         TMPDIR=${WRKSRC}/tmp
 CONFIGURE_ENV+=         ANT_LIB=${LOCALBASE}/lib/java/ant  CONFIGURE_ENV+=         ANT_LIB=${PREFIX}/lib/java/ant
   
 MAKE_JOBS_SAFE=         no # --with-parallelism conficts with -jN  MAKE_JOBS_SAFE=         no # --with-parallelism conficts with -jN
 .if !empty(MAKE_JOBS.${PKGPATH})  .if !empty(MAKE_JOBS.${PKGPATH})
Line 214  CONFIGURE_ARGS+= --enable-python=system
Line 220  CONFIGURE_ARGS+= --enable-python=system
 CONFIGURE_ARGS+=        --enable-ext-wiki-publisher  CONFIGURE_ARGS+=        --enable-ext-wiki-publisher
 CONFIGURE_ARGS+=        --enable-ext-nlpsolver  CONFIGURE_ARGS+=        --enable-ext-nlpsolver
 CONFIGURE_ARGS+=        --with-system-gpgmepp  CONFIGURE_ARGS+=        --with-system-gpgmepp
 CONFIGURE_ARGS+=        --without-system-jpeg  #CONFIGURE_ARGS+=       --without-system-jpeg
   CONFIGURE_ARGS+=        --with-system-jpeg
 CONFIGURE_ARGS+=        --without-system-postgresql  CONFIGURE_ARGS+=        --without-system-postgresql
 CONFIGURE_ARGS+=        --without-system-mariadb  CONFIGURE_ARGS+=        --without-system-mariadb
 CONFIGURE_ARGS+=        --without-system-xmlsec # Needs NSS support  CONFIGURE_ARGS+=        --without-system-xmlsec # Needs NSS support
 CONFIGURE_ARGS+=        --with-system-zxing  CONFIGURE_ARGS+=        --with-system-zxing
   CONFIGURE_ENV+=         CPLUS_INCLUDE_PATH=${BUILDLINK_PREFIX.zxing-cpp}/include
 # Internal libcmis-0.5.2 is patched. Do not libcmis-0.5.2nb13 from net/libcmis.  # Internal libcmis-0.5.2 is patched. Do not libcmis-0.5.2nb13 from net/libcmis.
 CONFIGURE_ARGS+=        --without-system-libcmis  CONFIGURE_ARGS+=        --without-system-libcmis
 CONFIGURE_ARGS+=        --with-compat-oowrappers  CONFIGURE_ARGS+=        --with-compat-oowrappers
Line 231  CONFIGURE_ARGS+= --with-system-libs
Line 239  CONFIGURE_ARGS+= --with-system-libs
 CONFIGURE_ARGS+=        --with-system-dicts  CONFIGURE_ARGS+=        --with-system-dicts
 CONFIGURE_ARGS+=        --with-vendor="pkgsrc"  CONFIGURE_ARGS+=        --with-vendor="pkgsrc"
 CONFIGURE_ARGS+=        --with-tls="nss"  CONFIGURE_ARGS+=        --with-tls="nss"
   CONFIGURE_ARGS+=        --with-system-nss
 CONFIGURE_ARGS+=        --without-doxygen  CONFIGURE_ARGS+=        --without-doxygen
 CONFIGURE_ARGS+=        --without-junit  CONFIGURE_ARGS+=        --without-junit
 CONFIGURE_ARGS+=        --without-krb5  CONFIGURE_ARGS+=        --without-krb5
Line 277  CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
Line 286  CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
   
 MAKE_ENV+=              ROOT_USER=${ROOT_USER}  MAKE_ENV+=              ROOT_USER=${ROOT_USER}
 MAKE_ENV+=              ROOT_GROUP=${ROOT_GROUP}  MAKE_ENV+=              ROOT_GROUP=${ROOT_GROUP}
 MAKE_ENV+=              SHELL=${BASH}  MAKE_ENV+=              SHELL=${BASH:Q}
 # configure script should use `pkg-config --cflags xzing`  # configure script should use `pkg-config --cflags xzing`
 #MAKE_ENV+=             LD_LIBRARY_PATH=${LD_LIBRARY_PATH}  #MAKE_ENV+=             LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 BUILD_MAKE_FLAGS+=      VERBOSE=true  BUILD_MAKE_FLAGS+=      VERBOSE=true
Line 381  BUILDLINK_API_DEPENDS.libetonyek+= libet
Line 390  BUILDLINK_API_DEPENDS.libetonyek+= libet
 .include "../../graphics/box2d/buildlink3.mk"  .include "../../graphics/box2d/buildlink3.mk"
 .include "../../graphics/graphite2/buildlink3.mk"  .include "../../graphics/graphite2/buildlink3.mk"
 .endif  .endif
 # Requires JCS_EXT_BGRA  .include "../../mk/jpeg.buildlink3.mk"
 #.include "../../mk/jpeg.buildlink3.mk"  
 .include "../../graphics/cairo/buildlink3.mk"  .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"  .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"  .include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
Line 392  BUILDLINK_API_DEPENDS.libetonyek+= libet
Line 400  BUILDLINK_API_DEPENDS.libetonyek+= libet
 .include "../../graphics/lcms2/buildlink3.mk"  .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libepoxy/buildlink3.mk"  .include "../../graphics/libepoxy/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"  .include "../../graphics/librsvg/buildlink3.mk"
   .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"  .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"  .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/zxing-cpp/buildlink3.mk"  .include "../../graphics/zxing-cpp/buildlink3.mk"
Line 403  BUILDLINK_API_DEPENDS.libetonyek+= libet
Line 412  BUILDLINK_API_DEPENDS.libetonyek+= libet
 BUILDLINK_INCDIRS.${PYPKGPREFIX:S/py/python/}=  # empty  BUILDLINK_INCDIRS.${PYPKGPREFIX:S/py/python/}=  # empty
 .include "../../lang/python/tool.mk"  .include "../../lang/python/tool.mk"
 .include "../../math/coinmp/buildlink3.mk"  .include "../../math/coinmp/buildlink3.mk"
   .include "../../math/dragonbox/buildlink3.mk"
   .include "../../math/libfixmath/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libnumbertext+=   libnumbertext>=1.0.6  BUILDLINK_API_DEPENDS.libnumbertext+=   libnumbertext>=1.0.6
 .include "../../math/libnumbertext/buildlink3.mk"  .include "../../math/libnumbertext/buildlink3.mk"
 .include "../../math/lp_solve/buildlink3.mk"  .include "../../math/lp_solve/buildlink3.mk"

Legend:
Removed from v.1.288  
changed lines
  Added in v.1.289

CVSweb <webmaster@jp.NetBSD.org>