diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 6afcbfd7b43b..cc7d1ef7f7dc 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,61 +1,60 @@ PORTNAME= libwmf DISTVERSIONPREFIX= v -DISTVERSION= 0.2.12 -PORTREVISION= 1 +DISTVERSION= 0.2.13 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org COMMENT= Tools and library for converting Microsoft WMF (windows metafile) WWW= http://wvware.sourceforge.net/libwmf.html LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libgd.so:graphics/gd \ libexpat.so:textproc/expat2 USES= autoreconf:build cpe gnome jpeg libtool localbase pkgconfig USE_GITHUB= yes -USE_GNOME= gdkpixbuf2 GH_ACCOUNT= caolanm +USE_GNOME= gdkpixbuf2 USE_LDCONFIG= yes CPE_VENDOR= wvware GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts INSTALL_TARGET= install-strip -PORTDOCS= * - CONFLICTS?= libwmf-nox11 +PORTDOCS= * + OPTIONS_DEFINE= X11 DOCS OPTIONS_DEFAULT=X11 OPTIONS_SUB= yes X11_USES= xorg X11_USE= XORG=x11 X11_CONFIGURE_OFF=--with-x=no +post-patch: + @${REINPLACE_CMD} -e \ + 's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \ + s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \ + s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in + pre-configure: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} AUTOHEADER="${TRUE}" \ ${LOCALBASE}/bin/autoreconf -vif -Ipatches) post-configure: @${REINPLACE_CMD} -e 's|autoheader|autoheader -Ipatches|g' \ ${WRKSRC}/Makefile -post-patch: - @${REINPLACE_CMD} -e \ - 's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \ - s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \ - s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf - .include diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo index 30f217e17626..2c7aa31eeedf 100644 --- a/graphics/libwmf/distinfo +++ b/graphics/libwmf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608812851 -SHA256 (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2 -SIZE (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 3043572 +TIMESTAMP = 1681804461 +SHA256 (caolanm-libwmf-v0.2.13_GH0.tar.gz) = 18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068 +SIZE (caolanm-libwmf-v0.2.13_GH0.tar.gz) = 3044235 diff --git a/graphics/libwmf/files/patch-configure.ac b/graphics/libwmf/files/patch-configure.ac index ce69d9f28219..a0f0de3256d0 100644 --- a/graphics/libwmf/files/patch-configure.ac +++ b/graphics/libwmf/files/patch-configure.ac @@ -1,51 +1,55 @@ ---- configure.ac.orig 2019-02-01 17:51:32 UTC +--- configure.ac.orig 2023-04-17 11:39:47 UTC +++ configure.ac -@@ -391,40 +391,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr +@@ -1,5 +1,5 @@ +-dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/player.c) ++dnl Process this file with autoconf to produce a configure script. AC_INIT(src/player.c) + + LIBWMF_PACKAGE=libwmf + AC_SUBST(LIBWMF_PACKAGE) +@@ -391,37 +391,16 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr fi ]) -if [ test -n "$FREETYPE_DIR" ]; then - AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH]) -else - AC_PATH_PROG(FREETYPE_CONFIG,freetype-config) -fi +PKG_CHECK_MODULES(FREETYPE2, freetype2, + CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" + LDFLAGS="$LDFLAGS $FREETYPE2_LIBS", + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) +) -if [ test -n "$FREETYPE_CONFIG" ]; then - if [ test -n "$FREETYPE_DIR" ]; then - freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include" - freetype_libs=`$FREETYPE_CONFIG --libs` - else - freetype_cflags=`$FREETYPE_CONFIG --cflags` - freetype_libs=`$FREETYPE_CONFIG --libs` - fi -else - if [ test -n "$FREETYPE_DIR" ]; then - freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" - freetype_libs="-L$FREETYPE_DIR/lib -lfreetype" - else - freetype_cflags="" - freetype_libs="-lfreetype" - fi -fi - -CPPFLAGS="$freetype_cflags $CPPFLAGS" -LDFLAGS="$LDFLAGS $freetype_libs" - - AC_CHECK_LIB(freetype,FT_Init_FreeType,[ -- WMF_FT_LDFLAGS="$freetype_libs" -+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) - AC_CHECK_HEADER(ft2build.h,[ -- WMF_FT_CFLAGS="$freetype_cflags" -- WMF_FT_CONFIG_CFLAGS="$freetype_cflags" -+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" -+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) + PKG_CHECK_MODULES(FT2, freetype2) +-WMF_FT_LDFLAGS=$FT2_LIBS +-WMF_FT_CFLAGS=$FT2_CFLAGS +-WMF_FT_CONFIG_CFLAGS=$FT2_CFLAGS ++WMF_FT_LDFLAGS="$FREETYPE2_LIBS" ++WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" ++WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" + + GD_DEFS="$GD_DEFS -DHAVE_LIBFREETYPE" diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist index 7c0377430d47..838166ad5cda 100644 --- a/graphics/libwmf/pkg-plist +++ b/graphics/libwmf/pkg-plist @@ -1,69 +1,69 @@ bin/libwmf-config bin/libwmf-fontmap bin/wmf2eps bin/wmf2fig bin/wmf2gd bin/wmf2svg %%X11%%bin/wmf2x include/libwmf/api.h include/libwmf/canvas.h include/libwmf/color.h include/libwmf/defs.h include/libwmf/eps.h include/libwmf/fig.h include/libwmf/font.h include/libwmf/foreign.h include/libwmf/fund.h include/libwmf/gd/gd.h include/libwmf/gd/gd_clip.h include/libwmf/gd/gd_io.h include/libwmf/gd/gdcache.h include/libwmf/gd/gdfontg.h include/libwmf/gd/gdfontl.h include/libwmf/gd/gdfontmb.h include/libwmf/gd/gdfonts.h include/libwmf/gd/gdfontt.h include/libwmf/gd.h include/libwmf/ipa.h include/libwmf/macro.h include/libwmf/svg.h include/libwmf/types.h include/libwmf/x.h lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/io-wmf.a lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/io-wmf.so lib/libwmf-0.2.so.7 -lib/libwmf-0.2.so.7.1.4 +lib/libwmf-0.2.so.7.1.5 lib/libwmf.a lib/libwmf.so lib/libwmflite-0.2.so.7 -lib/libwmflite-0.2.so.7.0.5 +lib/libwmflite-0.2.so.7.0.6 lib/libwmflite.a lib/libwmflite.so libdata/pkgconfig/libwmf.pc %%DATADIR%%/fonts/fontmap %%DATADIR%%/fonts/NimbusMonoPS-Bold.afm %%DATADIR%%/fonts/NimbusMonoPS-Bold.t1 %%DATADIR%%/fonts/NimbusMonoPS-BoldItalic.afm %%DATADIR%%/fonts/NimbusMonoPS-BoldItalic.t1 %%DATADIR%%/fonts/NimbusMonoPS-Italic.afm %%DATADIR%%/fonts/NimbusMonoPS-Italic.t1 %%DATADIR%%/fonts/NimbusMonoPS-Regular.afm %%DATADIR%%/fonts/NimbusMonoPS-Regular.t1 %%DATADIR%%/fonts/NimbusRoman-Bold.afm %%DATADIR%%/fonts/NimbusRoman-Bold.t1 %%DATADIR%%/fonts/NimbusRoman-BoldItalic.afm %%DATADIR%%/fonts/NimbusRoman-BoldItalic.t1 %%DATADIR%%/fonts/NimbusRoman-Italic.afm %%DATADIR%%/fonts/NimbusRoman-Italic.t1 %%DATADIR%%/fonts/NimbusRoman-Regular.afm %%DATADIR%%/fonts/NimbusRoman-Regular.t1 %%DATADIR%%/fonts/NimbusSans-Bold.afm %%DATADIR%%/fonts/NimbusSans-Bold.t1 %%DATADIR%%/fonts/NimbusSans-BoldItalic.afm %%DATADIR%%/fonts/NimbusSans-BoldItalic.t1 %%DATADIR%%/fonts/NimbusSans-Italic.afm %%DATADIR%%/fonts/NimbusSans-Italic.t1 %%DATADIR%%/fonts/NimbusSans-Regular.afm %%DATADIR%%/fonts/NimbusSans-Regular.t1 %%DATADIR%%/fonts/StandardSymbolsPS.afm %%DATADIR%%/fonts/StandardSymbolsPS.t1