diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 4ff869e9e2a0..845053932cef 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -1,110 +1,113 @@ PORTNAME= denemo PORTVERSION= 2.0.6 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= audio MASTER_SITES= GNU MAINTAINER= multimedia@FreeBSD.org COMMENT= Graphical score editor WWW= http://www.denemo.org/ LICENSE= GPLv3+ BROKEN_mips= fails to package: tar: Pathname cannot be converted from UTF-8 to current locale LIB_DEPENDS= libaubio.so:audio/aubio \ libfluidsynth.so:audio/fluidsynth \ libjack.so:audio/jack \ libsmf.so:audio/libsmf \ libsndfile.so:audio/libsndfile \ libportaudio.so:audio/portaudio \ librubberband.so:audio/rubberband \ - libguile.so:lang/guile1 \ + libharfbuzz.so:print/harfbuzz \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libsamplerate.so:audio/libsamplerate \ libfftw3.so:math/fftw3 RUN_DEPENDS= xdg-open:devel/xdg-utils EXTRACT_BEFORE_ARGS=\ -s '!\(/Clarinet in B\).*\(\.denemo\)$$!\1b\2!p' -xf USES= bison:alias compiler:c++11-lang desktop-file-utils gettext gmake \ - gnome localbase:ldflags pkgconfig -USE_GNOME= intltool librsvg2 libxml2 + gnome guile:1.8 localbase:ldflags pkgconfig +USE_GNOME= cairo intltool librsvg2 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-jack \ --disable-alsa \ --disable-portmidi \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --enable-guile_1_8 CFLAGS+= -Wno-error=return-type OPTIONS_DEFINE= DOCS EXAMPLES LILYPOND PDF OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT= GTK3 GTK2_USE= gnome=gtk20,gtksourceview2 GTK2_CONFIGURE_ON= --enable-gtk2 GTK3_USE= gnome=gtk30,gtksourceview3 LILYPOND_DESC= Install LilyPond (Printing) LILYPOND_RUN_DEPENDS= lilypond:print/lilypond PDF_CONFIGURE_OFF= --disable-evince TOOLKIT_DESC= GTK+ toolkit .include .if ${PORT_OPTIONS:MGTK3} && ${PORT_OPTIONS:MPDF} LIB_DEPENDS+= libevview3.so:graphics/evince .endif .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPDF} LIB_DEPENDS+= libatrilview.so:graphics/atril .endif .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-patch: @${REINPLACE_CMD} -e \ 's|-lpthread|-pthread| ; \ /^CFLAGS=/s|_LIBS|_CFLAGS| ; \ s|evince-view-2.30 >= 2.|atril-view-1.5.|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/) install-data-hook/s|^|#|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/^docdir/s|$$(datadir)/$${PACKAGE}|@docdir@|' \ ${WRKSRC}/docs/Makefile.in @${REINPLACE_CMD} -e \ '/^imagedir/s|$$(datadir)/$${PACKAGE}|@docdir@|' \ ${WRKSRC}/docs/images/Makefile.in @${REINPLACE_CMD} -e \ 's|"firefox"|"xdg-open"|' ${WRKSRC}/src/core/prefops.c .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPDF} @${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \ '/^#include/s|evince|atril|' .endif post-install: @(cd ${WRKSRC} && ${COPYTREE_SHARE} "actions templates" \ ${STAGEDIR}${DATADIR}) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog NEWS (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .for i in DESIGN DESIGN.lilypond GOALS TODO (cd ${WRKSRC}/docs && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${INSTALL_DATA} *.denemo \ ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/audio/zplugins-lv2/Makefile b/audio/zplugins-lv2/Makefile index 4713f5319402..1cc593f19424 100644 --- a/audio/zplugins-lv2/Makefile +++ b/audio/zplugins-lv2/Makefile @@ -1,33 +1,32 @@ PORTNAME= zplugins DISTVERSIONPREFIX= v DISTVERSION= 0.2.5 PORTREVISION= 1 CATEGORIES= audio multimedia PKGNAMESUFFIX= -lv2 MAINTAINER= yuri@FreeBSD.org COMMENT= Collection of LV2 plugins to be bundled with Zrythm WWW= https://github.com/zrythm/ZPlugins LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= lv2>0:audio/lv2 \ bash:shells/bash \ gmake:devel/gmake \ - guile2>0:lang/guile2 \ ${LOCALBASE}/lib/libztoolkit.a:x11-toolkits/ztoolkit LIB_DEPENDS= liblo.so:audio/liblo \ libsndfile.so:audio/libsndfile -USES= gnome meson pkgconfig xorg +USES= gnome guile:2.2,3.0,build,alias meson pkgconfig xorg USE_GNOME= cairo glib20 librsvg2 USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= zrythm GH_PROJECT= ZPlugins BINARY_ALIAS= make=${GMAKE} .include diff --git a/audio/zrythm/Makefile b/audio/zrythm/Makefile index d056edc0b2cd..e591b392969a 100644 --- a/audio/zrythm/Makefile +++ b/audio/zrythm/Makefile @@ -1,75 +1,75 @@ PORTNAME= zrythm DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-alpha.26.0.13 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org COMMENT= Modern music production system, also known as DAW WWW= https://www.zrythm.org/en/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ help2man:misc/help2man \ ${LOCALBASE}/lib/libbacktrace.a:devel/libbacktrace \ kf5-breeze-icons>0:x11-themes/kf5-breeze-icons LIB_DEPENDS= libaudec.so:audio/libaudec \ libavcodec.so:multimedia/ffmpeg \ libcyaml.so:textproc/libcyaml \ libgtop-2.0.so:devel/libgtop \ libcgraph.so:graphics/graphviz \ libcurl.so:ftp/curl \ libfftw3_threads.so:math/fftw3 \ libfftw3f_threads.so:math/fftw3-float \ - libguile-2.2.so:lang/guile2 \ libjack.so:audio/jack \ libjson-glib-1.0.so:devel/json-glib \ liblilv-0.so:audio/lilv \ libpcre.so:devel/pcre \ libpcre2-8.so:devel/pcre2 \ libportaudio.so:audio/portaudio \ libpulse.so:audio/pulseaudio \ libreproc.so:devel/reproc \ librubberband.so:audio/rubberband \ libsamplerate.so:audio/libsamplerate \ libserd-0.so:devel/serd \ libsmf.so:audio/libsmf \ libsndfile.so:audio/libsndfile \ libsord-0.so:devel/sord \ libasound.so:audio/alsa-lib \ libsratom-0.so:audio/sratom \ libsuil-0.so:audio/suil \ libvamp-hostsdk.so:audio/vamp-plugin-sdk \ libxxhash.so:devel/xxhash \ libyaml.so:textproc/libyaml \ libzstd.so:archivers/zstd RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ kf5-breeze-icons>0:x11-themes/kf5-breeze-icons -USES= compiler:c11 desktop-file-utils gettext-tools gettext-runtime gnome libtool localbase:ldflags \ +USES= compiler:c11 desktop-file-utils gettext-tools gettext-runtime \ + guile:2.2,3.0,alias,conflicts gnome libtool localbase:ldflags \ meson pkgconfig python:build shared-mime-info shebangfix xorg USE_GITHUB= yes USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 libxml2 pango USE_XORG= x11 SHEBANG_FILES= scripts/collect_translatables.sh MESON_ARGS= -Dlsp_dsp=disabled GLIB_SCHEMAS= org.zrythm.Zrythm.gschema.xml LDFLAGS+= ${LOCALBASE}/lib/libfftw3_threads.so ${LOCALBASE}/lib/libfftw3f_threads.so # these libs are required but aren't returned by pkg-config for fftw3 BINARY_ALIAS= git=false python3=${PYTHON_CMD} .include .if ${ARCH} == powerpc64 MESON_ARGS= -Db_lto=false .endif post-patch: # https://git.zrythm.org/zrythm/zrythm/issues/299 @${REINPLACE_CMD} 's|||' ${WRKSRC}/ext/midilib/src/*.c .include diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 654882bf539b..2f140bc1afd6 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -1,45 +1,45 @@ PORTNAME= geda PORTVERSION= 1.8.2 DISTVERSIONPREFIX=gaf- -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= http://ftp.geda-project.org/${PORTNAME}-gaf/stable/v${PORTVERSION:R}/${PORTVERSION}/ MAINTAINER= hrs@FreeBSD.org COMMENT= GPL Electronic Design Automation tools WWW= http://www.gpleda.org/ LICENSE= GPLv2+ -LIB_DEPENDS= libstroke.so:devel/libstroke \ - libguile.so:lang/guile1 -RUN_DEPENDS= gawk:lang/gawk\ +LIB_DEPENDS= libstroke.so:devel/libstroke +RUN_DEPENDS= gawk:lang/gawk -USES= desktop-file-utils gettext gmake gnome libtool pathfix perl5 \ - pkgconfig python:run shared-mime-info shebangfix +USES= desktop-file-utils gettext gmake gnome guile:1.8 libtool \ + pathfix perl5 pkgconfig python:run shared-mime-info \ + shebangfix SHEBANG_FILES= examples/lightning_detector/bom libgeda/docs/*.dox \ utils/gxyrs/*.pl utils/scripts/* \ utils/docs/*.dox gattrib/docs/*.dox \ gschem/docs/*.dox gsymcheck/docs/*.dox \ gnetlist/docs/*.dox USE_GNOME= gtk20 USE_PERL5= run GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libstroke=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-gaf DATADIR= ${PREFIX}/share/gEDA INFO= geda-scheme BINARY_WRAPPERS= gm4 CONFLICTS= geda-docs geda-examples geda-gattrib \ geda-gschem geda-netlist geda-symbols \ geda-symcheck geda-utils libgeda PORTSCOUT= limitw:1,even OPTIONS_DEFINE= DOCS .include diff --git a/cad/lepton-eda/Makefile b/cad/lepton-eda/Makefile index 578832b9799e..520f2dd386aa 100644 --- a/cad/lepton-eda/Makefile +++ b/cad/lepton-eda/Makefile @@ -1,66 +1,65 @@ PORTNAME= lepton-eda PORTVERSION= 1.9.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= https://github.com/lepton-eda/lepton-eda/releases/download/${PORTVERSION}-20220529/ MAINTAINER= graahnul.grom@gmail.com COMMENT= Lepton Electronic Design Automation WWW= https://github.com/lepton-eda/lepton-eda LICENSE= GPLv2+ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libffi.so:devel/libffi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ - libgc-threaded.so:devel/boehm-gc-threaded \ libGLdispatch.so:graphics/libglvnd \ libgmp.so:math/gmp \ libgraphite2.so:graphics/graphite2 \ libgtkextra-x11-3.0.so:x11-toolkits/gtkextra \ - libguile-2.2.so:lang/guile2 \ libharfbuzz.so:print/harfbuzz \ libltdl.so:devel/libltdl \ libpcre.so:devel/pcre \ libpng.so:graphics/png \ libstroke.so:devel/libstroke \ libunistring.so:devel/libunistring USES= desktop-file-utils gettext-tools gnome groff:build \ - iconv:wchar_t libtool localbase makeinfo pathfix perl5 \ - pkgconfig shared-mime-info shebangfix xorg + guile:2.2,3.0,conflicts iconv:wchar_t libtool localbase \ + makeinfo pathfix perl5 pkgconfig shared-mime-info shebangfix \ + xorg USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xi xinerama xrandr xrender USE_GNOME= cairo gdkpixbuf2 gtk20 USE_GL= egl gl USE_LDCONFIG= yes SHEBANG_FILES= utils/pcb_backannotate/lepton-pcb_backannotate \ utils/refdes_renum/lepton-refdes_renum \ utils/symfix/lepton-symfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-guild INSTALL_TARGET= install-strip INFO= lepton-scheme lepton-manual PORTEXAMPLES= examples/* OPTIONS_DEFINE= DOCS EXAMPLES NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls post-patch: ${REINPLACE_CMD} -e \ 's,\$$(docdir)/examples,\$$(datadir)/examples/lepton-eda,' \ ${WRKSRC}/examples/Makefile.in \ ${WRKSRC}/examples/RF_Amp/Makefile.in \ ${WRKSRC}/examples/TwoStageAmp/Makefile.in \ ${WRKSRC}/examples/gTAG/Makefile.in \ ${WRKSRC}/examples/lightning_detector/Makefile.in .include diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile index c78dbb524ee4..f280310e28d7 100644 --- a/devel/autogen/Makefile +++ b/devel/autogen/Makefile @@ -1,40 +1,40 @@ PORTNAME= autogen PORTVERSION= 5.18.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= GNU/autogen/rel${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Tool designed to simplify the creation and maintenance of programs WWW= https://www.gnu.org/software/autogen/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${RUN_DEPENDS} \ gmktemp:sysutils/coreutils -LIB_DEPENDS= libguile-2.2.so:lang/guile2 RUN_DEPENDS= bash:shells/bash -USES= gmake gnome libtool pathfix perl5 pkgconfig shebangfix tar:xz +USES= gmake gnome guile:2.2 libtool pathfix perl5 pkgconfig \ + shebangfix tar:xz USE_GNOME= libxml2 USE_PERL5= build BINARY_ALIAS= mktemp=gmktemp CONFIGURE_ARGS= --datadir=${PREFIX}/share \ --disable-dependency-tracking \ --with-libguile=yes --with-libxml2=yes CONFIGURE_ENV= CONFIG_SHELL=${LOCALBASE}/bin/bash GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes INFO= autogen # bin/columns CONFLICTS_INSTALL= columns SHEBANG_FILES= autoopts/tpl/*.pl .include diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index abf5e8fc46f8..5052aa79e9ff 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,31 +1,32 @@ PORTNAME= g-wrap DISTVERSION= 1.9.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SAVANNAH MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Tool for generating function wrappers for Guile WWW= https://www.nongnu.org/g-wrap/ LICENSE= LGPL21+ -LIB_DEPENDS= libffi.so:devel/libffi \ - libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded -BUILD_DEPENDS= guile2>=2.2:lang/guile2 +LIB_DEPENDS+= libffi.so:devel/libffi -USES= gmake gnome libtool pkgconfig +USES= gmake gnome guile:2.2 libtool pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-Werror -INFO= g-wrap - +MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= install-strip -MAKE_JOBS_UNSAFE=yes +INFO= g-wrap + +# DO NOT try and add rules here to strip .go files, no matter how loudly +# testport / stage-qa shouts at you about it, because .go files (which are +# compiled bytecode) are not intended to be stripped and doing so causes +# breakage at run time. .include diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist index 49c82e32d9e3..3de50a57a934 100644 --- a/devel/g-wrap/pkg-plist +++ b/devel/g-wrap/pkg-plist @@ -1,45 +1,45 @@ bin/g-wrap-config include/g-wrap-wct.h include/g-wrap/core-runtime.h include/g-wrap/ffi-support.h include/g-wrap/guile-compatibility.h include/g-wrap/guile-runtime.h include/g-wrap/guile-wct.h lib/g-wrap/modules/libgw-guile-gw-glib.a lib/g-wrap/modules/libgw-guile-gw-glib.so lib/g-wrap/modules/libgw-guile-gw-glib.so.0 lib/g-wrap/modules/libgw-guile-gw-glib.so.0.0.0 lib/g-wrap/modules/libgw-guile-standard.a lib/g-wrap/modules/libgw-guile-standard.so lib/g-wrap/modules/libgw-guile-standard.so.0 lib/g-wrap/modules/libgw-guile-standard.so.0.0.0 lib/libgwrap-core-runtime.a lib/libgwrap-core-runtime.so lib/libgwrap-core-runtime.so.2 lib/libgwrap-core-runtime.so.2.0.0 lib/libgwrap-guile-runtime.a lib/libgwrap-guile-runtime.so lib/libgwrap-guile-runtime.so.2 lib/libgwrap-guile-runtime.so.2.0.0 libdata/pkgconfig/g-wrap-2.0-guile.pc man/man1/g-wrap-config.1.gz share/aclocal/g-wrap.m4 -share/guile/site/g-wrap.scm -share/guile/site/g-wrap/c-codegen.scm -share/guile/site/g-wrap/c-types.scm -share/guile/site/g-wrap/compat.scm -share/guile/site/g-wrap/config.scm -share/guile/site/g-wrap/enumeration.scm -share/guile/site/g-wrap/guile.scm -share/guile/site/g-wrap/guile/ws/standard.scm -share/guile/site/g-wrap/gw-glib-spec.scm -share/guile/site/g-wrap/gw-glib.scm -share/guile/site/g-wrap/gw-standard-spec.scm -share/guile/site/g-wrap/gw-wct-spec.scm -share/guile/site/g-wrap/gw-wct.scm -share/guile/site/g-wrap/gw/standard.scm -share/guile/site/g-wrap/rti.scm -share/guile/site/g-wrap/scm-codegen.scm -share/guile/site/g-wrap/simple-type.scm -share/guile/site/g-wrap/util.scm -share/guile/site/g-wrap/ws/standard.scm +%%GUILE_GLOBAL_SITE%%/g-wrap.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/c-codegen.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/c-types.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/compat.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/config.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/enumeration.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/guile.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/guile/ws/standard.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw-glib-spec.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw-glib.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw-standard-spec.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw-wct-spec.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw-wct.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/gw/standard.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/rti.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/scm-codegen.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/simple-type.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/util.scm +%%GUILE_GLOBAL_SITE%%/g-wrap/ws/standard.scm diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index af9ffb8a9eb3..378ed1e197ca 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,185 +1,190 @@ PORTNAME= gdb DISTVERSION= 13.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= pizzamig@FreeBSD.org COMMENT= GNU Project Debugger WWW= https://www.gnu.org/software/gdb/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING3 LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libzstd.so:archivers/zstd TEST_DEPENDS= runtest:misc/dejagnu USES= compiler:c++11-lang cpe gmake libtool makeinfo pkgconfig tar:xz USE_PYTHON= flavors py3kplist TEST_TARGET= check CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${DISTVERSION:S/.//g} \ --enable-targets=all --enable-64-bit-bfd \ --with-separate-debug-dir=/usr/lib/debug \ ${ICONV_CONFIGURE_ARG} \ --without-libunwind-ia64 --with-system-zlib CONFIGURE_OUTSOURCE= yes CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT EXCLUDE= dejagnu expect sim texinfo intl EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} EXTRA_PATCHES= ${FILESDIR}/commit-a980a7d24b9 EXTRA_PATCHES+= ${FILESDIR}/commit-ae61525fcf4 VER= ${DISTVERSION:S/.//g} PLIST_SUB= VER=${VER} OPTIONS_DEFINE= GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT \ TUI XXHASH OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT \ TUI XXHASH OPTIONS_DEFAULT+= PORT_READLINE PORT_ICONV SYSTEM_ZLIB OPTIONS_SINGLE= READLINE ICONV ZLIB OPTIONS_SINGLE_READLINE= BUNDLED_READLINE PORT_READLINE OPTIONS_SINGLE_ICONV= PORT_ICONV SYSTEM_ICONV OPTIONS_SINGLE_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink KGDB_DESC= Kernel debugging support BUNDLED_READLINE_DESC= from gdb distfile BUNDLED_ZLIB_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port PORT_ICONV_DESC= use libiconv, with wider charset support SOURCE_HIGHLIGHT_DESC= Syntax highlighting support SYSTEM_ICONV_DESC= use libc iconv, with no wchar support SYSTEM_ZLIB_DESC= use system zlib TUI_DESC= Text User Interface support XXHASH_DESC= Use xxHash for hashing (faster) OPTIONS_SUB= yes BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline -GUILE_CONFIGURE_WITH= guile -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 +GUILE_CONFIGURE_WITH= guile=guile-${GUILE_VER} +GUILE_USES= guile:2.2,3.0 NLS_USES= gettext-runtime PORT_READLINE_USES= readline PORT_ICONV_USES= iconv:wchar_t PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD} PYTHON_CONFIGURE_OFF= --without-python PYTHON_USES= python SOURCE_HIGHLIGHT_CONFIGURE_ENABLE= source-highlight SOURCE_HIGHLIGHT_LIB_DEPENDS= \ libsource-highlight.so:textproc/source-highlight SYSTEM_ICONV_USES= iconv SYSTEM_ZLIB_WITH= system-zlib TUI_CONFIGURE_ENABLE= tui XXHASH_CONFIGURE_OFF= --with-xxhash=no XXHASH_LIB_DEPENDS= libxxhash.so:devel/xxhash .include .if ${PORT_OPTIONS:MPYTHON} .if ${PYTHON_VER} != ${PYTHON_DEFAULT} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} .endif .endif .if ${PORT_OPTIONS:MPYTHON} && \ (exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)) USE_GITHUB= nodefault GH_ACCOUNT= bsdjhb:libcxx GH_PROJECT= libcxx-gdbpy:libcxx GH_TAGNAME= 03d0d9b:libcxx # Workaround USE_GITHUB preventing the default DISTFILES DISTFILES= ${DISTNAME}${EXTRACT_SUFX} .if exists(/usr/lib/libc++.so.1) LIBCXX_DIR= /usr/lib .else LIBCXX_DIR= /lib .endif PLIST_SUB+= LIBCXX_DIR="${LIBCXX_DIR}" PLIST_SUB+= LIBCXX="" .else PLIST_SUB+= LIBCXX="@comment " .endif .if ! ${PORT_OPTIONS:MBUNDLED_ZLIB} EXCLUDE+= zlib .endif .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif post-patch: @${REINPLACE_CMD} -e 's|$$| [GDB v${DISTVERSION} for FreeBSD]|' \ ${WRKSRC}/gdb/version.in post-patch-KGDB-on: @${CP} -r ${FILESDIR}/kgdb/*.[ch] ${WRKSRC}/gdb/ @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-kgdb do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gdb/gdb \ ${STAGEDIR}${PREFIX}/bin/gdb${VER} ${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1 (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls ) do-install-KGDB-on: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gdb/kgdb \ ${STAGEDIR}${PREFIX}/bin/kgdb${VER} ${INSTALL_MAN} ${FILESDIR}/kgdb/kgdb.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/kgdb${VER}.1 do-install-TUI-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER} do-install-GDB_LINK-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb ${LN} -sf gdb${VER}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb.1 .if ${PORT_OPTIONS:MKGDB} ${LN} -sf kgdb${VER} ${STAGEDIR}${PREFIX}/bin/kgdb ${LN} -sf kgdb${VER}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/kgdb.1 .endif do-install-PYTHON-on: (cd ${INSTALL_WRKSRC}/gdb ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) @(cd ${STAGEDIR}${PREFIX}/share/gdb/python && \ ${PYTHON_CMD} -m compileall .) . for f in gdb gdb/command gdb/function gdb/printer @(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* ) . endfor .if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1) @(cd ${WRKSRC_libcxx} ; \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \ LIBCXX_DIR="${LIBCXX_DIR}" install ) @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \ ${PYTHON_CMD} -m compileall .) @(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \ ${PYTHON_CMD} -m compileall .) .endif +# DO NOT try and add rules here to strip .go files, no matter how loudly +# testport / stage-qa shouts at you about it, because .go files (which are +# compiled bytecode) are not intended to be stripped and doing so causes +# breakage at run time. + do-install-GUILE-on: (cd ${INSTALL_WRKSRC}/gdb ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) (cd ${INSTALL_WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) .include diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile index 8f89bea2a8ee..3172205d09e6 100644 --- a/devel/guile-lib/Makefile +++ b/devel/guile-lib/Makefile @@ -1,23 +1,35 @@ PORTNAME= guile-lib PORTVERSION= 0.2.7 +PORTREVISION= 1 CATEGORIES= devel scheme MASTER_SITES= SAVANNAH +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Repository of useful code written in Guile Scheme WWW= https://www.nongnu.org/guile-lib/ LICENSE= LGPL3 GPLv3 LICENSE_COMB= multi -BUILD_DEPENDS= guile2>=2.0.12:lang/guile2 -LIB_DEPENDS= libguile-2.2.so:lang/guile2 - -USES= gmake pkgconfig - +USES= guile:2.2,3.0,flavors,build,run \ + gmake pkgconfig GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-guile-site + TEST_TARGET= check INFO= guile-library +INFO_PATH= ${GUILE_INFO_PATH} + +# DO NOT try and add rules here to strip .go files, no matter how loudly +# testport / stage-qa shouts at you about it, because .go files (which are +# compiled bytecode) are not intended to be stripped and doing so causes +# breakage at run time. + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/${GUILE_PKGCONFIG_DIR} + ${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/*.pc \ + ${STAGEDIR}${PREFIX}/${GUILE_PKGCONFIG_DIR}/ .include diff --git a/devel/guile-lib/files/patch-configure b/devel/guile-lib/files/patch-configure new file mode 100644 index 000000000000..b7be6449e266 --- /dev/null +++ b/devel/guile-lib/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2023-05-20 13:27:01 UTC ++++ configure +@@ -4950,7 +4950,7 @@ fi + + + if test "x$guile_site" = "xyes"; then +- SITEDIR="$GUILE_GLOBAL_SITE"; ++ SITEDIR="$GUILE_SITE"; + SITECCACHEDIR="$GUILE_SITE_CCACHE"; + else + SITEDIR="$datadir/guile-lib"; diff --git a/devel/guile-lib/pkg-plist b/devel/guile-lib/pkg-plist index 17e390e3b663..dd9216a5782b 100644 --- a/devel/guile-lib/pkg-plist +++ b/devel/guile-lib/pkg-plist @@ -1,61 +1,61 @@ -lib/guile-lib/guile/2.2/site-ccache/apicheck.go -lib/guile-lib/guile/2.2/site-ccache/compat/guile-2.go -lib/guile-lib/guile/2.2/site-ccache/config/load.go -lib/guile-lib/guile/2.2/site-ccache/container/async-queue.go -lib/guile-lib/guile/2.2/site-ccache/container/delay-tree.go -lib/guile-lib/guile/2.2/site-ccache/container/nodal-tree.go -lib/guile-lib/guile/2.2/site-ccache/debugging/assert.go -lib/guile-lib/guile/2.2/site-ccache/debugging/time.go -lib/guile-lib/guile/2.2/site-ccache/graph/topological-sort.go -lib/guile-lib/guile/2.2/site-ccache/htmlprag.go -lib/guile-lib/guile/2.2/site-ccache/io/string.go -lib/guile-lib/guile/2.2/site-ccache/logging/logger.go -lib/guile-lib/guile/2.2/site-ccache/logging/port-log.go -lib/guile-lib/guile/2.2/site-ccache/logging/rotating-log.go -lib/guile-lib/guile/2.2/site-ccache/match-bind.go -lib/guile-lib/guile/2.2/site-ccache/math/minima.go -lib/guile-lib/guile/2.2/site-ccache/math/primes.go -lib/guile-lib/guile/2.2/site-ccache/md5.go -lib/guile-lib/guile/2.2/site-ccache/os/process.go -lib/guile-lib/guile/2.2/site-ccache/scheme/documentation.go -lib/guile-lib/guile/2.2/site-ccache/scheme/kwargs.go -lib/guile-lib/guile/2.2/site-ccache/search/basic.go -lib/guile-lib/guile/2.2/site-ccache/string/completion.go -lib/guile-lib/guile/2.2/site-ccache/string/soundex.go -lib/guile-lib/guile/2.2/site-ccache/string/transform.go -lib/guile-lib/guile/2.2/site-ccache/string/wrap.go -lib/guile-lib/guile/2.2/site-ccache/term/ansi-color.go -lib/guile-lib/guile/2.2/site-ccache/texinfo/nodal-tree.go -lib/guile-lib/guile/2.2/site-ccache/text/parse-lalr.go -lib/guile-lib/guile/2.2/site-ccache/unit-test.go -libdata/pkgconfig/guile-lib-1.0.pc -%%DATADIR%%/apicheck.scm -%%DATADIR%%/compat/guile-2.scm -%%DATADIR%%/config/load.scm -%%DATADIR%%/container/async-queue.scm -%%DATADIR%%/container/delay-tree.scm -%%DATADIR%%/container/nodal-tree.scm -%%DATADIR%%/debugging/assert.scm -%%DATADIR%%/debugging/time.scm -%%DATADIR%%/graph/topological-sort.scm -%%DATADIR%%/htmlprag.scm -%%DATADIR%%/io/string.scm -%%DATADIR%%/logging/logger.scm -%%DATADIR%%/logging/port-log.scm -%%DATADIR%%/logging/rotating-log.scm -%%DATADIR%%/match-bind.scm -%%DATADIR%%/math/minima.scm -%%DATADIR%%/math/primes.scm -%%DATADIR%%/md5.scm -%%DATADIR%%/os/process.scm -%%DATADIR%%/scheme/documentation.scm -%%DATADIR%%/scheme/kwargs.scm -%%DATADIR%%/search/basic.scm -%%DATADIR%%/string/completion.scm -%%DATADIR%%/string/soundex.scm -%%DATADIR%%/string/transform.scm -%%DATADIR%%/string/wrap.scm -%%DATADIR%%/term/ansi-color.scm -%%DATADIR%%/texinfo/nodal-tree.scm -%%DATADIR%%/text/parse-lalr.scm -%%DATADIR%%/unit-test.scm +%%GUILE_SITE_CCACHE%%/apicheck.go +%%GUILE_SITE_CCACHE%%/compat/guile-2.go +%%GUILE_SITE_CCACHE%%/config/load.go +%%GUILE_SITE_CCACHE%%/container/async-queue.go +%%GUILE_SITE_CCACHE%%/container/delay-tree.go +%%GUILE_SITE_CCACHE%%/container/nodal-tree.go +%%GUILE_SITE_CCACHE%%/debugging/assert.go +%%GUILE_SITE_CCACHE%%/debugging/time.go +%%GUILE_SITE_CCACHE%%/graph/topological-sort.go +%%GUILE_SITE_CCACHE%%/htmlprag.go +%%GUILE_SITE_CCACHE%%/io/string.go +%%GUILE_SITE_CCACHE%%/logging/logger.go +%%GUILE_SITE_CCACHE%%/logging/port-log.go +%%GUILE_SITE_CCACHE%%/logging/rotating-log.go +%%GUILE_SITE_CCACHE%%/match-bind.go +%%GUILE_SITE_CCACHE%%/math/minima.go +%%GUILE_SITE_CCACHE%%/math/primes.go +%%GUILE_SITE_CCACHE%%/md5.go +%%GUILE_SITE_CCACHE%%/os/process.go +%%GUILE_SITE_CCACHE%%/scheme/documentation.go +%%GUILE_SITE_CCACHE%%/scheme/kwargs.go +%%GUILE_SITE_CCACHE%%/search/basic.go +%%GUILE_SITE_CCACHE%%/string/completion.go +%%GUILE_SITE_CCACHE%%/string/soundex.go +%%GUILE_SITE_CCACHE%%/string/transform.go +%%GUILE_SITE_CCACHE%%/string/wrap.go +%%GUILE_SITE_CCACHE%%/term/ansi-color.go +%%GUILE_SITE_CCACHE%%/texinfo/nodal-tree.go +%%GUILE_SITE_CCACHE%%/text/parse-lalr.go +%%GUILE_SITE_CCACHE%%/unit-test.go +%%GUILE_PKGCONFIG_DIR%%/guile-lib-1.0.pc +%%GUILE_SITE%%/apicheck.scm +%%GUILE_SITE%%/compat/guile-2.scm +%%GUILE_SITE%%/config/load.scm +%%GUILE_SITE%%/container/async-queue.scm +%%GUILE_SITE%%/container/delay-tree.scm +%%GUILE_SITE%%/container/nodal-tree.scm +%%GUILE_SITE%%/debugging/assert.scm +%%GUILE_SITE%%/debugging/time.scm +%%GUILE_SITE%%/graph/topological-sort.scm +%%GUILE_SITE%%/htmlprag.scm +%%GUILE_SITE%%/io/string.scm +%%GUILE_SITE%%/logging/logger.scm +%%GUILE_SITE%%/logging/port-log.scm +%%GUILE_SITE%%/logging/rotating-log.scm +%%GUILE_SITE%%/match-bind.scm +%%GUILE_SITE%%/math/minima.scm +%%GUILE_SITE%%/math/primes.scm +%%GUILE_SITE%%/md5.scm +%%GUILE_SITE%%/os/process.scm +%%GUILE_SITE%%/scheme/documentation.scm +%%GUILE_SITE%%/scheme/kwargs.scm +%%GUILE_SITE%%/search/basic.scm +%%GUILE_SITE%%/string/completion.scm +%%GUILE_SITE%%/string/soundex.scm +%%GUILE_SITE%%/string/transform.scm +%%GUILE_SITE%%/string/wrap.scm +%%GUILE_SITE%%/term/ansi-color.scm +%%GUILE_SITE%%/texinfo/nodal-tree.scm +%%GUILE_SITE%%/text/parse-lalr.scm +%%GUILE_SITE%%/unit-test.scm diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile index 910612e39771..f318e7a14058 100644 --- a/devel/libmatheval/Makefile +++ b/devel/libmatheval/Makefile @@ -1,28 +1,29 @@ PORTNAME= libmatheval PORTVERSION= 1.1.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel math MASTER_SITES= GNU MAINTAINER= demon@FreeBSD.org COMMENT= Library to evaluate mathematical functions WWW= https://www.gnu.org/software/libmatheval/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= flex>=2.5.39_1:textproc/flex -LIB_DEPENDS= libguile.so:lang/guile1 -USES= libtool localbase makeinfo pathfix +USES= guile:1.8 libtool localbase makeinfo \ + pathfix GNU_CONFIGURE= yes -CONFIGURE_ENV= LEXLIB=-lfl MAKEINFO="${MAKEINFO} --no-split" +CONFIGURE_ENV= LEXLIB=-lfl MAKEINFO="${MAKEINFO} --no-split" \ + ac_cv_type_scm_t_bits=yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip INFO= libmatheval post-patch: ${RM} ${WRKSRC}/doc/libmatheval.info .include diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile index 6f005cda8b20..4e3a47d818b7 100644 --- a/devel/libruin/Makefile +++ b/devel/libruin/Makefile @@ -1,56 +1,54 @@ PORTNAME= libruin PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel scheme MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= Renderer for User Interfaces in Ncurses WWW= https://www.nongnu.org/libruin/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= mips NOT_FOR_ARCHS_REASON= glib needs GCC (not available for mips) -BUILD_DEPENDS= guile-lib>0:devel/guile-lib -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded -RUN_DEPENDS= guile-lib>0:devel/guile-lib +BUILD_DEPENDS= guile-lib-${GUILE_FLAVOR}>0:devel/guile-lib@${GUILE_FLAVOR} +RUN_DEPENDS= guile-lib-${GUILE_FLAVOR}>0:devel/guile-lib@${GUILE_FLAVOR} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gnome libtool ncurses pkgconfig +USES= gnome guile:2.2,alias libtool ncurses pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes INFO= libruin OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= ChangeLog PORTEXAMPLES= css21-conformance-uris.txt ruinview.c post-patch: # XXX: must remove spaces from the PACKAGE_STRING because of this: # http://git.savannah.gnu.org/cgit/guile.git/commit/libguile/guile-snarf.in?id=f775ab3654357fcaad294b95efb0b1c16de1eda8 (yes, it's a bug in the new guile) @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ -e '/^PACKAGE_STRING=/s, ,-,' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,@appendixsubsec,@appendixsec,' \ ${WRKSRC}/doc/fdl.texi post-configure: # Avoid compiling examples, which fails to compile # As the examples needs the library to be already installed ${REINPLACE_CMD} -e '/^SUBDIRS/s,examples,,' ${WRKSRC}/Makefile do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile index 7e276b3463c4..ee08c42cdfda 100644 --- a/editors/texmacs/Makefile +++ b/editors/texmacs/Makefile @@ -1,92 +1,90 @@ PORTNAME= texmacs PORTVERSION= 1.99.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors print MASTER_SITES= http://www.texmacs.org/Download/ftp/tmftp/source/ DISTNAME= TeXmacs-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= WYSIWYG scientific text editor WWW= https://www.texmacs.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_13= assigning to 'bool' from incompatible type 'nullptr_t' BROKEN_FreeBSD_14= assigning to 'bool' from incompatible type 'nullptr_t' -LIB_DEPENDS= libltdl.so:devel/libltdl \ - libguile.so:lang/guile1 \ - libgmp.so:math/gmp RUN_DEPENDS= fig2dev:print/transfig BROKEN_armv6= fails to compile: call to min is ambiguous BROKEN_armv7= fails to compile: call to min is ambiguous -USES= cpe desktop-file-utils gmake iconv localbase pkgconfig python \ - shared-mime-info shebangfix tex xorg +USES= cpe desktop-file-utils gmake guile:1.8,alias iconv \ + localbase pkgconfig python shared-mime-info shebangfix \ + tex xorg USE_TEX= tex:run dvipsk:run USE_XORG= xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-optimize="${CXXFLAGS}" --disable-qt MAKE_ARGS= CP="${CP} -R -f" ALL_TARGET= ${PORTNAME:tu} SHEBANG_FILES= plugins/asymptote/bin/* plugins/dratex/bin/* \ plugins/eukleides/bin/* plugins/feynmf/bin/* \ plugins/mupad/bin/* plugins/texgraph/bin/* \ plugins/xypic/bin/* \ plugins/python/bin/tm_python plugins/sage/bin/tm_sage \ plugins/mathematica/bin/realpath.py DATADIR= ${PREFIX}/share/TeXmacs OPTIONS_DEFINE= ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF SQLITE OPTIONS_DEFAULT=ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF SQLITE OPTIONS_SUB= yes ASPELL_RUN_DEPENDS= aspell:textproc/aspell FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype FREETYPE_CONFIGURE_ENV_OFF= FREETYPE_CFLAGS=" " FREETYPE_LDFLAGS=" " \ ac_cv_header_ft2build_h=no GHOSTSCRIPT_USES= ghostscript:x11 GHOSTSCRIPT_CONFIGURE_ON= --with-gs=yes GHOSTSCRIPT_CONFIGURE_OFF= --with-gs=no IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_CONFIGURE_WITH= imlib2 PDF_CONFIGURE_ENABLE= pdf-renderer PDF_LDFLAGS= -lz PDF_IMPLIES= FREETYPE GHOSTSCRIPT SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite3 post-patch: @${REINPLACE_CMD} -e \ '/SVNREV\//s|^|#| ; \ s|LIBS="-liconv"|LIBS="-liconv $$LIBS"| ; \ s|/-liconv}|}| ; \ s|"-Wl,-rpath,"|""| ; \ s|\[\[ |[ |g ; \ s| \]\]| ]|g ; \ s|== no|= no| ; \ s|$${QT_PLUGINS_LIST/,/ }|${QT_PLUGINS_LIST}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e \ '/require/s|"python"|"${PYTHON_CMD:T}"|' \ ${WRKSRC}/plugins/python/progs/init-python.scm @${REINPLACE_CMD} -e \ 's|int tab=.*)|int tab)|' \ ${WRKSRC}/src/Kernel/Types/tree.hpp @${REINPLACE_CMD} -e \ 's|int dpi=.*)|int dpi)|' \ ${WRKSRC}/src/Typeset/boxes.hpp post-install: @${FIND} ${STAGEDIR}${DATADIR} -name "._*" -delete @${FIND} ${STAGEDIR}${DATADIR} -name "*.bak" -delete .for f in realpath texmacs.bin tm_axiom tm_graphviz tm_maple_5 tm_r tm_shell ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/TeXmacs/bin/${f} .endfor .include diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 2bb396adcf90..fc0008d16227 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,100 +1,99 @@ PORTNAME= gnucash PORTVERSION= 5.3 +PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Quicken-like money and finance manager WWW= https://www.gnucash.org/ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual BUILD_DEPENDS= swig:devel/swig \ googletest>0:devel/googletest LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsecret-1.so:security/libsecret \ libsoup-2.4.so:devel/libsoup \ - libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded \ libboost_date_time.so:devel/boost-libs \ libicudata.so:devel/icu\ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ p5-JSON-Parse>=0:devel/p5-JSON-Parse \ p5-Finance-Quote>=0:finance/p5-Finance-Quote \ p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https USES= cmake:insource compiler:c++11-lib cpe desktop-file-utils \ - gettext-tools gnome libtool localbase perl5 pkgconfig \ - shebangfix tar:bzip2 xorg + gettext-tools gnome guile:2.2,3.0,conflicts libtool localbase \ + perl5 pkgconfig shebangfix tar:bzip2 xorg USE_XORG= x11 USE_CXXSTD= c++11 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 libxslt USE_LDCONFIG= yes CMAKE_ARGS= -DCOMPILE_GSCHEMAS=OFF \ -DENABLE_BINRELOC=OFF \ -DGNC_SHELL=/bin/sh SHEBANG_FILES= common/gnc-test-env.pl WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} GLIB_SCHEMAS= org.gnucash.GnuCash.deprecated.gschema.xml \ org.gnucash.GnuCash.dialogs.business.gschema.xml \ org.gnucash.GnuCash.dialogs.checkprinting.gschema.xml \ org.gnucash.GnuCash.dialogs.commodities.gschema.xml \ org.gnucash.GnuCash.dialogs.export.csv.gschema.xml \ org.gnucash.GnuCash.dialogs.gschema.xml \ org.gnucash.GnuCash.dialogs.import.csv.gschema.xml \ org.gnucash.GnuCash.dialogs.import.generic.gschema.xml \ org.gnucash.GnuCash.dialogs.import.qif.gschema.xml \ org.gnucash.GnuCash.dialogs.reconcile.gschema.xml \ org.gnucash.GnuCash.dialogs.sxs.gschema.xml \ org.gnucash.GnuCash.dialogs.totd.gschema.xml \ org.gnucash.GnuCash.general.finance-quote.gschema.xml \ org.gnucash.GnuCash.gschema.xml \ org.gnucash.GnuCash.history.gschema.xml \ org.gnucash.GnuCash.warnings.gschema.xml \ org.gnucash.GnuCash.window.pages.account.tree.gschema.xml \ org.gnucash.GnuCash.window.pages.gschema.xml OPTIONS_DEFINE= AQBANKING DATABASE DOCS NLS OFX PYTHON OPTIONS_DEFAULT= AQBANKING OFX AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI) DATABASE_DESC= Enable SQL database backends OFX_DESC= OFX support OPTIONS_SUB= yes AQBANKING_CMAKE_BOOL= WITH_AQBANKING AQBANKING_LIB_DEPENDS= libgwenhywfar.so:devel/gwenhywfar \ libgwengui-gtk3.so:devel/gwenhywfar-gtk3 \ libktoblzcheck.so:finance/ktoblzcheck \ libaqbanking.so:finance/aqbanking AQBANKING_VARS= GLIB_SCHEMAS+="org.gnucash.GnuCash.dialogs.flicker.gschema.xml \ org.gnucash.GnuCash.dialogs.import.hbci.gschema.xml" DATABASE_CMAKE_BOOL= WITH_SQL DATABASE_BUILD_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers DATABASE_LIB_DEPENDS= libdbi.so:databases/libdbi DATABASE_RUN_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers NLS_CMAKE_BOOL_OFF= DISABLE_NLS NLS_USES= gettext-runtime OFX_CMAKE_BOOL= WITH_OFX OFX_LIB_DEPENDS= libofx.so:finance/libofx OFX_VARS= GLIB_SCHEMAS+=org.gnucash.GnuCash.dialogs.import.ofx.gschema.xml PYTHON_CMAKE_BOOL= WITH_PYTHON PYTHON_USES= python post-install-PYTHON-on: @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so .include diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile index 4d9d6eca68d6..18ef19bd325a 100644 --- a/games/aisleriot/Makefile +++ b/games/aisleriot/Makefile @@ -1,41 +1,39 @@ PORTNAME= aisleriot DISTVERSION= 3.22.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of patience games written in guile scheme WWW= https://wiki.gnome.org/Apps/Aisleriot LICENSE= GPLv3 BUILD_DEPENDS= itstool:textproc/itstool \ bash:shells/bash -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libcanberra.so:audio/libcanberra \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libgc-threaded.so:devel/boehm-gc-threaded +LIB_DEPENDS= libcanberra.so:audio/libcanberra \ + libcanberra-gtk3.so:audio/libcanberra-gtk3 CONFLICTS_INSTALL= sol PORTSCOUT= limitw:1,even -USES= desktop-file-utils gettext meson gnome pkgconfig \ - python:build shebangfix xorg +USES= desktop-file-utils gettext meson gnome guile:2.2,3.0 \ + pkgconfig python:build shebangfix xorg USE_GITLAB= yes USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build USE_XORG= x11 GL_SITE= https://gitlab.gnome.org/ GL_ACCOUNT= GNOME GL_TAGNAME= 8a4542d2f44ee1425a56ac7595ed51449ae0290e -MESON_ARGS= -Dtheme_kde=false +MESON_ARGS= -Dtheme_kde=false -Dguile=${GUILE_VER} SHEBANG_FILES= data/icons/meson_updateiconcache.py \ data/meson_desktopfile.py \ src/lib/meson_compileschemas.py \ src/meson_gconf.py GLIB_SCHEMAS= org.gnome.Patience.WindowState.gschema.xml .include diff --git a/games/fmars/Makefile b/games/fmars/Makefile index 29713f90abb2..a016c4fbcb92 100644 --- a/games/fmars/Makefile +++ b/games/fmars/Makefile @@ -1,40 +1,38 @@ PORTNAME= fmars PORTVERSION= 0.0.207 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://corewar.co.uk/janeczek/ MAINTAINER= bofh@FreeBSD.org COMMENT= Fast Memory Array Redcode Simulator WWW= https://corewar.co.uk/janeczek/ LICENSE= GPLv2 -BUILD_DEPENDS= guile:lang/guile1 - -USES= gmake tar:bzip2 +USES= gmake guile:1.8,build,alias tar:bzip2 ALL_TARGET= x${PORTNAME} OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_CFLAGS=-fomit-frame-pointer post-patch: @${REINPLACE_CMD} -e \ 's|^\(CC\) |#\1 | ; \ s|^\(CFLAGS\) |#\1 | ; \ s|^\(OPTS\) |#\1 | ; \ s|gcc -E|$$(CC) -E|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/x${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} "rc rc-test" ${STAGEDIR}${DATADIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include diff --git a/games/gnubik/Makefile b/games/gnubik/Makefile index b66d7e7bea1e..899d0010318a 100644 --- a/games/gnubik/Makefile +++ b/games/gnubik/Makefile @@ -1,41 +1,41 @@ PORTNAME= gnubik PORTVERSION= 2.4.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= GNU MAINTAINER= amdmi3@FreeBSD.org COMMENT= 3D Rubik's cube game WWW= https://www.gnu.org/software/gnubik/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgtkglext-x11-1.0.so:x11-toolkits/gtkglext +LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext GNU_CONFIGURE= yes -USES= compiler:c++11-lang gettext gl gmake gnome localbase pkgconfig +USES= compiler:c++11-lang gettext gl gmake gnome guile:2.2 \ + localbase pkgconfig USE_GNOME= gtk20 USE_GL= gl glu PORTDOCS= AUTHORS ChangeLog NEWS README TODO INFO= gnubik OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ ${WRKSRC}/configure post-install: ${LN} -s ../icons/hicolor/32x32/apps/gnubik.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile index adcb3bfaaaf8..6c5f953506a7 100644 --- a/games/gnurobots/Makefile +++ b/games/gnurobots/Makefile @@ -1,43 +1,41 @@ PORTNAME= gnurobots PORTVERSION= 1.2.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= games MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= GNU diversion wherein Scheme-coded robots explore a world WWW= https://www.gnu.org/software/gnurobots/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile.so:lang/guile1 - -USES= autoreconf gnome localbase:ldflags pkgconfig readline +USES= gnome guile:1.8 localbase:ldflags pkgconfig readline USE_GNOME= vte GNU_CONFIGURE= yes PORTDOCS= * CFLAGS+= -O0 SUB_FILES= pkg-install pkg-message DESKTOP_ENTRIES="GNU Robots" \ "" \ "${PORTNAME}" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" OPTIONS_DEFINE= DOCS post-install: ${INSTALL_DATA} ${WRKSRC}/xpm/robot.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.xpm post-install-DOCS-on: cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog NEWS README THANKS \ doc/Robots-HOWTO doc/contrib" ${STAGEDIR}${DOCSDIR} .include diff --git a/games/gnurobots/files/patch-configure b/games/gnurobots/files/patch-configure new file mode 100644 index 000000000000..d7e302ce51a8 --- /dev/null +++ b/games/gnurobots/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2023-05-25 19:00:18 UTC ++++ configure +@@ -5773,7 +5773,7 @@ _ACEOF + fi + + +-CFLAGS="-pedantic-errors -Werror -Wall -g" ++ + + ac_config_files="$ac_config_files Makefile contrib/Makefile doc/Makefile include/Makefile xpm/Makefile maps/Makefile scheme/Makefile src/Makefile" + diff --git a/games/gnurobots/files/patch-configure.ac b/games/gnurobots/files/patch-configure.ac deleted file mode 100644 index 4461820cfa5b..000000000000 --- a/games/gnurobots/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2008-08-03 19:48:45 UTC -+++ configure.ac -@@ -91,8 +91,6 @@ You need guile 1.8 to build this program. - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - --CFLAGS="-pedantic-errors -Werror -Wall -g" -- - dnl Done. - AC_CONFIG_FILES([Makefile - contrib/Makefile diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 5a5768146fee..020dbbb5ec6a 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -1,38 +1,36 @@ PORTNAME= trackballs PORTVERSION= 1.3.4 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= games MAINTAINER= martymac@FreeBSD.org COMMENT= SDL-based Marble Madness clone WWW= https://trackballs.github.io/ LICENSE= GPLv2+ ETHYMONICS LICENSE_COMB= multi -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc.so:devel/boehm-gc - -USES= cmake desktop-file-utils gettext-runtime gl gnome pkgconfig sdl +USES= cmake desktop-file-utils gettext-runtime gl gnome \ + guile:2.2,conflicts pkgconfig sdl USE_GL= gl USE_SDL= image2 mixer2 sdl2 ttf2 LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_ETHYMONICS= ${WRKSRC}/share/music/README LICENSE_NAME_ETHYMONICS= Ethymonics Free Music License LICENSE_PERMS_ETHYMONICS= dist-mirror dist-sell pkg-mirror pkg-sell \ auto-accept USE_GITHUB= yes CMAKE_ARGS+= -DTRACKBALLS_DOC_DIR=${DOCSDIR} \ -DTRACKBALLS_MAN_DIR=${PREFIX}/share/man OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes NLS_USES= gettext-tools NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index b6590dc9d106..dd7d1e81eb40 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,268 +1,267 @@ PORTNAME= graphviz PORTVERSION= 7.1.0 PORTREVISION= 7 CATEGORIES= graphics tk MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/ MAINTAINER= dinoex@FreeBSD.org COMMENT= Graph Visualization Software from AT&T and Bell Labs WWW= https://www.graphviz.org/ LICENSE= EPL LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION} LIB_DEPENDS= libltdl.so:devel/libltdl \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libexpat.so:textproc/expat2 \ libharfbuzz.so:print/harfbuzz \ libgd.so:${GD_PORT} USES= compiler:c++11-lang cpe pathfix shebangfix gmake bison \ pkgconfig libtool:keepla autoreconf localbase:ldflags jpeg \ tcl:build GNU_CONFIGURE= yes # sincos is broken on armv6, see ports/220591 CFLAGS_armv6= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \ -fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \ -fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl CFLAGS_armv7= -fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \ -fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \ -fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl MAKE_ENV= EXPR_COMPAT=yes CONFLICTS_INSTALL= ghmm INSTALL_TARGET= install-strip USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB= PORTVERSION="${PORTVERSION}" FIX_INCLUDE= lib/cdt/dthdr.h lib/pathplan/tri.h \ lib/pathplan/pathutil.h lib/pathplan/solvers.h \ lib/pathplan/vis.h lib/pathplan/vispath.h \ lib/common/globals.h lib/gvc/gvcint.h FIX_TCL_SCRIPT= tclpkg/gdtclft/demo/entities.tcl \ tclpkg/tcldot/demo/gcat.tcl FIX_TK_SCRIPT= tclpkg/tcldot/demo/doted.tcl \ tclpkg/tclpathplan/demo/pathplan.tcl OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \ ANN GTS GTK2 GDK GDK_PIXBUF SMYRNA DEVIL \ GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE GO \ NVTHREADS DOCS EXAMPLES OPTIONS_DEFAULT=XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes DIGCOLA_DESC= neato layout engine with DIGCOLA features IPSEPCOLA_DESC= neato layout engine with IPSEPCOLA features PANGOCAIRO_DESC=pangocairo support POPPLER_DESC= PDF and PS file support via poppler (requires PANGOCAIRO) ANN_DESC= ANN edge bundling support GTS_DESC= GNU Triangulated Surface Library support GTK2_DESC= gtk2 plugin (requires PANGOCAIRO) GDK_DESC= gdk library support (requires GTK2) GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK) SMYRNA_DESC= SMYRNA graph viewer (requires GTK2) DEVIL_DESC= devil plugin GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO) PERL_DESC= Perl bindings (swig) PHP_DESC= PHP bindings (swig) PYTHON_DESC= Python bindings (swig) RUBY_DESC= Ruby bindings (swig) LUA_DESC= Lua bindings (swig) TCL_DESC= TCL bindings (swig) GUILE_DESC= Guile bindings (swig) GO_DESC= Go bindings (swig) TK_DESC= TK toolkit support NVTHREADS_DESC= Link with threads (needed for nvidia) XPM_USES= xorg XPM_USE= XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp ICONV_USES= iconv NLS_USES= gettext PANGOCAIRO_USES=gnome xorg PANGOCAIRO_USE= GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp GTK2_USES= gnome xorg GTK2_USE= XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20 SMYRNA_USES= gnome gl SMYRNA_USE= GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl PERL_USES= perl5 PHP_USES= php:build gnome PHP_USE= GNOME=libxml2 PHP_BROKEN= needs swig 4.2.0 PYTHON_USES= python:build RUBY_USES= ruby LUA_USES= lua TK_USES= tk:build GO_USES= go:no_targets DOCS_USES= groff POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib ANN_LIB_DEPENDS= libann.so:math/ann GTS_LIB_DEPENDS= libgts.so:graphics/gts SMYRNA_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \ libgtkglext-x11-1.0.so:x11-toolkits/gtkglext DEVIL_LIB_DEPENDS= libIL.so:graphics/devil -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded +GUILE_USES= guile:2.2 PHP_LIB_DEPENDS= libpcre.so:devel/pcre \ libargon2.so:security/libargon2 XPM_CONFIGURE_WITH= x XPM_CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no DIGCOLA_CONFIGURE_WITH= digcola IPSEPCOLA_CONFIGURE_WITH= ipsepcola IPSEPCOLA_IMPLIES= DIGCOLA NLS_CONFIGURE_ENABLE= nls PANGOCAIRO_CONFIGURE_WITH= pangocairo POPPLER_CONFIGURE_WITH= poppler POPPLER_IMPLIES= PANGOCAIRO ANN_CONFIGURE_WITH= ann ANN_CONFIGURE_ENV= ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann GTS_CONFIGURE_WITH= gts GTK2_CONFIGURE_WITH= gtk GTK2_IMPLIES= PANGOCAIRO GDK_CONFIGURE_WITH= gdk GDK_PIXBUF_CONFIGURE_WITH= gdk-pixbuf GDK_PIXBUF_IMPLIES= GTK2 GDK SMYRNA_CONFIGURE_OFF= --with-glut=no SMYRNA_CONFIGURE_WITH= smyrna glade gtkgl gtkglext SMYRNA_IMPLIES= GTK2 GTS DEVIL_CONFIGURE_WITH= devil GHOSTSCRIPT_CONFIGURE_OFF= --with-ghostscript=no GHOSTSCRIPT_IMPLIES= PANGOCAIRO PERL_CONFIGURE_ENABLE= perl PERL_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.pl PHP_CONFIGURE_ENABLE= php PHP_CPPFLAGS= -I${LOCALBASE}/include/php/Zend PHP_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.php PYTHON_CONFIGURE_ENABLE= python3 PYTHON_LDFLAGS= "-L${PYTHONBASE}/lib" PYTHON_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.py PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" RUBY_CONFIGURE_ENABLE= ruby RUBY_CONFIGURE_ENV= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ RUBY_CFLAGS="${RUBY_CFLAGS}" \ RUBY_LDFLAGS="${RUBY_LDFLAGS}" \ RUBY_INSTALL_DIR="${RUBY_SITEARCHLIBDIR}" RUBY_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.rb LUA_CONFIGURE_ENABLE= lua LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} -lm LUA_CONFIGURE_ENV= LUA="${LUA_BINDIR}/lua" \ LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER} LUA_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.lua TCL_CONFIGURE_ENABLE= tcl TCL_CPPFLAGS= -I${TCL_INCLUDEDIR} TCL_CONFIGURE_ENV= TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh" TCL_VARS= SHEBANG_FILES+=tclpkg/gv/demo/modgraph.tcl \ PLIST_SUB+=TCL_VER="${TCL_VER}" TK_CPPFLAGS= -I${TK_INCLUDEDIR} TK_CONFIGURE_ON= --with-wish=${WISH} TK_CONFIGURE_ENV= TKCONFIG="${TK_LIBDIR}/tkConfig.sh" TK_IMPLIES= TCL GUILE_CONFIGURE_ENABLE= guile GO_CONFIGURE_ENABLE= go NVTHREADS_LDFLAGS= -lpthread .include # allow the use localized gd ports in Makefile.local or slave ports. GD_PORT?= graphics/gd CONFIGURE_ARGS+= --program-transform-name="s/x/x/" \ --enable-dependency-tracking \ --enable-r=no \ --with-demos="${EXAMPLESDIR}" \ --with-freetype2=yes \ --with-libgd \ --with-webp \ --with-fontconfigincludedir=${LOCALBASE}/include \ --with-fontconfiglibdir=${LOCALBASE}/lib \ --with-tclsh=${TCLSH} \ --without-rsvg \ --with-qt=no \ --disable-io --disable-ocaml --disable-java \ --disable-python2 \ --disable-sharp .if ${PORT_OPTIONS:MPYTHON} BINARY_ALIAS+= python3=${PYTHON_CMD} .endif .if ${PORT_OPTIONS:MRUBY} RUBY_CFLAGS+= -I "${LOCALBASE}/include/ruby-${RUBY_VER}/" \ -I "${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" .if exists(${LOCALBASE}/bin/ruby${RUBY_SHLIBVER}) RUBY_LIBS!= ${LOCALBASE}/bin/ruby${RUBY_SHLIBVER} \ -r rbconfig -e "print RbConfig::CONFIG[ 'LIBS' ]" RUBY_LDFLAGS+= ${RUBY_LIBS} .endif .endif .if ${PORT_OPTIONS:MICONV} CONFIGURE_ARGS+= --with-iconvlibdir=${ICONV_PREFIX}/lib CONFIGURE_ARGS+= --with-iconvincludedir=${ICONV_PREFIX}/include .else CONFIGURE_ARGS+= --without-libiconv-prefix .endif .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \ ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \ ${PORT_OPTIONS:MGUILE} || ${PORT_OPTIONS:MGO} BUILD_DEPENDS+= swig:devel/swig RUN_DEPENDS+= swig:devel/swig CONFIGURE_ARGS+= --enable-swig CONFIGURE_ENV+= SWIG="${LOCALBASE}/bin/swig" .else CONFIGURE_ARGS+= --disable-swig CONFIGURE_ENV+= SWIG="/nonexistent" .endif .if ${PORT_OPTIONS:MGHOSTSCRIPT} USES_GHOSTSCRIPT_ARGS+= lib .endif .if ${PORT_OPTIONS:MDOCS} USES_GHOSTSCRIPT_ARGS+= build .endif .if defined(USES_GHOSTSCRIPT_ARGS) USES+= ghostscript:${USES_GHOSTSCRIPT_ARGS:ts,} .endif .include post-patch: ${REINPLACE_CMD} \ -e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \ -e 's|LUA_INSTALL_DIR=.*|LUA_INSTALL_DIR="${LUA_MODLIBDIR}"|' \ -e 's| vendorarchdir| sitearchdir|' \ ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \ ${WRKSRC}/cmd/smyrna/tvnodes.h ${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \ ${WRKSRC}/lib/sfio/*.[ch] cd ${WRKSRC} && ${REINPLACE_CMD} \ -e 's|exec tclsh |exec tclsh${TCL_VER} |' ${FIX_TCL_SCRIPT} cd ${WRKSRC} && ${REINPLACE_CMD} \ -e 's|exec wish |exec wish${TCL_VER} |' ${FIX_TK_SCRIPT} pre-configure-DOCS-off: ${REINPLACE_CMD} -e 's| doc | |' ${WRKSRC}/Makefile.am ${FIND} ${WRKSRC} -name Makefile.am | \ ${XARGS} ${REINPLACE_CMD} \ -e 's|^pdf_DATA|#pdf_DATA|'; pre-install-PHP-on: ${MKDIR} "${STAGEDIR}/${PREFIX}/share/php" post-install: install-ldconfig-file cd ${WRKSRC} && \ ${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/ .include diff --git a/graphics/guile-cairo/Makefile b/graphics/guile-cairo/Makefile index 953e9e185243..cf0b20ab484c 100644 --- a/graphics/guile-cairo/Makefile +++ b/graphics/guile-cairo/Makefile @@ -1,29 +1,54 @@ PORTNAME= guile-cairo -DISTVERSION= 1.11.1 +DISTVERSION= 1.11.2 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SAVANNAH +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Wrapper for using the Cairo graphics library from Guile WWW= https://www.nongnu.org/guile-cairo/ LICENSE= LGPL3+ -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded -BUILD_DEPENDS= guile2>=2.2:lang/guile2 - -USES= gmake gnome libtool pkgconfig -USE_CSTD= c99 +USES= guile:2.2,3.0,flavors,alias \ + autoreconf gettext-tools gmake gnome libtool pkgconfig +guile30_CSTD= c11 +guile22_CSTD= c99 +USE_CSTD= ${${FLAVOR}_CSTD} USE_GNOME= cairo -USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--includedir='$${prefix}/include/guile/${GUILE_VER}' \ + --libdir='$${prefix}/lib/guile/${GUILE_VER}/extensions' -INFO= guile-cairo +MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= install-strip -MAKE_JOBS_UNSAFE=yes +# Upstream has done almost all of the de-conflicting work, but there is +# no release at this time. Include their work as a patch, which also +# covers the code needed by g-golf. + +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-upstream-fixes.patch + +INFO= guile-cairo +INFO_PATH= ${GUILE_INFO_PATH} + +post-patch: + ${REINPLACE_CMD} \ + -e '/^objdir=/s:$$(libdir)/:$$(exec_prefix)/lib/:' \ + ${WRKSRC}/Makefile.am ${WRKSRC}/cairo/Makefile.am + +# DO NOT try and add rules here to strip .go files, no matter how loudly +# testport / stage-qa shouts at you about it, because .go files (which are +# compiled bytecode) are not intended to be stripped and doing so causes +# breakage at run time. + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/${GUILE_PKGCONFIG_DIR} + ${MV} ${STAGEDIR}${PREFIX}/lib/guile/${GUILE_VER}/extensions/pkgconfig/*.pc \ + ${STAGEDIR}${PREFIX}/${GUILE_PKGCONFIG_DIR}/ + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/guile/${GUILE_VER}/extensions/pkgconfig .include diff --git a/graphics/guile-cairo/distinfo b/graphics/guile-cairo/distinfo index 7779144835da..66a1d97a7880 100644 --- a/graphics/guile-cairo/distinfo +++ b/graphics/guile-cairo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590012837 -SHA256 (guile-cairo-1.11.1.tar.gz) = f4f6337eb5c90fc2f5fd2043de6f237ef336da6285ae042b8452379bb22086bd -SIZE (guile-cairo-1.11.1.tar.gz) = 672079 +TIMESTAMP = 1605967018 +SHA256 (guile-cairo-1.11.2.tar.gz) = 6232d4dc2c5bd9d331139b3b01f4343c3e1fb9ca7898361a699206730941a07b +SIZE (guile-cairo-1.11.2.tar.gz) = 674992 diff --git a/graphics/guile-cairo/files/extra-patch-upstream-fixes.patch b/graphics/guile-cairo/files/extra-patch-upstream-fixes.patch new file mode 100644 index 000000000000..94ab3fe7525c --- /dev/null +++ b/graphics/guile-cairo/files/extra-patch-upstream-fixes.patch @@ -0,0 +1,439 @@ +--- Makefile.am ++++ Makefile.am +@@ -28,9 +28,20 @@ ACLOCAL_AMFLAGS = -I m4 + + CLEANFILES = env + +-scmdir=$(prefix)/share/guile/site ++GOBJECTS = $(SOURCES:%.scm=%.go) + +-scm_DATA = cairo.scm ++moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION) ++objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache ++ ++nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) ++nobase_nodist_obj_DATA = $(GOBJECTS) ++ ++GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat ++SUFFIXES = .scm .go ++.scm.go: ++ $(top_builddir)/env $(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" ++ ++SOURCES = cairo.scm + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = guile-cairo.pc +--- README ++++ README +@@ -111,20 +111,7 @@ objects like cairo_font_options_t. + Known bugs + ================== + +-[https://bugs.freedesktop.org/show_bug.cgi?id=30510] Reported by CK Jester-Young +- +-The documentation for cairo-pdf-surface-create specifies the arguments as +-(filename width-in-points height-in-points). In actuality, it's (sx sy +-[filename]), where an unspecified filename means the output is sent to the +-current output port. +- +-This bug hasn't been fixed because of inability to regenerate the +-documentation. Any help in this sense is appreciated. Please have a look at +- +-- doc/README +-- commit 8e73e952f8797159719b770fafecbdcb6f87152c +-- https://lists.gnu.org/archive/html/guile-user/2018-08/msg00117.html +- ++(Yay?!) + + Copying Guile-Cairo + =================== +--- cairo/Makefile.am ++++ cairo/Makefile.am +@@ -15,29 +15,26 @@ + # License along with this program. If not, see + # . + +-all-local: config.scm ++moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/cairo ++objdir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache/cairo + +-lib_builddir = $(shell cd $(top_builddir)/guile-cairo && pwd) +-docs_builddir = $(shell cd $(top_builddir)/doc && pwd) ++SOURCES = config.scm vector-types.scm ++NOCOMP_SOURCES = cairo-procedures.txt + +-moduledir=$(prefix)/share/guile/site/cairo ++GOBJECTS = $(SOURCES:%.scm=%.go) + +-module_DATA = vector-types.scm cairo-procedures.txt ++nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) ++nobase_nodist_obj_DATA = $(GOBJECTS) + +-config.scm: Makefile config.scm.in +- sed -e "s|@cairolibpath\@|$(lib_builddir)/libguile-cairo|" \ +- -e "s|@cairodocumentationpath\@|$(docs_builddir)/cairo-procedures.txt|" \ +- $(srcdir)/config.scm.in > config.scm ++GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat ++SUFFIXES = .scm .go ++.scm.go: ++ $(top_builddir)/env $(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" + +-install-data-local: Makefile config.scm.in +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++config.scm: Makefile config.scm.in + sed -e "s|@cairolibpath\@|$(libdir)/libguile-cairo|" \ +- -e "s|@cairodocumentationpath\@|$(moduledir)/cairo-procedures.txt|" \ +- $(srcdir)/config.scm.in > $(DESTDIR)$(moduledir)/config.scm +- chmod 644 $(DESTDIR)$(moduledir)/config.scm +- +-uninstall-local: +- rm -f $(DESTDIR)$(moduledir)/config.scm ++ -e "s|@cairodocumentationpath\@|$(moddir)/cairo-procedures.txt|" \ ++ $(srcdir)/config.scm.in > config.scm + + cairo-procedures.txt.update: + echo "Generated from upstream documentation; see COPYING.docs for info." \ +@@ -45,6 +42,6 @@ cairo-procedures.txt.update: + $(top_srcdir)/doc/docbook-to-guile-doc $(CAIRO_XML_DIR)/*.xml \ + >> $(srcdir)/cairo-procedures.txt + +-CLEANFILES = config.scm ++CLEANFILES = config.scm $(GOBJECTS) + +-EXTRA_DIST = config.scm.in $(module_DATA) ++EXTRA_DIST = config.scm.in +--- configure.ac ++++ configure.ac +@@ -37,7 +37,7 @@ AM_INIT_AUTOMAKE([1.14 gnu -Wno-portability -Wno-syntax \ + AM_MAINTAINER_MODE([enable]) + AM_SILENT_RULES([yes]) + +-AC_SUBST(VERSION, 1.11.2) ++AC_SUBST(VERSION, 1.12.0) + + AC_ISC_POSIX + AC_PROG_CC +@@ -77,9 +77,15 @@ AC_SUBST(AM_LDFLAGS) + # Check for Guile + # + GUILE_PKG ++GUILE_PROGS + GUILE_FLAGS + AC_SUBST(GUILE_EFFECTIVE_VERSION) + ++if test "$cross_compiling" != no; then ++ GUILE_TARGET="--target=$host_alias" ++ AC_SUBST([GUILE_TARGET]) ++fi ++ + PKG_CHECK_MODULES(CAIRO, cairo >= 1.10.0) + AC_SUBST(CAIRO_LIBS) + AC_SUBST(CAIRO_CFLAGS) +--- guile-cairo/guile-cairo.c ++++ guile-cairo/guile-cairo.c +@@ -1,6 +1,9 @@ + /* guile-cairo + * Copyright (C) 2007, 2011, 2012, 2014, 2018, 2020 Andy Wingo +- * ++ * Copyright (C) 2023 Daniel Llorens ++ * Copyright (C) 2023 Dale Smith ++ * Copyright (C) 2023 David Pirotte ++ + * guile-cairo.c: Cairo for Guile + * + * This library is free software; you can redistribute it and/or modify +@@ -3523,6 +3526,19 @@ cairo_svg_version_to_string (cairo_svg_version_t version); + #endif /* CAIRO_HAS_SVG_SURFACE */ + + ++SCM_DEFINE_PUBLIC (scm_cairo_context2pointer, "cairo-context->pointer", 1, 0, 0, ++ (SCM scr), ++ "") ++{ ++ return scm_from_pointer (scm_to_cairo (scr), NULL); ++} ++ ++SCM_DEFINE_PUBLIC (scm_cairo_pointer2context, "cairo-pointer->context", 1, 0, 0, ++ (SCM scr), ++ "") ++{ ++ return scm_from_cairo ((cairo_t *) scm_to_pointer (scr)); ++} + + void + scm_init_cairo (void) +diff --git m4/guile.m4 m4/guile.m4 +index 57a0868..48642f0 100644 +--- m4/guile.m4 ++++ m4/guile.m4 +@@ -17,7 +17,7 @@ + ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + ## 02110-1301 USA + +-# serial 10 ++# serial 11 + + ## Index + ## ----- +@@ -60,7 +60,10 @@ + # @code{AC_SUBST}. + # + AC_DEFUN([GUILE_PKG], +- [PKG_PROG_PKG_CONFIG ++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ if test "x$PKG_CONFIG" = x; then ++ AC_MSG_ERROR([pkg-config is missing, please install it]) ++ fi + _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" +--- tests/unit-tests/Makefile.am ++++ tests/unit-tests/Makefile.am +@@ -1,5 +1,6 @@ + # guile-cairo + # Copyright (C) 2007,2011 Andy Wingo ++# Copyright (C) 2023 David Pirotte + # + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Lesser General Public License as +@@ -16,7 +17,8 @@ + # . + + TESTS= \ +- api-stability.scm \ ++ context-pointer.scm \ ++ api-stability.scm \ + version.scm + + TESTS_ENVIRONMENT=\ +--- tests/unit-tests/cairo.api ++++ tests/unit-tests/cairo.api +@@ -7,14 +7,22 @@ + cairo-clip-preserve + cairo-close-path + cairo-content-get-values ++ cairo-context->pointer + cairo-copy-clip-rectangle-list + cairo-copy-page + cairo-copy-path + cairo-copy-path-flat + cairo-create + cairo-curve-to ++ cairo-destroy ++ cairo-device-acquire ++ cairo-device-finish ++ cairo-device-flush ++ cairo-device-get-type ++ cairo-device-release + cairo-device-to-user + cairo-device-to-user-distance ++ cairo-device-type-get-values + cairo-extend-get-values + cairo-fill + cairo-fill-extents +@@ -44,6 +52,7 @@ + cairo-font-type-get-values + cairo-font-weight-get-values + cairo-format-get-values ++ cairo-format-stride-for-width + cairo-get-antialias + cairo-get-current-point + cairo-get-dash-count +@@ -67,15 +76,20 @@ + cairo-glyph:index + cairo-glyph:x + cairo-glyph:y ++ cairo-has-current-point + cairo-hint-metrics-get-values + cairo-hint-style-get-values + cairo-identity-matrix + cairo-image-surface-create ++ cairo-image-surface-create-for-data + cairo-image-surface-create-from-png ++ cairo-image-surface-get-data + cairo-image-surface-get-format + cairo-image-surface-get-height + cairo-image-surface-get-stride + cairo-image-surface-get-width ++ cairo-image-surface-set-data ++ cairo-in-clip + cairo-in-fill + cairo-in-stroke + cairo-line-cap-get-values +@@ -86,6 +100,7 @@ + cairo-make-identity-matrix + cairo-make-matrix + cairo-make-rectangle ++ cairo-make-rectangle-int + cairo-make-rotate-matrix + cairo-make-scale-matrix + cairo-make-text-extents +@@ -94,6 +109,8 @@ + cairo-mask-surface + cairo-matrix-invert + cairo-matrix-multiply ++ cairo-matrix-rotate ++ cairo-matrix-scale + cairo-matrix-transform-distance + cairo-matrix-transform-point + cairo-matrix-translate +@@ -104,6 +121,7 @@ + cairo-paint + cairo-paint-with-alpha + cairo-path-data-type-get-values ++ cairo-path-extents + cairo-path-fold + cairo-pattern-add-color-stop-rgb + cairo-pattern-add-color-stop-rgba +@@ -126,22 +144,50 @@ + cairo-pattern-set-filter + cairo-pattern-set-matrix + cairo-pattern-type-get-values ++ cairo-pdf-get-versions ++ cairo-pdf-level-get-values + cairo-pdf-surface-create ++ cairo-pdf-surface-restrict-to-version + cairo-pdf-surface-set-size ++ cairo-pointer->context + cairo-pop-group + cairo-pop-group-to-source ++ cairo-ps-get-levels ++ cairo-ps-level-get-values + cairo-ps-surface-begin-page-setup + cairo-ps-surface-begin-setup + cairo-ps-surface-create + cairo-ps-surface-dsc-comment ++ cairo-ps-surface-get-eps ++ cairo-ps-surface-restrict-to-level ++ cairo-ps-surface-set-eps + cairo-ps-surface-set-size + cairo-push-group + cairo-push-group-with-context ++ cairo-recording-surface-create ++ cairo-recording-surface-ink-extents + cairo-rectangle ++ cairo-rectangle-int:height ++ cairo-rectangle-int:width ++ cairo-rectangle-int:x ++ cairo-rectangle-int:y + cairo-rectangle:height + cairo-rectangle:width + cairo-rectangle:x + cairo-rectangle:y ++ cairo-region-contains-point ++ cairo-region-contains-rectangle ++ cairo-region-copy ++ cairo-region-create ++ cairo-region-get-extents ++ cairo-region-get-rectangles ++ cairo-region-intersect ++ cairo-region-is-empty ++ cairo-region-overlap-get-values ++ cairo-region-subtract ++ cairo-region-translate ++ cairo-region-union ++ cairo-region-xor + cairo-rel-curve-to + cairo-rel-line-to + cairo-rel-move-to +@@ -156,9 +202,11 @@ + cairo-scaled-font-get-font-face + cairo-scaled-font-get-font-matrix + cairo-scaled-font-get-font-options ++ cairo-scaled-font-get-scale_matrix + cairo-scaled-font-get-type + cairo-scaled-font-glyph-extents + cairo-scaled-font-text-extents ++ cairo-scaled-font-text-to-glyphs + cairo-select-font-face + cairo-set-antialias + cairo-set-dash +@@ -182,26 +230,38 @@ + cairo-show-glyphs + cairo-show-page + cairo-show-text ++ cairo-show-text-glyphs ++ cairo-status-get-values + cairo-stroke + cairo-stroke-extents + cairo-stroke-preserve + cairo-subpixel-order-get-values ++ cairo-surface-copy-page ++ cairo-surface-create-for-rectangle + cairo-surface-create-similar ++ cairo-surface-destroy + cairo-surface-finish + cairo-surface-flush + cairo-surface-get-content ++ cairo-surface-get-device + cairo-surface-get-device-offset ++ cairo-surface-get-fallback-resolution + cairo-surface-get-font-options ++ cairo-surface-get-mime-data + cairo-surface-get-type ++ cairo-surface-has-show-text-glyphs + cairo-surface-mark-dirty + cairo-surface-mark-dirty-rectangle + cairo-surface-set-device-offset + cairo-surface-set-fallback-resolution ++ cairo-surface-set-mime-data ++ cairo-surface-show-page + cairo-surface-type-get-values + cairo-surface-write-to-png + cairo-svg-surface-create + cairo-svg-surface-restrict-to-version + cairo-svg-version-get-values ++ cairo-text-cluster-flags-get-values + cairo-text-extents + cairo-text-extents:height + cairo-text-extents:width +@@ -210,8 +270,17 @@ + cairo-text-extents:y-advance + cairo-text-extents:y-bearing + cairo-text-path ++ cairo-toy-font-face-create ++ cairo-toy-font-face-get-family ++ cairo-toy-font-face-get-slant ++ cairo-toy-font-face-get-weight + cairo-transform + cairo-translate ++ cairo-user-font-face-create ++ cairo-user-font-face-set-init-func ++ cairo-user-font-face-set-render-glyph-func ++ cairo-user-font-face-set-text-to-glyphs-func ++ cairo-user-font-face-set-unicode-to-glyph-func + cairo-user-to-device + cairo-user-to-device-distance + cairo-version +--- /dev/null ++++ tests/unit-tests/context-pointer.scm +@@ -0,0 +1,29 @@ ++;; guile-cairo unit test ++;; Copyright (C) 2023 David Pirotte ++ ++;; This program is free software; you can redistribute it and/or modify ++;; it under the terms of the GNU General Public License as published by ++;; the Free Software Foundation; either version 3 of the License, or (at ++;; your option) any later version. ++;; ++;; This program is distributed in the hope that it will be useful, but ++;; WITHOUT ANY WARRANTY; without even the implied warranty of ++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++;; General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with this program; if not, see . ++ ++(use-modules (unit-test) ++ (oop goops) ++ (cairo)) ++ ++(define-class ()) ++ ++(define-method (test-context-pointer (self )) ++ (let* ((cs (cairo-image-surface-create 'argb32 140 100)) ++ (cr (cairo-create cs))) ++ (assert (cairo-context->pointer cr)) ++ (assert (cairo-pointer->context (cairo-context->pointer cr))))) ++ ++(exit-with-summary (run-all-defined-test-cases)) diff --git a/graphics/guile-cairo/files/patch-guile-cairo.pc.in b/graphics/guile-cairo/files/patch-guile-cairo.pc.in new file mode 100644 index 000000000000..966ab4302a52 --- /dev/null +++ b/graphics/guile-cairo/files/patch-guile-cairo.pc.in @@ -0,0 +1,9 @@ +--- guile-cairo.pc.in.orig 2023-05-21 10:31:12 UTC ++++ guile-cairo.pc.in +@@ -7,5 +7,5 @@ Name: guile-cairo + Description: Cairo binding for Guile Scheme + Version: @VERSION@ + Requires: cairo guile-@GUILE_EFFECTIVE_VERSION@ +-Libs: -L${libdir} -lguile-cairo ++Libs: -L${libdir} -Wl,-rpath=${libdir} -lguile-cairo + Cflags: -I${includedir} diff --git a/graphics/guile-cairo/pkg-plist b/graphics/guile-cairo/pkg-plist index 5f6e6ccb44cb..27087d2ce404 100644 --- a/graphics/guile-cairo/pkg-plist +++ b/graphics/guile-cairo/pkg-plist @@ -1,12 +1,15 @@ -include/guile-cairo/guile-cairo-enum-types.h -include/guile-cairo/guile-cairo-smob-types.h -include/guile-cairo/guile-cairo-vector-types.h -include/guile-cairo/guile-cairo.h -lib/libguile-cairo.so -lib/libguile-cairo.so.0 -lib/libguile-cairo.so.0.0.0 -libdata/pkgconfig/guile-cairo.pc -share/guile/site/cairo.scm -share/guile/site/cairo/cairo-procedures.txt -share/guile/site/cairo/config.scm -share/guile/site/cairo/vector-types.scm +include/guile/%%GUILE_VER%%/guile-cairo/guile-cairo-enum-types.h +include/guile/%%GUILE_VER%%/guile-cairo/guile-cairo-smob-types.h +include/guile/%%GUILE_VER%%/guile-cairo/guile-cairo-vector-types.h +include/guile/%%GUILE_VER%%/guile-cairo/guile-cairo.h +lib/guile/%%GUILE_VER%%/extensions/libguile-cairo.so +lib/guile/%%GUILE_VER%%/extensions/libguile-cairo.so.0 +lib/guile/%%GUILE_VER%%/extensions/libguile-cairo.so.0.0.0 +%%GUILE_SITE_CCACHE%%/cairo/config.go +%%GUILE_SITE_CCACHE%%/cairo/vector-types.go +%%GUILE_SITE_CCACHE%%/cairo.go +%%GUILE_PKGCONFIG_DIR%%/guile-cairo.pc +%%GUILE_SITE%%/cairo.scm +%%GUILE_SITE%%/cairo/cairo-procedures.txt +%%GUILE_SITE%%/cairo/config.scm +%%GUILE_SITE%%/cairo/vector-types.scm diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index f603949e4254..9e9cca3644cb 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -1,95 +1,96 @@ PORTNAME= weechat DISTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ MAINTAINER= brnrd@FreeBSD.org COMMENT= Lightweight and user friendly ncurses based IRC client WWW= https://weechat.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error \ libzstd.so:archivers/zstd USES= cmake cpe libtool ncurses pkgconfig tar:xz USE_LDCONFIG= yes CMAKE_ARGS= -DLIBDATADIR=${LOCALBASE}/libdata OPTIONS_DEFINE= BACKTRACE DOCS CA_BUNDLE HEADLESS ICON ICONV \ MANPAGES NLS OPTIONS_DEFAULT= ASPELL BACKTRACE CA_BUNDLE CHARSET HEADLESS \ ICON LUA MANPAGES NLS PERL PYTHON RUBY TCL TYPING OPTIONS_SUB= yes OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= ASPELL CHARSET GUILE JAVASCRIPT LUA PERL PHP PYTHON \ RUBY TCL TYPING BACKTRACE_DESC= Provide crash backtraces CA_BUNDLE_DESC= Include CA bundle for certificate verification CHARSET_DESC= Charset plugin (implies ICONV) GUILE_DESC= Guile script support HEADLESS_DESC= Build headless weechat as well ICON_DESC= Desktop icon JAVASCRIPT_DESC= Javascript script support PLUGINS_DESC= Weechat Plugins PYTHON_DESC= Python script support RUBY_DESC= Ruby script support TYPING_DESC= Typing status plugin .for _opt in ${OPTIONS_GROUP_PLUGINS} BACKTRACE HEADLESS ICONV GNUTLS NLS ${_opt}_CMAKE_BOOL= ENABLE_${_opt} .endfor ASPELL_CMAKE_BOOL= ENABLE_SPELL ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CHARSET_IMPLIES= ICONV DOCS_CMAKE_BOOL= ENABLE_DOC ENABLE_DOC_INCOMPLETE DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 +GUILE_USES= guile:2.2,conflicts ICONV_USES= iconv JAVASCRIPT_LIB_DEPENDS= libv8.so:lang/v8 LUA_USES= lua pkgconfig MANPAGES_CMAKE_BOOL= ENABLE_MAN MANPAGES_CMAKE_ON= -DMANDIR=${MANPREFIX}/man MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor NLS_BROKEN_OFF= NLS option error: "ld: error: undefined symbol: libintl_bindtextdomain" NLS_USES= gettext PERL_USES= perl5 PHP_USES= php:build,embed PYTHON_USES= python RUBY_USES= ruby TCL_CMAKE_ON= -DTCL_VERSION:STRING="${TCL_VER}" \ -DTCL_TCLSH:PATH="${TCLSH}" TCL_USES= tcl .include .if !empty(PORT_OPTIONS:MPYTHON) && ${PYTHON_MAJOR_VER} == 2 CMAKE_ARGS+= -DENABLE_PYTHON2:BOOL=true \ # -DPYTHON_LIBRARIES=${LOCALBASE}/lib .endif post-patch: .if ${LOCALBASE} != "/usr/local" . for f in src/core/CMakeLists.txt cmake/*.cmake @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/$f . endfor .endif @${REINPLACE_CMD} 's|python${PYTHON_MAJOR_VER}|python-${PYTHON_VER}|' \ ${WRKSRC}/cmake/FindPython.cmake post-patch-ICON-off: @${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt post-install: ${LN} -sf weechat ${STAGEDIR}${PREFIX}/bin/weechat-curses .include diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist index 448c972332aa..c3a0de443b88 100644 --- a/irc/weechat/pkg-plist +++ b/irc/weechat/pkg-plist @@ -1,109 +1,110 @@ bin/weechat bin/weechat-curses %%HEADLESS%%bin/weechat-headless include/weechat/weechat-plugin.h lib/weechat/plugins/alias.so lib/weechat/plugins/buflist.so lib/weechat/plugins/exec.so lib/weechat/plugins/fifo.so lib/weechat/plugins/fset.so lib/weechat/plugins/irc.so lib/weechat/plugins/logger.so lib/weechat/plugins/relay.so lib/weechat/plugins/script.so lib/weechat/plugins/trigger.so %%TYPING%%lib/weechat/plugins/typing.so lib/weechat/plugins/xfer.so libdata/pkgconfig/weechat.pc %%MANPAGES%%man/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/man1/weechat-headless.1.gz %%MANPAGES%%man/cs/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/cs/man1/weechat-headless.1.gz %%MANPAGES%%man/de/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/de/man1/weechat-headless.1.gz %%MANPAGES%%man/fr/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/fr/man1/weechat-headless.1.gz %%MANPAGES%%man/it/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/it/man1/weechat-headless.1.gz %%MANPAGES%%man/ja/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/ja/man1/weechat-headless.1.gz %%MANPAGES%%man/pl/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/pl/man1/weechat-headless.1.gz %%MANPAGES%%man/ru/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/ru/man1/weechat-headless.1.gz %%MANPAGES%%man/sr/man1/weechat.1.gz %%HEADLESS%%%%MANPAGES%%man/sr/man1/weechat-headless.1.gz %%ASPELL%%lib/weechat/plugins/spell.so %%CHARSET%%lib/weechat/plugins/charset.so +%%GUILE%%lib/weechat/plugins/guile.so %%JAVASCRIPT%%lib/weechat/plugins/javascript.so %%LUA%%lib/weechat/plugins/lua.so %%PERL%%lib/weechat/plugins/perl.so %%PHP%%lib/weechat/plugins/php.so %%PYTHON%%lib/weechat/plugins/python.so %%RUBY%%lib/weechat/plugins/ruby.so %%TCL%%lib/weechat/plugins/tcl.so %%DOCS%%%%DOCSDIR%%/weechat_dev.en.html %%DOCS%%%%DOCSDIR%%/weechat_dev.fr.html %%DOCS%%%%DOCSDIR%%/weechat_dev.ja.html %%DOCS%%%%DOCSDIR%%/weechat_dev.sr.html %%DOCS%%%%DOCSDIR%%/weechat_faq.de.html %%DOCS%%%%DOCSDIR%%/weechat_faq.en.html %%DOCS%%%%DOCSDIR%%/weechat_faq.es.html %%DOCS%%%%DOCSDIR%%/weechat_faq.fr.html %%DOCS%%%%DOCSDIR%%/weechat_faq.it.html %%DOCS%%%%DOCSDIR%%/weechat_faq.ja.html %%DOCS%%%%DOCSDIR%%/weechat_faq.pl.html %%DOCS%%%%DOCSDIR%%/weechat_faq.sr.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.en.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.fr.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.it.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.ja.html %%DOCS%%%%DOCSDIR%%/weechat_plugin_api.sr.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.cs.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.de.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.en.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.es.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.fr.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.ja.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.it.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.pl.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.ru.html %%DOCS%%%%DOCSDIR%%/weechat_quickstart.sr.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.en.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.fr.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.ja.html %%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.sr.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.de.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.en.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.fr.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.it.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.ja.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.pl.html %%DOCS%%%%DOCSDIR%%/weechat_scripting.sr.html %%DOCS%%%%DOCSDIR%%/weechat_user.de.html %%DOCS%%%%DOCSDIR%%/weechat_user.en.html %%DOCS%%%%DOCSDIR%%/weechat_user.fr.html %%DOCS%%%%DOCSDIR%%/weechat_user.it.html %%DOCS%%%%DOCSDIR%%/weechat_user.ja.html %%DOCS%%%%DOCSDIR%%/weechat_user.pl.html %%DOCS%%%%DOCSDIR%%/weechat_user.sr.html share/applications/weechat.desktop %%ICON%%share/icons/hicolor/128x128/apps/weechat.png %%ICON%%share/icons/hicolor/16x16/apps/weechat.png %%ICON%%share/icons/hicolor/256x256/apps/weechat.png %%ICON%%share/icons/hicolor/32x32/apps/weechat.png %%ICON%%share/icons/hicolor/512x512/apps/weechat.png %%ICON%%share/icons/hicolor/64x64/apps/weechat.png %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo %%NLS%%share/locale/fr/LC_MESSAGES/weechat.mo %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo %%NLS%%share/locale/it/LC_MESSAGES/weechat.mo %%NLS%%share/locale/ja/LC_MESSAGES/weechat.mo %%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo %%NLS%%share/locale/pt/LC_MESSAGES/weechat.mo %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo %%NLS%%share/locale/sr/LC_MESSAGES/weechat.mo %%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo diff --git a/lang/Makefile b/lang/Makefile index 441660670e75..3a9144e73bf8 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,389 +1,387 @@ COMMENT = Programming languages SUBDIR += abcl SUBDIR += alchemist.el SUBDIR += algol68g SUBDIR += angelscript SUBDIR += antimony SUBDIR += apache-commons-jelly SUBDIR += asn1c SUBDIR += atlast SUBDIR += awka SUBDIR += bas2tap SUBDIR += basic256 SUBDIR += bsh SUBDIR += bwbasic SUBDIR += c SUBDIR += cairo SUBDIR += cbmbasic SUBDIR += ccl SUBDIR += ceylon SUBDIR += cfortran SUBDIR += chaiscript SUBDIR += chez-scheme SUBDIR += chibi-scheme SUBDIR += chicken SUBDIR += cim SUBDIR += cjs SUBDIR += cling SUBDIR += clips SUBDIR += clisp SUBDIR += clojure SUBDIR += clojure-mode.el SUBDIR += clover SUBDIR += cocor SUBDIR += coffeescript SUBDIR += colm SUBDIR += cparser SUBDIR += crystal SUBDIR += csharp-mode.el SUBDIR += cython SUBDIR += cython-devel SUBDIR += dhall SUBDIR += dlang-tools SUBDIR += duktape SUBDIR += duktape-lib SUBDIR += ecl SUBDIR += eisl SUBDIR += elixir SUBDIR += elixir-devel SUBDIR += elixir-mode.el SUBDIR += elk SUBDIR += elm SUBDIR += emacs-lisp-intro SUBDIR += erlang SUBDIR += erlang-doc SUBDIR += erlang-java SUBDIR += erlang-man SUBDIR += erlang-runtime21 SUBDIR += erlang-runtime22 SUBDIR += erlang-runtime23 SUBDIR += erlang-runtime24 SUBDIR += erlang-runtime25 SUBDIR += erlang-runtime26 SUBDIR += erlang-wx SUBDIR += execline SUBDIR += expect SUBDIR += f2c SUBDIR += fasm SUBDIR += fennel SUBDIR += ferite SUBDIR += ficl SUBDIR += fpc SUBDIR += fpc-base SUBDIR += fpc-docs SUBDIR += fpc-lua SUBDIR += fpc-pastojs SUBDIR += fpc-rexx SUBDIR += fpc-rtl-console SUBDIR += fpc-rtl-extra SUBDIR += fpc-rtl-generics SUBDIR += fpc-rtl-objpas SUBDIR += fpc-rtl-unicode SUBDIR += fpc-source SUBDIR += fpc-units SUBDIR += fpc-utils SUBDIR += frawk SUBDIR += fsharp SUBDIR += fth SUBDIR += gambit-c SUBDIR += gauche SUBDIR += gawk SUBDIR += gcc SUBDIR += gcc10 SUBDIR += gcc11 SUBDIR += gcc11-devel SUBDIR += gcc12 SUBDIR += gcc12-devel SUBDIR += gcc13 SUBDIR += gcc13-devel SUBDIR += gcc14-devel SUBDIR += gcc48 SUBDIR += gcc6-aux SUBDIR += gcc8 SUBDIR += gcc9 SUBDIR += gforth SUBDIR += ghc SUBDIR += ghc810 SUBDIR += ghc92 SUBDIR += gir-to-d SUBDIR += gjs SUBDIR += gleam SUBDIR += gnat12 SUBDIR += gnatcross-binutils-aarch64 SUBDIR += gnatcross-sysroot-aarch64 SUBDIR += gnatdroid-binutils SUBDIR += gnatdroid-binutils-x86 SUBDIR += gnatdroid-sysroot SUBDIR += gnatdroid-sysroot-x86 SUBDIR += gnu-apl SUBDIR += gnu-cobol SUBDIR += gnustep-base SUBDIR += go SUBDIR += go-devel SUBDIR += go118 SUBDIR += go119 SUBDIR += go120 SUBDIR += gomacro SUBDIR += gprolog SUBDIR += gravity SUBDIR += groovy SUBDIR += gscheme SUBDIR += guile-aclocal SUBDIR += guile-meta SUBDIR += guile1 SUBDIR += guile2 SUBDIR += guile3 SUBDIR += halide SUBDIR += harec SUBDIR += haskell-mode.el SUBDIR += hermes SUBDIR += hla SUBDIR += hs-brainfuck SUBDIR += hs-futhark SUBDIR += hs-unlambda SUBDIR += huc SUBDIR += icc SUBDIR += intel-compute-runtime SUBDIR += intercal SUBDIR += io SUBDIR += io-devel SUBDIR += itcl SUBDIR += itcl4 SUBDIR += janet SUBDIR += jimtcl SUBDIR += jpm SUBDIR += jruby SUBDIR += julia SUBDIR += jython SUBDIR += kawa SUBDIR += kf5-kross SUBDIR += kotlin SUBDIR += kross-interpreters SUBDIR += kturtle SUBDIR += lafontaine SUBDIR += lci SUBDIR += ldc SUBDIR += lfe SUBDIR += lfortran SUBDIR += libhx SUBDIR += libobjc2 SUBDIR += librep SUBDIR += libstdc++_stldoc_4.2.2 SUBDIR += linux-c7-tcl85 SUBDIR += linux-dotnet-cli SUBDIR += linux-dotnet-runtime SUBDIR += linux-dotnet-sdk SUBDIR += linux-dotnet10-runtime SUBDIR += linux-dotnet11-runtime SUBDIR += linux-dotnet11-sdk SUBDIR += linux-j SUBDIR += lua51 SUBDIR += lua52 SUBDIR += lua53 SUBDIR += lua54 SUBDIR += luajit SUBDIR += luajit-devel SUBDIR += luajit-openresty SUBDIR += malbolge SUBDIR += maude SUBDIR += mawk SUBDIR += mdk SUBDIR += mecrisp-stellaris SUBDIR += micropython SUBDIR += mit-scheme SUBDIR += mixal SUBDIR += mlkit SUBDIR += mlton SUBDIR += mmix SUBDIR += mono SUBDIR += mono-basic SUBDIR += mono5.10 SUBDIR += mono5.20 SUBDIR += mono6.8 SUBDIR += mosh SUBDIR += mosml SUBDIR += mtasc SUBDIR += mujs SUBDIR += munger SUBDIR += myrddin SUBDIR += nawk SUBDIR += nbfc SUBDIR += neko SUBDIR += nesasm SUBDIR += newlisp SUBDIR += nhc98 SUBDIR += nickle SUBDIR += nim SUBDIR += njs SUBDIR += nqc SUBDIR += nwcc SUBDIR += nx SUBDIR += nyan SUBDIR += ocaml SUBDIR += ocaml-autoconf SUBDIR += ocaml-camlidl SUBDIR += ocaml-nox11 SUBDIR += onyx SUBDIR += oo2c SUBDIR += opencoarrays SUBDIR += opensycl SUBDIR += ott SUBDIR += owl-lisp SUBDIR += p5-Data-JavaScript SUBDIR += p5-Error SUBDIR += p5-Expect SUBDIR += p5-ExtUtils-F77 SUBDIR += p5-Interpolation SUBDIR += p5-JSAN SUBDIR += p5-JavaScript-Squish SUBDIR += p5-JavaScript-Value-Escape SUBDIR += p5-List-MoreUtils SUBDIR += p5-List-MoreUtils-XS SUBDIR += p5-Marpa SUBDIR += p5-Marpa-PP SUBDIR += p5-Marpa-XS SUBDIR += p5-Modern-Perl SUBDIR += p5-Perl6-Subs SUBDIR += p5-Promises SUBDIR += p5-Pugs-Compiler-Rule SUBDIR += p5-Quantum-Superpositions SUBDIR += p5-Scalar-List-Utils SUBDIR += p5-Switch SUBDIR += p5-Tcl SUBDIR += p5-Test-XPath SUBDIR += p5-Try-Catch SUBDIR += p5-Try-Tiny SUBDIR += p5-Try-Tiny-Retry SUBDIR += p5-TryCatch SUBDIR += p5-ePerl SUBDIR += p5-signatures SUBDIR += p5-v6 SUBDIR += parrot SUBDIR += pbasic SUBDIR += pcc SUBDIR += perl5-devel SUBDIR += perl5.32 SUBDIR += perl5.34 SUBDIR += perl5.36 SUBDIR += perl5.38 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += pharo SUBDIR += php-mode.el SUBDIR += php80 SUBDIR += php80-extensions SUBDIR += php81 SUBDIR += php81-extensions SUBDIR += php82 SUBDIR += php82-extensions SUBDIR += php83 SUBDIR += php83-extensions SUBDIR += picoc SUBDIR += plexil SUBDIR += pocl SUBDIR += polyml SUBDIR += pomsky SUBDIR += prql SUBDIR += ptoc SUBDIR += purescript SUBDIR += py-hy SUBDIR += py-lupa SUBDIR += py-textX SUBDIR += python SUBDIR += python-doc-html SUBDIR += python-doc-pdf-a4 SUBDIR += python-doc-pdf-letter SUBDIR += python-doc-text SUBDIR += python-mode.el SUBDIR += python-tools SUBDIR += python2 SUBDIR += python27 SUBDIR += python3 SUBDIR += python310 SUBDIR += python311 SUBDIR += python38 SUBDIR += python39 SUBDIR += qmasm SUBDIR += qscheme SUBDIR += quickjs SUBDIR += quilc SUBDIR += racket SUBDIR += racket-minimal SUBDIR += ratfor SUBDIR += referenceassemblies-pcl SUBDIR += retro12 SUBDIR += rexx-imc SUBDIR += rexx-regina SUBDIR += rexx-regutil SUBDIR += rexx-wrapper SUBDIR += rhino SUBDIR += ruby30 SUBDIR += ruby31 SUBDIR += ruby32 SUBDIR += ruby33 SUBDIR += rubygem-rb_sys SUBDIR += rubygem-ruby_language_server SUBDIR += runawk SUBDIR += rust SUBDIR += rust-bootstrap SUBDIR += rust-nightly SUBDIR += sagittarius-scheme SUBDIR += sather-specification SUBDIR += sather-tutorial SUBDIR += sbcl SUBDIR += scala SUBDIR += scheme48 SUBDIR += scm SUBDIR += scratch SUBDIR += sdcc SUBDIR += see SUBDIR += seed7 SUBDIR += silq SUBDIR += siod SUBDIR += sisc SUBDIR += sketchy SUBDIR += slib SUBDIR += slib-guile - SUBDIR += slib-guile1 - SUBDIR += slib-guile2 SUBDIR += slisp SUBDIR += smalltalk SUBDIR += smlnj SUBDIR += snobol4 SUBDIR += solidity SUBDIR += spidermonkey102 SUBDIR += spidermonkey78 SUBDIR += spidermonkey91 SUBDIR += spl SUBDIR += squeak SUBDIR += squirrel SUBDIR += swi-pl SUBDIR += tauthon SUBDIR += tcbasic SUBDIR += tcc SUBDIR += tcl-manual SUBDIR += tcl-wrapper SUBDIR += tcl85 SUBDIR += tcl86 SUBDIR += tcl87 SUBDIR += tclX SUBDIR += tolua SUBDIR += tolua++ SUBDIR += tuareg-mode.el SUBDIR += twelf SUBDIR += ucc SUBDIR += urweb SUBDIR += v SUBDIR += v8 SUBDIR += v8-beta SUBDIR += vala SUBDIR += voc SUBDIR += yabasic SUBDIR += yap SUBDIR += yorick SUBDIR += ypsilon SUBDIR += zephir SUBDIR += zig .include diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index f8a581ff71a0..2b2cf753de5a 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -1,34 +1,33 @@ PORTNAME= mdk PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang gnome MASTER_SITES= GNU/${PORTNAME}/v${PORTVERSION} MAINTAINER= antranigv@freebsd.am COMMENT= Utilities for developing programs using MIX and MIXAL WWW= https://www.gnu.org/software/mdk/mdk.html LICENSE= GPLv3 USES= gettext gmake gnome ncurses pkgconfig readline USE_GNOME= glib20 gtk30 intltool GNU_CONFIGURE= yes TEST_TARGET= check INFO= mdk OPTIONS_DEFINE= GUILE NLS OPTIONS_DEFAULT=GUILE OPTIONS_SUB= yes GUILE_CONFIGURE_WITH= guile -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded +GUILE_USES= guile:2.2,conflicts NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \ ${WRKSRC}/configure .include diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile index d431e661ac96..added7ef8a03 100644 --- a/lang/slib-guile/Makefile +++ b/lang/slib-guile/Makefile @@ -1,21 +1,26 @@ PORTNAME= slib PORTVERSION= 3b6 # Keep this in sync with lang/slib -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang scheme MASTER_SITES= # empty -PKGNAMESUFFIX= -guile +PKGNAMESUFFIX= -${FLAVOR} DISTFILES= # empty MAINTAINER= bofh@FreeBSD.org COMMENT= SLIB installation for Guile +WWW= https://people.csail.mit.edu/jaffer/SLIB.html -BUILD_DEPENDS= ${LOCALBASE}/share/slib/require.scm:lang/slib \ - guile:lang/guile -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${LOCALBASE}/share/slib/require.scm:lang/slib +RUN_DEPENDS= ${LOCALBASE}/share/slib/require.scm:lang/slib + +USES= guile:1.8,2.2,3.0,flavors,build,run -SUB_FILES+= pkg-install pkg-deinstall NO_ARCH= yes NO_BUILD= yes NO_INSTALL= yes +SUB_FILES+= pkg-install pkg-deinstall +SUB_LIST+= GUILE_VER=${GUILE_VER} \ + SLIB_INIT=${${GUILE_SFX} >= 2:?guile-2.init:guile.init} + .include diff --git a/lang/slib-guile/files/pkg-deinstall.in b/lang/slib-guile/files/pkg-deinstall.in index 13eedbc85fba..7fb1a88fdee0 100644 --- a/lang/slib-guile/files/pkg-deinstall.in +++ b/lang/slib-guile/files/pkg-deinstall.in @@ -1,8 +1,8 @@ #!/bin/sh case "$2" in "POST-DEINSTALL") - rm -f %%LOCALBASE%%/share/guile/3.0/slib - rm -f %%LOCALBASE%%/share/guile/3.0/slibcat + rm -f %%LOCALBASE%%/share/guile/%%GUILE_VER%%/slib + rm -f %%LOCALBASE%%/share/guile/%%GUILE_VER%%/slibcat ;; esac diff --git a/lang/slib-guile/files/pkg-install.in b/lang/slib-guile/files/pkg-install.in index f21a3953f793..54f8624f4430 100644 --- a/lang/slib-guile/files/pkg-install.in +++ b/lang/slib-guile/files/pkg-install.in @@ -1,8 +1,8 @@ #!/bin/sh case "$2" in "POST-INSTALL") - ln -shf %%LOCALBASE%%/share/slib %%LOCALBASE%%/share/guile/3.0/slib - env GUILE_IMPLEMENTATION_PATH=%%LOCALBASE%%/share/guile/3.0 %%LOCALBASE%%/bin/guile -q --no-auto-compile -l %%LOCALBASE%%/share/slib/guile.init -c "(use-modules (ice-9 slib))(require 'new-catalog)" + ln -shf %%LOCALBASE%%/share/slib %%LOCALBASE%%/share/guile/%%GUILE_VER%%/slib + env GUILE_IMPLEMENTATION_PATH=%%LOCALBASE%%/share/guile/%%GUILE_VER%% GUILE_AUTO_COMPILE=0 %%LOCALBASE%%/bin/guile-%%GUILE_VER%% -q -l %%LOCALBASE%%/share/slib/%%SLIB_INIT%% -c "(use-modules (ice-9 slib))(require 'new-catalog)" ;; esac diff --git a/lang/slib-guile1/Makefile b/lang/slib-guile1/Makefile deleted file mode 100644 index a376a05b3df5..000000000000 --- a/lang/slib-guile1/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= slib -PORTVERSION= 3b6 # Keep this in sync with lang/slib -CATEGORIES= lang scheme -MASTER_SITES= # empty -PKGNAMESUFFIX= -guile1 -DISTFILES= # empty - -MAINTAINER= bofh@FreeBSD.org -COMMENT= SLIB installation for Guile1 - -BUILD_DEPENDS= ${LOCALBASE}/share/slib/require.scm:lang/slib \ - guile:lang/guile1 -RUN_DEPENDS:= ${BUILD_DEPENDS} - -SUB_FILES+= pkg-install pkg-deinstall -NO_ARCH= yes -NO_BUILD= yes -NO_INSTALL= yes - -.include diff --git a/lang/slib-guile1/files/pkg-deinstall.in b/lang/slib-guile1/files/pkg-deinstall.in deleted file mode 100644 index 19ec50f662c7..000000000000 --- a/lang/slib-guile1/files/pkg-deinstall.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -case "$2" in -"POST-DEINSTALL") - rm -f %%LOCALBASE%%/share/guile/1.8/slib - rm -f %%LOCALBASE%%/share/guile/1.8/slibcat - ;; -esac diff --git a/lang/slib-guile1/files/pkg-install.in b/lang/slib-guile1/files/pkg-install.in deleted file mode 100644 index d7ee7ff69d60..000000000000 --- a/lang/slib-guile1/files/pkg-install.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -case "$2" in -"POST-INSTALL") - ln -shf %%LOCALBASE%%/share/slib %%LOCALBASE%%/share/guile/1.8/slib - env GUILE_IMPLEMENTATION_PATH=%%LOCALBASE%%/share/guile/1.8 %%LOCALBASE%%/bin/guile -q -l %%LOCALBASE%%/share/slib/guile.init -c "(use-modules (ice-9 slib))(require 'new-catalog)" - ;; -esac diff --git a/lang/slib-guile1/pkg-descr b/lang/slib-guile1/pkg-descr deleted file mode 100644 index 38f64caad716..000000000000 --- a/lang/slib-guile1/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -To use the features offered by the SLIB library, add the following -construct to your programs: - - (use-modules (ice-9 slib)) diff --git a/lang/slib-guile2/Makefile b/lang/slib-guile2/Makefile deleted file mode 100644 index 3d7f8ce951cd..000000000000 --- a/lang/slib-guile2/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PORTNAME= slib -PORTVERSION= 3b6 # Keep this in sync with lang/slib -CATEGORIES= lang scheme -MASTER_SITES= # empty -PKGNAMESUFFIX= -guile2 -DISTFILES= # empty - -MAINTAINER= bofh@FreeBSD.org -COMMENT= SLIB installation for Guile - -BUILD_DEPENDS= ${LOCALBASE}/share/slib/require.scm:lang/slib \ - guile:lang/guile2 -RUN_DEPENDS:= ${BUILD_DEPENDS} - -SUB_FILES+= pkg-install pkg-deinstall -NO_ARCH= yes -NO_BUILD= yes -NO_INSTALL= yes - -.include diff --git a/lang/slib-guile2/files/pkg-deinstall.in b/lang/slib-guile2/files/pkg-deinstall.in deleted file mode 100644 index 2527070f6668..000000000000 --- a/lang/slib-guile2/files/pkg-deinstall.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -case "$2" in -"POST-DEINSTALL") - rm -f %%LOCALBASE%%/share/guile/2.2/slib - rm -f %%LOCALBASE%%/share/guile/2.2/slibcat - ;; -esac diff --git a/lang/slib-guile2/files/pkg-install.in b/lang/slib-guile2/files/pkg-install.in deleted file mode 100644 index 15e7e303aa61..000000000000 --- a/lang/slib-guile2/files/pkg-install.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -case "$2" in -"POST-INSTALL") - ln -shf %%LOCALBASE%%/share/slib %%LOCALBASE%%/share/guile/2.2/slib - env GUILE_IMPLEMENTATION_PATH=%%LOCALBASE%%/share/guile/2.2 GUILE_AUTO_COMPILE=0 %%LOCALBASE%%/bin/guile -q -l %%LOCALBASE%%/share/slib/guile-2.init -c "(use-modules (ice-9 slib))(require 'new-catalog)" - ;; -esac diff --git a/lang/slib-guile2/pkg-descr b/lang/slib-guile2/pkg-descr deleted file mode 100644 index 38f64caad716..000000000000 --- a/lang/slib-guile2/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -To use the features offered by the SLIB library, add the following -construct to your programs: - - (use-modules (ice-9 slib)) diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index 71f1b8a33b29..05a181702f9d 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -1,119 +1,117 @@ PORTNAME= anubis PORTVERSION= 4.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= mail MASTER_SITES= GNU MAINTAINER= jhale@FreeBSD.org COMMENT= Outgoing SMTP mail processor WWW= https://www.gnu.org/software/anubis/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf charsetfix cpe localbase makeinfo \ pkgconfig shebangfix CHARSETFIX_MAKEFILEIN= gnulib.mk CPE_VENDOR= gnu SHEBANG_FILES= contrib/msg2smtp.pl USE_RC_SUBR= anubis GNU_CONFIGURE= yes INFO= anubis PORTEXAMPLES= 1anubisrc 2anubisrc OPTIONS_DEFINE= NLS EXAMPLES EMACS GUILE GNUPG GNUTLS \ GSASL LIBWRAP PCRE PAM SOCKS TEST DB_DESC= Database backend OPTIONS_GROUP= DB OPTIONS_GROUP_DB= GDBM MYSQL PGSQL OPTIONS_DEFAULT= GDBM GNUPG GNUTLS GSASL GUILE OPTIONS_EXCLUDE_aarch64=TEST OPTIONS_SUB= yes NO_OPTIONS_SORT= yes .if !exists(/usr/include/tcpd.h) OPTIONS_EXCLUDE+= LIBWRAP .endif .if !exists(/usr/lib/libpam.so) OPTIONS_EXCLUDE+= PAM .endif EMACS_DESC= Install EMACS lisp files (requires emacs) EMACS_USES= emacs:build EMACS_CONFIGURE_ON= --with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/anubis EMACS_CONFIGURE_OFF= --with-lispdir=no GDBM_IMPLIES= GSASL GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ libgpg-error.so:security/libgpg-error GNUPG_CONFIGURE_WITH= gpgme GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt GNUTLS_CONFIGURE_WITH= gnutls GSASL_DESC= GSASL support (required for databases) GSASL_LIB_DEPENDS= libgsasl.so:security/libgsasl GSASL_CONFIGURE_WITH= gsasl -GUILE_LIB_DEPENDS= libltdl.so:devel/libltdl \ - libguile.so:lang/guile1 \ - libgmp.so:math/gmp +GUILE_USES= guile:1.8,alias GUILE_CONFIGURE_WITH= guile GUILE_PORTEXAMPLES= anubis.scm anubisrc.guile LIBWRAP_CONFIGURE_WITH= tcp-wrappers MYSQL_IMPLIES= GSASL MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql MYSQL_VARS= REQUIRE+=mysql NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_WITH= pam PAM_PORTEXAMPLES= pam PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre PGSQL_IMPLIES= GSASL PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres PGSQL_VARS= REQUIRE+=postgresql SOCKS_CONFIGURE_WITH= socks-proxy .include # Default requirement for anubis rc script REQUIRE+= mail SUB_LIST+= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h @${REINPLACE_CMD} -e 's,gdbm_db_,db_gdbm_,g' \ ${WRKSRC}/src/anubisadm.c ${WRKSRC}/src/gdbm.c \ ${WRKSRC}/src/headers.h ${WRKSRC}/src/main.c post-patch-TEST-off: @${REINPLACE_CMD} -e 's| testsuite||' ${WRKSRC}/Makefile.am post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*rc ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MGUILE} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${GUILE_PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MPAM} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam ${INSTALL_DATA} ${WRKSRC}/examples/pam/anubis* ${STAGEDIR}${EXAMPLESDIR}/pam .endif .include diff --git a/mail/anubis/files/patch-src_Makefile.am b/mail/anubis/files/patch-src_Makefile.am index e516ed9efeb7..21afe4b9beb6 100644 --- a/mail/anubis/files/patch-src_Makefile.am +++ b/mail/anubis/files/patch-src_Makefile.am @@ -1,23 +1,32 @@ --- src/Makefile.am.orig 2014-05-16 04:19:46 UTC +++ src/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = @ANUBIS_BIN_ADM@ EXTRA_PROGRAMS = $(adm_bin_programs) $(adm_sbin_programs) noinst_LIBRARIES = libanubisdb.a -anubis_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a\ +anubis_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a\ @LIBINTL@ $(GUILE_LIBS) @LIBGNUTLS_LIBS@ @GSASL_LIBS@ anubis_SOURCES = \ @@ -65,9 +65,9 @@ anubis_SOURCES = \ xdatabase.c anubisadm_SOURCES = anubisadm.c anubisadm.h adm.c -anubisadm_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ +anubisadm_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ anubisusr_SOURCES = anubisusr.c anubisusr.h usr.c -anubisusr_LDADD = ./libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ +anubisusr_LDADD = libanubisdb.a $(top_builddir)/lib/libanubis.a @LIBINTL@ @LIBGNUTLS_LIBS@ @GSASL_LIBS@ if TLS_COND TLS_C=tls.c +@@ -99,7 +99,7 @@ BUILT_SOURCES = env.c + + localedir = $(datadir)/locale + DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" +-AM_CPPFLAGS = @ADD_INCLUDES@ @LIBGNUTLS_INCLUDES@ -I$(top_srcdir)/lib ++AM_CPPFLAGS = @ADD_INCLUDES@ @LIBGNUTLS_INCLUDES@ @GUILE_INCLUDES@ -I$(top_srcdir)/lib + SUFFIXES=.opt .c + + .opt.c: diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index b71b43171824..69328baee787 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -1,114 +1,114 @@ PORTNAME= mailutils PORTVERSION= 3.16 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= GNU GNU_ALPHA MAINTAINER= zeus@gnu.org.ua COMMENT= Utilities, daemons, and filters for processing e-mail WWW= https://mailutils.org/ LICENSE= GPLv3+ LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ libltdl.so:devel/libltdl \ libunistring.so:devel/libunistring TEST_DEPENDS= automake:devel/automake USES= cpe gmake iconv libtool localbase readline tar:xz CPE_VENDOR= gnu GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= comsatd imap4d pop3d INSTALL_TARGET= install-strip TEST_TARGET= check CONFLICTS_INSTALL= avenger elm # bin/dotlock bin/frm PLIST_SUB+= LIBVERSION=9.0.0 LIBSUFX=9 VERSION=${PORTVERSION} INFO= ${PORTNAME} PORTDOCS= AUTHORS ChangeLog NEWS README* THANKS TODO OPTIONS_DEFINE= DOCS FRIBIDI GNUTLS GSSAPI GUILE MH NLS PAM PYTHON OPTIONS_DEFAULT= GDBM GNUTLS PAM OPTIONS_MULTI= DB OPTIONS_MULTI_DB= BDB GDBM KYOTOCABINET LDAP MYSQL PGSQL TOKYOCABINET OPTIONS_SUB= yes DB_DESC= Database configuration KYOTOCABINET_DESC= Kyoto Cabinet database support MH_DESC= MH (Message Handling) system support TOKYOCABINET_DESC= Tokyo Cabinet database support FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_WITH= fribidi GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi GSSAPI_USES= ssl GSSAPI_CONFIGURE_WITH= gssapi -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 libgmp.so:math/gmp -GUILE_USES= makeinfo pkgconfig +GUILE_USES= guile:2.2,alias makeinfo pkgconfig GUILE_CONFIGURE_WITH= guile MH_CONFIGURE_ENV= ac_cv_prog_EMACS=no MH_CONFIGURE_ENABLE= mh MH_USES= emacs:noflavors MH_VARS= EMACS_NO_DEPENDS=yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_ENABLE= pam PYTHON_USES= python PYTHON_CONFIGURE_ENABLE=python PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config BDB_USES= bdb BDB_CONFIGURE_WITH= berkeley-db BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} BDB_LDFLAGS= -L${BDB_LIB_DIR} GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet KYOTOCABINET_CONFIGURE_WITH= kyotocabinet LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet TOKYOCABINET_CONFIGURE_WITH= tokyocabinet .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif post-patch: @${REINPLACE_CMD} -e '/MU_AUTHLIBS=/s,-lldap,-llber &,' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \ ${WRKSRC}/dotlock/Makefile.in ${WRKSRC}/mda/mda/Makefile.in @${REINPLACE_CMD} -e 's,-E,& -P,' ${WRKSRC}/libmu_scm/Makefile.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-MH-on: @${MKDIR} ${STAGEDIR}${EMACS_SITE_LISPDIR} ${RLN} ${STAGEDIR}${DATADIR}/mh/mailutils-mh.el \ ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .include diff --git a/mail/mu/Makefile b/mail/mu/Makefile index 16384d31ae82..961cda4e297c 100644 --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -1,46 +1,46 @@ PORTNAME= mu PORTVERSION= 1.8.13 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org COMMENT= Mail searching frontend for Xapian WWW= https://www.djcbsoftware.nl/code/mu/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxapian.so:databases/xapian-core \ libgmime-3.0.so:mail/gmime30 \ libgc-threaded.so:devel/boehm-gc-threaded \ libjson-glib-1.0.so:devel/json-glib USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \ libtool makeinfo pkgconfig USE_GITHUB= yes GH_ACCOUNT= djcb USE_GNOME= glib20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-mu4e INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS GUILE OPTIONS_DEFAULT= DOCS GUILE OPTIONS_SUB= yes -GUILE_LIB_DEPENDS= libguile-3.0.so:lang/guile +GUILE_USES= guile:3.0 GUILE_USE= ldconfig=yes GUILE_CONFIGURE_ENABLE= guile GUILE_INFO= mu-guile post-install: cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \ ${STAGEDIR}${PREFIX}/bin post-install-GUILE-on: ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \ ${XARGS} ${STRIP_CMD} .include diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile index acb316e5abc3..6cf3a5517bde 100644 --- a/math/drgeo/Makefile +++ b/math/drgeo/Makefile @@ -1,29 +1,27 @@ PORTNAME= drgeo PORTVERSION= 1.1.0 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= math MASTER_SITES= SF/ofset/${PORTNAME}/${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= GTK interactive geometry software WWW= http://www.ofset.org/drgeo/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile.so:lang/guile1 - -USES= compiler:c++11-lang gettext gmake gnome localbase:ldflags \ - pathfix pkgconfig +USES= compiler:c++11-lang gettext gmake gnome guile:1.8 \ + localbase:ldflags pathfix pkgconfig GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack libglade2 CXXFLAGS+= -Wno-reserved-user-defined-literal PORTDATA= * post-patch: @${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|g' \ ${WRKSRC}/plugin/drgeo/progs/tm_drgeo .include diff --git a/math/drgeo/files/patch-geo_Makefile.in b/math/drgeo/files/patch-geo_Makefile.in new file mode 100644 index 000000000000..31923040b6a9 --- /dev/null +++ b/math/drgeo/files/patch-geo_Makefile.in @@ -0,0 +1,12 @@ +--- geo/Makefile.in.orig 2023-05-25 10:21:18 UTC ++++ geo/Makefile.in +@@ -192,7 +192,8 @@ INCLUDES = \ + -DDRGEO_GLADEDIR=\""$(gladedir)"\" \ + -DDRGEO_ENCODEDIR=\""$(encodedir)"\" \ + -I$(includedir) \ +- $(DRGEO_CFLAGS) ++ $(DRGEO_CFLAGS) \ ++ $(GUILE_CFLAGS) + + + noinst_LIBRARIES = libgeo.a diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index f9146ece8291..7f2b6edbb997 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -1,30 +1,29 @@ PORTNAME= nlopt DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= rhurlin@FreeBSD.org COMMENT= Nonlinear optimization library WWW= https://nlopt.readthedocs.io/en/latest/ LICENSE= LGPL21 MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_armv6= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory BROKEN_armv7= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory BUILD_DEPENDS= swig:devel/swig \ ${PYNUMPY} -LIB_DEPENDS= libgmp.so:math/gmp \ - libguile-2.2.so:lang/guile2 RUN_DEPENDS= ${PYNUMPY} -USES= cmake:testing compiler:features localbase pathfix pkgconfig python +USES= cmake:testing compiler:features guile:2.2,alias,conflicts \ + localbase pathfix pkgconfig python USE_GITHUB= yes GH_ACCOUNT= stevengj USE_LDCONFIG= yes .include diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile index a4563a391d57..d47241932352 100644 --- a/net-im/freetalk/Makefile +++ b/net-im/freetalk/Makefile @@ -1,32 +1,31 @@ PORTNAME= freetalk PORTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= GNU/freetalk MAINTAINER= fuz@FreeBSD.org COMMENT= GNU console based Jabber client WWW= https://www.gnu.org/software/freetalk/ LICENSE= GPLv3+ GFDL LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl-1.3.texi LIB_DEPENDS= libargp.so:devel/argp-standalone \ - libloudmouth-1.so:net-im/loudmouth \ - libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded + libloudmouth-1.so:net-im/loudmouth -USES= autoreconf gettext-runtime gnome localbase makeinfo \ - ncurses pkgconfig readline +USES= autoreconf gettext-runtime gnome guile:2.2 localbase \ + makeinfo ncurses pkgconfig readline USE_GNOME= glib20 GNU_CONFIGURE= yes LIBS= -largp INFO= freetalk post-patch: @${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \ ${WRKSRC}/configure.ac .include diff --git a/net/dico/Makefile b/net/dico/Makefile index 13e36c355d22..c83744eb2baf 100644 --- a/net/dico/Makefile +++ b/net/dico/Makefile @@ -1,66 +1,66 @@ PORTNAME= dico DISTVERSION= 2.11 +PORTREVISION= 1 CATEGORIES= net textproc MASTER_SITES= GNU MAINTAINER= info@dikt.tv COMMENT= Flexible modular implementation of DICT server WWW= https://www.gnu.org/software/dico/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl USES= gmake libtool localbase pkgconfig readline tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip INFO= dico LDFLAGS+= -lthr PLIST_SUB= PORTVERSION=${PORTVERSION} SUB_FILES= pkg-message USE_RC_SUBR= dicod OPTIONS_DEFINE= PYTHON GUILE PCRE GSASL PAM LDAP NLS OPTIONS_DEFAULT= PYTHON PCRE OPTIONS_SUB= yes GSASL_DESC= GSASL support GSASL_USES= iconv GSASL_LIB_DEPENDS= libgsasl.so:security/libgsasl GSASL_CONFIGURE_WITH= gsasl -GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded -GUILE_CONFIGURE_OFF= --without-guile +GUILE_USES= guile:2.2,alias +GUILE_CONFIGURE_WITH= guile LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PAM_CONFIGURE_ENABLE= pam PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_OFF= --without-pcre PYTHON_USES= python PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config PYTHON_CONFIGURE_OFF= --without-python post-patch: @${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in @${REINPLACE_CMD} \ -e 's/mu_check_lib_save_LIBS/LIBS/' \ -e 's/python-config/$${PYTHON_CONFIG}/' \ ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample .include diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index 059a5fbb4cbf..8e4bce663f6c 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -1,73 +1,73 @@ PORTNAME= gnu-radius PORTVERSION= 1.6.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= net MASTER_SITES= GNU/radius DISTNAME= radius-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GNU RADIUS server WWW= https://www.gnu.org/software/radius/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl USES= cpe gmake libtool USE_RC_SUBR= radiusd USE_SUBMAKE= yes USE_LDCONFIG= yes CPE_PRODUCT= radius CPE_VENDOR= gnu CONFLICTS= freeradius-0.* openradius-0.* radiusd-cistron-1.* GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= PORTVERSION=${PORTVERSION} DATADIR= ${PREFIX}/share/radius INFO= radius SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR="${.CURDIR}" \ MKDIR="${MKDIR}" CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \ --with-lib-path="${LOCALBASE}/lib/" OPTIONS_DEFINE= CLIENT MYSQL PGSQL EXAMPLES DBM SNMP EMACS PAM NLS OPTIONS_DEFAULT=MYSQL OPTIONS_SUB= yes CLIENT_DESC= Build client EMACS_DESC= Install Emacs dotfiles SNMP_CONFIGURE_ENABLE= snmp CLIENT_CONFIGURE_ENABLE= client -CLIENT_LIB_DEPENDS= libguile.so:lang/guile1 +CLIENT_USES= guile:1.8,alias CLIENT_CONFIGURE_OFF= --without-guile MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgres DBM_CONFIGURE_ENABLE= dbm=ndbm EMACS_USES= emacs EMACS_CONFIGURE_WITH= lispdir=${PREFIX}/${EMACS_SITE_LISPDIR} EMACS_NO_DEPENDS= yes NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls PAM_CONFIGURE_ENABLE= pam post-patch: ${REINPLACE_CMD} -e 's|extern unsigned scheme_gc_interval;||g' \ ${WRKSRC}/include/radiusd.h ${REINPLACE_CMD} -e 's|int getline|ssize_t getline|' \ ${WRKSRC}/radtest/input.l ${WRKSRC}/radtest/input.c post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ( cd ${WRKSRC}/examples && ${COPYTREE_SHARE} .\ ${STAGEDIR}${EXAMPLESDIR}\ "! ( -name Makefile -o -name Makefile\.* ) " ) .include diff --git a/net/serveez/Makefile b/net/serveez/Makefile index bd350d07681c..4754be8c03f4 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -1,38 +1,36 @@ PORTNAME= serveez PORTVERSION= 0.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net devel MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= Server framework WWW= https://www.gnu.org/software/serveez/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_FreeBSD_13= ld: error: duplicate symbol: guile_global_error BROKEN_FreeBSD_14= ld: error: duplicate symbol: guile_global_error -LIB_DEPENDS= libguile.so:lang/guile1 - -USES= cpe tar:xz libtool +USES= cpe guile:1.8 tar:xz libtool CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-libserveez-install USE_LDCONFIG= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes INFO= serveez post-patch: @${REINPLACE_CMD} -e \ '/^SUBDIRS/s|test||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/date -r/s|^|#|' ${WRKSRC}/src/irc-server/Makefile.in @${ECHO_CMD} 'static char created[] = "2013-12-02 09:17 UTC";' \ > ${WRKSRC}/src/irc-server/timestamp.c .include diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index bf90d1abfac9..ae927c005595 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -1,88 +1,86 @@ PORTNAME= lilypond DISTVERSION= 2.25.6 +PORTREVISION= 1 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ PKGNAMESUFFIX= -devel MAINTAINER= m.ne@gmx.net COMMENT= GNU music typesetter WWW= https://lilypond.org/ LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ pdftexi2dvi:print/texinfo \ pngtopnm:graphics/netpbm \ rsync:net/rsync \ t1ascii:print/t1utils \ texi2html:textproc/texi2html \ zip:archivers/zip LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libgc-threaded.so:devel/boehm-gc-threaded \ - libgmp.so:math/gmp \ - libguile-2.2.so:lang/guile2 \ libharfbuzz.so:print/harfbuzz \ libltdl.so:devel/libltdl \ libpng16.so:graphics/png RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \ mftrace:print/mftrace USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome \ - magick:7,build perl5 pkgconfig python + guile:2.2 magick:7,build perl5 pkgconfig python USE_CXXSTD= c++14 USE_GNOME= cairo pango USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ FLEX=${FLEX} \ GUILE_FLAVOR=guile-2.2 \ HOME=${WRKDIR} \ YACC=${YACC} MAKEFILE= GNUmakefile ALL_TARGET= all CONFLICTS_INSTALL= lilypond BINARY_ALIAS= python=${PYTHON_VERSION} INFO= lilypond-changes \ lilypond-contributor \ lilypond-essay \ lilypond-extending \ lilypond-internals \ lilypond-learning \ lilypond-notation \ lilypond-snippets \ lilypond-usage \ music-glossary PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= NLS URW OPTIONS_SUB= yes URW_DESC= Use bundled URW fonts NLS_USES= gettext URW_BUILD_DEPENDS= urw-base35-fonts>0:x11-fonts/urw-base35-fonts URW_RUN_DEPENDS_OFF= urw-base35-fonts>0:x11-fonts/urw-base35-fonts URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts post-patch: @${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \ ${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf post-patch-NLS-off: @${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond (cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${DISTVERSION} current) .include diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 04bbd6a0b062..5f868cea6a93 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,86 +1,83 @@ PORTNAME= lilypond DISTVERSION= 2.24.1 +PORTREVISION= 1 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ MAINTAINER= m.ne@gmx.net COMMENT= GNU music typesetter WWW= https://lilypond.org/ LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ pdftexi2dvi:print/texinfo \ pngtopnm:graphics/netpbm \ rsync:net/rsync \ t1ascii:print/t1utils \ texi2html:textproc/texi2html \ zip:archivers/zip LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libgc-threaded.so:devel/boehm-gc-threaded \ - libgmp.so:math/gmp \ - libguile-2.2.so:lang/guile2 \ - libharfbuzz.so:print/harfbuzz \ - libltdl.so:devel/libltdl + libharfbuzz.so:print/harfbuzz RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \ mftrace:print/mftrace USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome \ - magick:7,build perl5 pkgconfig python + guile:2.2 magick:7,build perl5 pkgconfig python USE_CXXSTD= c++14 USE_GNOME= pango USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ FLEX=${FLEX} \ - GUILE_FLAVOR=guile-2.2 \ HOME=${WRKDIR} \ - YACC=${YACC} + YACC=${YACC} \ + GUILE_FLAVOR=guile-${GUILE_VER} MAKEFILE= GNUmakefile ALL_TARGET= all CONFLICTS_INSTALL= lilypond-devel BINARY_ALIAS= python=${PYTHON_VERSION} INFO= lilypond-changes \ lilypond-contributor \ lilypond-essay \ lilypond-extending \ lilypond-internals \ lilypond-learning \ lilypond-notation \ lilypond-snippets \ lilypond-usage \ music-glossary PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= NLS URW OPTIONS_SUB= yes URW_DESC= Use bundled URW fonts NLS_USES= gettext URW_BUILD_DEPENDS= urw-base35-fonts>0:x11-fonts/urw-base35-fonts URW_RUN_DEPENDS_OFF= urw-base35-fonts>0:x11-fonts/urw-base35-fonts URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts post-patch: @${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \ ${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf post-patch-NLS-off: @${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond (cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${DISTVERSION} current) .include diff --git a/science/harminv/Makefile b/science/harminv/Makefile index 96e4d1247352..5c0483d3e885 100644 --- a/science/harminv/Makefile +++ b/science/harminv/Makefile @@ -1,22 +1,20 @@ PORTNAME= harminv PORTVERSION= 1.3.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= science MASTER_SITES= http://ab-initio.mit.edu/harminv/ MAINTAINER= devel@stasyan.com COMMENT= Solver of harmonic inversion WWW= http://ab-initio.mit.edu/wiki/index.php/Harminv -LIB_DEPENDS= libguile-2.2.so:lang/guile2 - USES= blaslapack fortran gmake libtool pathfix GNU_CONFIGURE= yes USE_GCC= yes CPPFLAGS+= -I${LOCALBASE}/include -fPIC LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" USE_LDCONFIG= yes .include diff --git a/science/libctl/Makefile b/science/libctl/Makefile index cd8a7d386d2c..2b76d8cb2ee5 100644 --- a/science/libctl/Makefile +++ b/science/libctl/Makefile @@ -1,39 +1,36 @@ PORTNAME= libctl DISTVERSION= 4.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science math MASTER_SITES= https://github.com/NanoComp/libctl/releases/download/v${DISTVERSION}/ MAINTAINER= devel@stasyan.com COMMENT= Control Language Library WWW= https://libctl.readthedocs.io/en/latest/ LICENSE= GPLv2 BROKEN_sparc64= does not build -LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ - libguile-2.2.so:lang/guile2 - -USES= fortran libtool pkgconfig +USES= fortran guile:2.2 libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= NLOPT DOCS EXAMPLES OPTIONS_DEFAULT= NLOPT NLOPT_DESC= Use NLopt, an external NonLinear OPTimizer NLOPT_LIB_DEPENDS= libnlopt.so:math/nlopt post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} -R ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libctl.so.7.3.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libctlgeom.so.7.3.0 @${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/.libs/example .include diff --git a/science/mpb/Makefile b/science/mpb/Makefile index d60348746508..06e456abe78b 100644 --- a/science/mpb/Makefile +++ b/science/mpb/Makefile @@ -1,53 +1,51 @@ PORTNAME= mpb DISTVERSION= 1.11.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MASTER_SITES= https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/ MAINTAINER= rhurlin@FreeBSD.org COMMENT= MIT Photonic-Bands WWW= https://mpb.readthedocs.io/en/latest/ LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash # NLOPT should be enabled in science/libctl LIB_DEPENDS= libctl.so:science/libctl \ libfftw3.so:math/fftw3 \ - libgc-threaded.so:devel/boehm-gc-threaded \ - libguile-2.2.so:lang/guile2 \ libhdf5.so:science/hdf5 \ libnlopt.so:math/nlopt -USES= fortran libtool pkgconfig readline +USES= fortran guile:2.2,alias libtool pkgconfig readline USE_GCC= yes USE_LDCONFIG= yes # Do not use --with-mpi, because it is not guaranted # that science/hdf5 also built with option PARALLEL GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip TEST_TARGET= check CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= ATLAS OPENMP ATLAS_DESC= Use math/atlas instead of math/openblas OPENMP_DESC= Use OpenMP (enable also in math/fftw3) ATLAS_LIB_DEPENDS= libatlas.so:math/atlas ATLAS_USES_OFF= blaslapack:openblas ATLAS_CONFIGURE_ON= --with-lapack=-lalapack ATLAS_CONFIGURE_OFF= --with-blas=openblas --with-lapack=-lopenblas OPENMP_CONFIGURE_ON= --with-openmp post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && \ ${COPYTREE_SHARE} "*.ctl *.scm" ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile index 74ae25bbbb4a..c98be6ca7d8c 100644 --- a/sysutils/mcron/Makefile +++ b/sysutils/mcron/Makefile @@ -1,28 +1,23 @@ PORTNAME= mcron PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= 100% compatible replacement for Vixie cron WWW= https://www.gnu.org/software/mcron/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile-2.2.so:lang/guile2 - -USES= gmake pkgconfig +USES= guile:2.2,3.0 gmake pkgconfig GNU_CONFIGURE= yes CONFLICTS_INSTALL= interchange isc-cron # bin/crontab TEST_TARGET= check INFO= mcron -PLIST_SUB= GUILE_SITE=share/guile/site/2.2 \ - GUILE_SITE_CCACHE=lib/guile/2.2/site-ccache - .include diff --git a/textproc/scss/Makefile b/textproc/scss/Makefile index 210a62a56564..3aa3717de7dd 100644 --- a/textproc/scss/Makefile +++ b/textproc/scss/Makefile @@ -1,31 +1,31 @@ PORTNAME= scss PORTVERSION= 0.4.2 PORTREVISION= 3 CATEGORIES= textproc scheme MASTER_SITES= SAVANNAH \ http://www.c-s.li/ports/ MAINTAINER= cs@FreeBSD.org COMMENT= Scheme module for W3C Cascading Stylesheets recommendation WWW= https://www.nongnu.org/scss/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= guile:lang/guile +USES= guile:run NO_BUILD= yes NO_ARCH= yes FILES= lexer.scm parser.scm scss.scm properties.scm \ interface/sdom.scm common.scm INFO= scss do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/guile/scss .for f in ${FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/guile/scss .endfor ${INSTALL_DATA} ${WRKSRC}/scss.info ${STAGEDIR}${PREFIX}/${INFO_PATH} .include diff --git a/textproc/sdom/Makefile b/textproc/sdom/Makefile index 74c86a0ade61..d225d9280f30 100644 --- a/textproc/sdom/Makefile +++ b/textproc/sdom/Makefile @@ -1,33 +1,36 @@ PORTNAME= sdom PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc scheme MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of the W3C DOM recommendation in Scheme WWW= https://www.nongnu.org/sdom/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= guile-lib>=0:devel/guile-lib +RUN_DEPENDS= guile-lib-${GUILE_FLAVOR}>=0:devel/guile-lib@${GUILE_FLAVOR} + +USES= guile:env NO_ARCH= yes NO_BUILD= yes +NO_ARCH= yes INFO= sdom PLIST_FILES= share/guile/sdom/common.scm \ share/guile/sdom/core.scm \ share/guile/sdom/events.scm \ share/guile/sdom/ls.scm \ share/guile/sdom/parser.scm do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/guile/sdom .for f in common.scm core.scm events.scm ls.scm parser.scm ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/guile/sdom .endfor ${INSTALL_DATA} ${WRKSRC}/sdom.info ${STAGEDIR}${PREFIX}/${INFO_PATH} .include diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 3ad131e8a572..89663e541e0a 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,122 +1,123 @@ PORTNAME= elinks DISTVERSIONPREFIX= v DISTVERSION= 0.16.1.1 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= jailbird@fdf.net COMMENT= Links text WWW browser with enhancements WWW= https://github.com/rkd77/elinks/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xmlto:textproc/xmlto USES= bison:alias cpe gmake iconv meson perl5 pkgconfig python ssl USE_GITHUB= yes GH_ACCOUNT= rkd77 LDFLAGS+= -lexecinfo MESON_ARGS= -Dgpm=false -Dperl=true OPTIONS_DEFINE= 256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI EXMODE \ FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \ IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \ SMB SPIDERMONKEY TRE XBELMARKS ZSTD OPTIONS_DEFAULT= 256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \ HIGHLIGHT LZMA MOUSE OPTIONS_SUB= yes 88COLORS_DESC= 88 color support 256COLORS_DESC= 256 color support TRUECOLORS_DESC= True color support SPIDERMONKEY_DESC= ECMAScript support (via SpiderMonkey) XBELMARKS_DESC= XBEL bookmarks (via expat) LOCAL_CGI_DESC= Local CGI support FSP_DESC= FSP protocol support (via fsplib) EXMODE_DESC= Exmode (CLI) support HIGHLIGHT_DESC= HTML highlighting using DOM engine NOROOT_DESC= Prevention of usage by root FASTMEM_DESC= Fast memory allocation functions TRE_DESC= TRE regex search support BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli BROTLI_MESON_TRUE= brotli NLS_USES= gettext NLS_MESON_TRUE= nls -GUILE_LIB_DEPENDS= libguile-3.0.so:lang/guile +GUILE_USES= guile:3.0 GUILE_MESON_TRUE= guile LUA_USES= lua:52-53 LUA_MESON_ON= -Dluapkg=lua-${LUA_VER} LZMA_MESON_TRUE= lzma FASTMEM_MESON_TRUE= fastmem IDN_LIB_DEPENDS= libidn.so:dns/libidn IDN_USES= localbase IDN_MESON_TRUE= idn NOROOT_MESON_TRUE= no-root HIGHLIGHT_MESON_TRUE= html-highlight EXMODE_MESON_TRUE= exmode SMB_USES= samba # smbclient SMB_MESON_TRUE= smb FSP_RUN_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib FSP_BUILD_DEPENDS= ${LOCALBASE}/lib/libfsplib.a:net/fsplib FSP_MESON_TRUE= fsp FTP_MESON_TRUE= ftp NNTP_MESON_TRUE= nntp BITTORRENT_MESON_TRUE= bittorrent GOPHER_MESON_TRUE= gopher MOUSE_MESON_TRUE= mouse FINGER_MESON_TRUE= finger LOCAL_CGI_MESON_TRUE= cgi XBELMARKS_LIB_DEPENDS= libexpat.so:textproc/expat2 XBELMARKS_MESON_TRUE= xbel 256COLORS_MESON_TRUE= 256-colors 88COLORS_MESON_TRUE= 88-colors TRUECOLORS_MESON_TRUE= true-color SPIDERMONKEY_USES= compiler:c++17-lang sqlite SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libmozjs-102.so:lang/spidermonkey102 \ ${LOCALBASE}/lib/libxml++-5.0.so:textproc/libxml++ SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr \ libxml++-5.0.so:textproc/libxml++ SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \ -I${LOCALBASE}/include/js-102 SPIDERMONKEY_CXXFLAGS= -I${LOCALBASE}/include/nspr \ -I${LOCALBASE}/include/js-102 SPIDERMONKEY_LDFLAGS= -L${LOCALBASE}/lib -lnspr4 -lpthread -lm SPIDERMONKEY_MESON_ON= -Dsm-scripting=true -Dspidermonkey=true TRE_LIB_DEPENDS= libtre.so:textproc/libtre TRE_MESON_TRUE= tre ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_USES= localbase ZSTD_MESON_TRUE= zstd post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/doc/tools/help2xml @${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py .include diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile index 37f544be069c..9cf14dc9c309 100644 --- a/www/guile-www/Makefile +++ b/www/guile-www/Makefile @@ -1,20 +1,20 @@ PORTNAME= guile-www PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www devel scheme MASTER_SITES= GNU/guile MAINTAINER= bofh@FreeBSD.org COMMENT= Guile modules for WWW interaction WWW= https://www.gnu.org/software/guile/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= guile:lang/guile1 +USES= guile:1.8,build,run GNU_CONFIGURE= yes INFO= guile-www NO_ARCH= yes .include diff --git a/x11-toolkits/guile-gnome-platform/Makefile b/x11-toolkits/guile-gnome-platform/Makefile index dc8469a81ad3..a199d807a516 100644 --- a/x11-toolkits/guile-gnome-platform/Makefile +++ b/x11-toolkits/guile-gnome-platform/Makefile @@ -1,153 +1,159 @@ PORTNAME= guile-gnome-platform DISTVERSION= 2.16.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= GNU/guile-gnome/${PORTNAME} MAINTAINER= andrew@tao11.riddles.org.uk COMMENT= Guile bindings for Gnome libraries WWW= https://www.gnu.org/software/guile-gnome/ LICENSE= GPLv2+ -BUILD_DEPENDS= guile2>=2.2:lang/guile2 -LIB_DEPENDS= libguile-2.2.so:lang/guile2 \ - libgc-threaded.so:devel/boehm-gc-threaded \ - libgwrap-guile-runtime.so:devel/g-wrap \ +LIB_DEPENDS= libgwrap-guile-runtime.so:devel/g-wrap \ libffi.so:devel/libffi FLAVORS= lite full FLAVOR?= ${FLAVORS:[1]} full_PKGNAMESUFFIX=-full full_CONFLICTS_INSTALL=${PORTNAME}-lite lite_PKGNAMESUFFIX=-lite lite_CONFLICTS_INSTALL=${PORTNAME}-full # We don't actually need gettext, but for some incomprehensible reason it # is the package that installs some basic gnulib autoconf functionality. -USES= autoreconf gettext-tools gmake gnome libtool pkgconfig +USES= autoreconf gettext-tools gmake gnome guile:2.2,alias \ + libtool pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= install-strip DATADIR= ${PREFIX}/share/guile-gnome-2 INFO= guile-gnome-gconf guile-gnome-glib guile-gnome-gobject \ guile-gnome-libgnome guile-gnome-libgnomeui OPTIONS_DEFINE= ATK CAIRO CANVAS GLADE GTK2 PANGO OPTIONS_DEFAULT=ATK CAIRO CANVAS GLADE GTK2 PANGO .if ${FLAVOR} == full OPTIONS_SLAVE= ATK CAIRO CANVAS GLADE GTK2 PANGO .endif OPTIONS_SUB= yes # other options have descriptions provided by ports/Mk/* ATK_DESC= GNOME accessibility toolkit (ATK) CANVAS_DESC= GNOMECanvas Graphics library ATK_USE= gnome=atk ATK_CONFIGURE_WITH= atk ATK_INFO= guile-gnome-atk # Cairo support depends on a separate module. -CAIRO_LIB_DEPENDS= libguile-cairo.so:graphics/guile-cairo +CAIRO_BUILD_DEPENDS= ${LOCALBASE}/lib/guile/${GUILE_VER}/extensions/libguile-cairo.so:graphics/guile-cairo@${GUILE_FLAVOR} +CAIRO_RUN_DEPENDS= ${LOCALBASE}/lib/guile/${GUILE_VER}/extensions/libguile-cairo.so:graphics/guile-cairo@${GUILE_FLAVOR} CAIRO_USE= gnome=cairo CAIRO_CONFIGURE_WITH= cairo CANVAS_IMPLIES= GLADE GTK2 CAIRO CANVAS_USE= gnome=libgnomecanvas CANVAS_CONFIGURE_WITH= canvas CANVAS_INFO= guile-gnome-libgnomecanvas GLADE_IMPLIES= GTK2 CAIRO GLADE_USE= gnome=libglade2 GLADE_CONFIGURE_WITH= libglade GLADE_INFO= guile-gnome-libglade GTK2_IMPLIES= CAIRO # These dependencies are brought in from gtk2's pkgconf, but # not accounted for by Uses/gnome GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz GTK2_USE= gnome=gtk20,gdkpixbuf2 GTK2_CONFIGURE_WITH= gtk pixbuf GTK2_INFO= guile-gnome-gtk guile-gnome-gdk +PANGO_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz PANGO_USE= gnome=pango PANGO_CONFIGURE_WITH= pango PANGO_INFO= guile-gnome-pango # pangocairo doesn't have its own option, but is enabled if both PANGO # and CAIRO are set. PANGOCAIRO_INFO=guile-gnome-pangocairo HAS_PANGOCAIRO= ${"${PORT_OPTIONS:MPANGO}${PORT_OPTIONS:MCAIRO}" == "PANGOCAIRO":?1:} INFO+= ${"${HAS_PANGOCAIRO}":?${PANGOCAIRO_INFO}:} # Compute the list of info files that are _not_ installed. INFO_UNUSED= ${DESELECTED_OPTIONS:@s@${${s}_INFO}@} \ ${OPTIONS_EXCLUDE:@s@${${s}_INFO}@} \ ${"${HAS_PANGOCAIRO}":?:${PANGOCAIRO_INFO}} post-patch: @${REINPLACE_CMD} -e '/grep/s,\^ {|,^ \\{|,' ${WRKSRC}/gconf/gnome/gw/Makefile.in \ ${WRKSRC}/gconf/gnome/overrides/Makefile.in \ ${WRKSRC}/gconf/gnome/Makefile.in \ ${WRKSRC}/libgnome/gnome/gw/Makefile.in \ ${WRKSRC}/libgnome/gnome/Makefile.in \ ${WRKSRC}/libgnome/gnome/overrides/Makefile.in \ ${WRKSRC}/defs/gnome/defs/Makefile.in \ ${WRKSRC}/defs/Makefile.in \ ${WRKSRC}/gtk/Makefile.in \ ${WRKSRC}/gtk/gnome/gw/Makefile.in \ ${WRKSRC}/gtk/gnome/gtk/Makefile.in \ ${WRKSRC}/gtk/gnome/overrides/Makefile.in \ ${WRKSRC}/gtk/gnome/contrib/Makefile.in \ ${WRKSRC}/gtk/gnome/Makefile.in \ ${WRKSRC}/libgnomeui/Makefile.in \ ${WRKSRC}/libgnomeui/gnome/overrides/Makefile.in \ ${WRKSRC}/libgnomeui/gnome/gw/Makefile.in \ ${WRKSRC}/libgnomeui/gnome/Makefile.in \ ${WRKSRC}/libgnomecanvas/gnome/gw/Makefile.in \ ${WRKSRC}/libgnomecanvas/gnome/Makefile.in \ ${WRKSRC}/libgnomecanvas/gnome/overrides/Makefile.in \ ${WRKSRC}/libglade/gnome/overrides/Makefile.in \ ${WRKSRC}/libglade/gnome/gw/Makefile.in \ ${WRKSRC}/libglade/gnome/Makefile.in \ ${WRKSRC}/pango/gnome/Makefile.in \ ${WRKSRC}/pango/gnome/overrides/Makefile.in \ ${WRKSRC}/pango/gnome/gw/Makefile.in \ ${WRKSRC}/glib/gnome/Makefile.in \ ${WRKSRC}/glib/gnome/gobject/Makefile.in \ ${WRKSRC}/glib/gnome/overrides/Makefile.in \ ${WRKSRC}/glib/gnome/gw/Makefile.in \ ${WRKSRC}/glib/gnome/gw/support/Makefile.in \ ${WRKSRC}/glib/Makefile.in \ ${WRKSRC}/glib/bin/Makefile.in \ ${WRKSRC}/glib/test-suite/Makefile.in \ ${WRKSRC}/common.mk \ ${WRKSRC}/cairo/gnome/gw/Makefile.in \ ${WRKSRC}/cairo/gnome/Makefile.in \ ${WRKSRC}/atk/gnome/overrides/Makefile.in \ ${WRKSRC}/atk/gnome/gw/Makefile.in \ ${WRKSRC}/atk/gnome/Makefile.in # pacify check-plist by removing any .info files for deselected # components. This doesn't affect the packaging but makes QA testing # of the options much easier. +# DO NOT try and add rules here to strip .go files, no matter how loudly +# testport / stage-qa shouts at you about it, because .go files (which are +# compiled bytecode) are not intended to be stripped and doing so causes +# breakage at run time. + post-install: for f in ${INFO_UNUSED}; do \ ${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$${f}.info*; \ done; .include diff --git a/x11-toolkits/guile-gnome-platform/pkg-plist b/x11-toolkits/guile-gnome-platform/pkg-plist index 0ac8a3c753eb..7c2ac5ca1453 100644 --- a/x11-toolkits/guile-gnome-platform/pkg-plist +++ b/x11-toolkits/guile-gnome-platform/pkg-plist @@ -1,167 +1,167 @@ bin/guile-gnome-2 include/guile-gnome-2/guile-gnome-gobject.h include/guile-gnome-2/guile-gnome-gobject/gc.h include/guile-gnome-2/guile-gnome-gobject/gclosure.h include/guile-gnome-2/guile-gnome-gobject/gobject.h include/guile-gnome-2/guile-gnome-gobject/gparameter.h include/guile-gnome-2/guile-gnome-gobject/gsignal.h include/guile-gnome-2/guile-gnome-gobject/gtype.h include/guile-gnome-2/guile-gnome-gobject/gutil.h include/guile-gnome-2/guile-gnome-gobject/gvalue.h %%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so %%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so.0 %%ATK%%lib/guile-gnome-2/libgw-guile-gnome-atk.so.0.0.0 %%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so %%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so.0 %%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-cairo.so.0.0.0 %%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so %%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so.0 %%CANVAS%%lib/guile-gnome-2/libgw-guile-gnome-canvas.so.0.0.0 %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so.0 %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gdk.so.0.0.0 lib/guile-gnome-2/libgw-guile-gnome-glib.so lib/guile-gnome-2/libgw-guile-gnome-glib.so.0 lib/guile-gnome-2/libgw-guile-gnome-glib.so.0.0.0 lib/guile-gnome-2/libgw-guile-gnome-gobject.so lib/guile-gnome-2/libgw-guile-gnome-gobject.so.0 lib/guile-gnome-2/libgw-guile-gnome-gobject.so.0.0.0 %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so.0 %%GTK2%%lib/guile-gnome-2/libgw-guile-gnome-gtk.so.0.0.0 %%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so %%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0 %%GLADE%%lib/guile-gnome-2/libgw-guile-gnome-libglade.so.0.0.0 %%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so %%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0 %%PANGO%%lib/guile-gnome-2/libgw-guile-gnome-pango.so.0.0.0 %%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so %%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so.0 %%PANGO%%%%CAIRO%%lib/guile-gnome-2/libgw-guile-gnome-pangocairo.so.0.0.0 lib/libguile-gnome-gobject-2.so lib/libguile-gnome-gobject-2.so.0 lib/libguile-gnome-gobject-2.so.0.0.0 libdata/pkgconfig/guile-gnome-defs-2.pc libdata/pkgconfig/guile-gnome-glib-2.pc %%GTK2%%libdata/pkgconfig/guile-gnome-gtk-2.pc %%ATK%%%%DATADIR%%/gnome/atk.scm %%CANVAS%%%%DATADIR%%/gnome/canvas.scm %%DATADIR%%/gnome/contrib/delay-tree-model.scm %%DATADIR%%/gnome/contrib/filtered-list.scm %%DATADIR%%/gnome/contrib/help-browser.scm %%DATADIR%%/gnome/contrib/texinfo-buffer.scm %%DATADIR%%/gnome/defs/applet.defs %%DATADIR%%/gnome/defs/art.defs %%DATADIR%%/gnome/defs/atk-types.defs %%DATADIR%%/gnome/defs/atk.defs %%DATADIR%%/gnome/defs/bonobo-types.defs %%DATADIR%%/gnome/defs/bonobo.defs %%DATADIR%%/gnome/defs/bonoboui-types.defs %%DATADIR%%/gnome/defs/bonoboui.defs %%DATADIR%%/gnome/defs/common-ignores.defs %%DATADIR%%/gnome/defs/gconf-types.defs %%DATADIR%%/gnome/defs/gconf.defs %%DATADIR%%/gnome/defs/gdk-pixbuf-types.defs %%DATADIR%%/gnome/defs/gdk-pixbuf.defs %%DATADIR%%/gnome/defs/gdk-types.defs %%DATADIR%%/gnome/defs/gdk.defs %%DATADIR%%/gnome/defs/glib-types.defs %%DATADIR%%/gnome/defs/glib.defs %%DATADIR%%/gnome/defs/gnome-vfs-types.defs %%DATADIR%%/gnome/defs/gnome-vfs.defs %%DATADIR%%/gnome/defs/gtk-types.defs %%DATADIR%%/gnome/defs/gtk.defs %%DATADIR%%/gnome/defs/gtkhtml2.defs %%DATADIR%%/gnome/defs/gtksourceview-overrides.defs %%DATADIR%%/gnome/defs/gtksourceview.defs %%DATADIR%%/gnome/defs/libgda-overrides.defs %%DATADIR%%/gnome/defs/libgda-types.defs %%DATADIR%%/gnome/defs/libgda.defs %%DATADIR%%/gnome/defs/libglade-types.defs %%DATADIR%%/gnome/defs/libglade.defs %%DATADIR%%/gnome/defs/libgnome-types.defs %%DATADIR%%/gnome/defs/libgnome.defs %%DATADIR%%/gnome/defs/libgnomecanvas-types.defs %%DATADIR%%/gnome/defs/libgnomecanvas.defs %%DATADIR%%/gnome/defs/libgnomeui-types.defs %%DATADIR%%/gnome/defs/libgnomeui.defs %%DATADIR%%/gnome/defs/nautilus.defs %%DATADIR%%/gnome/defs/pango-types.defs %%DATADIR%%/gnome/defs/pango.defs %%DATADIR%%/gnome/defs/pangocairo-types.defs %%DATADIR%%/gnome/defs/pangocairo.defs %%DATADIR%%/gnome/defs/print.defs %%DATADIR%%/gnome/defs/printui.defs %%DATADIR%%/gnome/defs/vte-overrides.defs %%DATADIR%%/gnome/defs/vte.defs %%GLADE%%%%DATADIR%%/gnome/glade.scm %%DATADIR%%/gnome/glib.scm %%DATADIR%%/gnome/gobject.scm %%DATADIR%%/gnome/gobject/config.scm %%DATADIR%%/gnome/gobject/defs-support.scm %%DATADIR%%/gnome/gobject/event-repl.scm %%DATADIR%%/gnome/gobject/gclosure.scm %%DATADIR%%/gnome/gobject/generics.scm %%DATADIR%%/gnome/gobject/gobject.scm %%DATADIR%%/gnome/gobject/gparameter.scm %%DATADIR%%/gnome/gobject/gsignal.scm %%DATADIR%%/gnome/gobject/gtype.scm %%DATADIR%%/gnome/gobject/gvalue.scm %%DATADIR%%/gnome/gobject/gw-spec-utils.scm %%DATADIR%%/gnome/gobject/gw-utils.scm %%DATADIR%%/gnome/gobject/utils.scm %%GTK2%%%%DATADIR%%/gnome/gtk.scm %%DATADIR%%/gnome/gtk/gdk-event.scm %%DATADIR%%/gnome/gtk/graphical-repl.scm %%ATK%%%%DATADIR%%/gnome/gw/atk-spec.scm %%ATK%%%%DATADIR%%/gnome/gw/atk.scm %%CAIRO%%%%DATADIR%%/gnome/gw/cairo-spec.scm %%CAIRO%%%%DATADIR%%/gnome/gw/cairo.scm %%CANVAS%%%%DATADIR%%/gnome/gw/canvas-spec.scm %%CANVAS%%%%DATADIR%%/gnome/gw/canvas.scm %%GTK2%%%%DATADIR%%/gnome/gw/gdk-spec.scm %%GTK2%%%%DATADIR%%/gnome/gw/gdk.scm %%DATADIR%%/gnome/gw/generics.scm %%DATADIR%%/gnome/gw/glib-spec.scm %%DATADIR%%/gnome/gw/glib.scm %%DATADIR%%/gnome/gw/gobject-spec.scm %%DATADIR%%/gnome/gw/gobject.scm %%GTK2%%%%DATADIR%%/gnome/gw/gtk-spec.scm %%GTK2%%%%DATADIR%%/gnome/gw/gtk.scm %%GLADE%%%%DATADIR%%/gnome/gw/libglade-spec.scm %%GLADE%%%%DATADIR%%/gnome/gw/libglade.scm %%PANGO%%%%DATADIR%%/gnome/gw/pango-spec.scm %%PANGO%%%%DATADIR%%/gnome/gw/pango.scm %%PANGO%%%%CAIRO%%%%DATADIR%%/gnome/gw/pangocairo-spec.scm %%PANGO%%%%CAIRO%%%%DATADIR%%/gnome/gw/pangocairo.scm %%DATADIR%%/gnome/gw/support/defs.scm %%DATADIR%%/gnome/gw/support/g-wrap.scm %%DATADIR%%/gnome/gw/support/genwrite.scm %%DATADIR%%/gnome/gw/support/glob.scm %%DATADIR%%/gnome/gw/support/gobject.scm %%DATADIR%%/gnome/gw/support/gtk-doc.scm %%DATADIR%%/gnome/gw/support/modules.scm %%DATADIR%%/gnome/gw/support/printf.scm %%DATADIR%%/gnome/gw/support/slib.scm %%ATK%%%%DATADIR%%/gnome/overrides/atk.defs %%ATK%%%%DATADIR%%/gnome/overrides/atk.defs-type-ignores %%DATADIR%%/gnome/overrides/gconf.defs %%DATADIR%%/gnome/overrides/gconf.defs-type-ignores %%DATADIR%%/gnome/overrides/gdk-pixbuf.defs %%DATADIR%%/gnome/overrides/gdk.defs %%DATADIR%%/gnome/overrides/gdk.defs-type-ignores %%DATADIR%%/gnome/overrides/glib.defs %%DATADIR%%/gnome/overrides/glib.defs-type-ignores %%DATADIR%%/gnome/overrides/gtk-customs.defs %%DATADIR%%/gnome/overrides/gtk.defs %%DATADIR%%/gnome/overrides/gtk.defs-type-ignores %%DATADIR%%/gnome/overrides/libglade.defs %%DATADIR%%/gnome/overrides/libgnome.defs %%DATADIR%%/gnome/overrides/libgnomecanvas.defs %%DATADIR%%/gnome/overrides/libgnomeui.defs %%DATADIR%%/gnome/overrides/libgnomeui.defs-type-ignores %%PANGO%%%%DATADIR%%/gnome/overrides/pango.defs %%PANGO%%%%DATADIR%%/gnome/overrides/pangocairo.defs %%PANGO%%%%DATADIR%%/gnome/pango.scm %%PANGO%%%%DATADIR%%/gnome/pangocairo.scm -share/guile/site/gnome-2.scm +%%GUILE_GLOBAL_SITE%%/gnome-2.scm diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile index ee1ee133e6fd..d40b2bc526e0 100644 --- a/x11/xbindkeys/Makefile +++ b/x11/xbindkeys/Makefile @@ -1,35 +1,34 @@ PORTNAME= xbindkeys -PORTVERSION= 1.8.6 -PORTREVISION= 2 +PORTVERSION= 1.8.7 CATEGORIES= x11 MASTER_SITES= http://www.nongnu.org/xbindkeys/ MAINTAINER= guru@unixarea.de COMMENT= Allows you to launch shell commands under X with your keyboard WWW= https://www.nongnu.org/xbindkeys/xbindkeys.html LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= xorg USE_XORG= x11 xi GNU_CONFIGURE= yes PLIST_FILES= bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc man/man1/xbindkeys.1.gz OPTIONS_DEFINE= GUILE TCL TCL_USES= tk TCL_CONFIGURE_OFF= --disable-tk TCL_PLIST_FILES= bin/xbindkeys_show man/man1/xbindkeys_show.1.gz -GUILE_LIB_DEPENDS= libguile.so:lang/guile -GUILE_CONFIGURE_OFF= --disable-guile +GUILE_USES= guile:1.8,2.2,3.0 autoreconf gettext-tools pkgconfig +GUILE_CONFIGURE_ENABLE= guile post-patch-TCL-on: @${REINPLACE_CMD} -e 's| wish | ${WISH} |g' ${WRKSRC}/xbindkeys_show post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/xbindkeysrc ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo index 068ac00341ec..39e80a87f2a4 100644 --- a/x11/xbindkeys/distinfo +++ b/x11/xbindkeys/distinfo @@ -1,2 +1,3 @@ -SHA256 (xbindkeys-1.8.6.tar.gz) = 6c0d18be19fc19ab9b4595edf3a23c0a6946c8a5eb5c1bc395471c8f9a710d18 -SIZE (xbindkeys-1.8.6.tar.gz) = 151941 +TIMESTAMP = 1684687370 +SHA256 (xbindkeys-1.8.7.tar.gz) = a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2 +SIZE (xbindkeys-1.8.7.tar.gz) = 177532